mqtt/src/client.c - diff

Return to client.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/client.c between versions 1.3 and 1.4.4.2

version 1.3, 2012/07/03 09:02:50	version 1.4.4.2, 2013/07/19 09:11:48
Line 1	Line 1
	/*************************************************************************
	* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
	* by Michael Pounov <misho@openbsd-bg.org>
	*
	* $Author$
	* $Id$
	*
	**************************************************************************
	The ELWIX and AITNET software is distributed under the following
	terms:

	All of the documentation and software included in the ELWIX and AITNET
	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
	by Michael Pounov <misho@elwix.org>. All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	1. Redistributions of source code must retain the above copyright
	notice, this list of conditions and the following disclaimer.
	2. Redistributions in binary form must reproduce the above copyright
	notice, this list of conditions and the following disclaimer in the
	documentation and/or other materials provided with the distribution.
	3. All advertising materials mentioning features or use of this software
	must display the following acknowledgement:
	This product includes software developed by Michael Pounov <misho@elwix.org>
	ELWIX - Embedded LightWeight unIX and its contributors.
	4. Neither the name of AITNET nor the names of its contributors
	may be used to endorse or promote products derived from this software
	without specific prior written permission.

	THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	SUCH DAMAGE.
	*/
#include "global.h"	#include "global.h"
#include "mqtt.h"	#include "mqtt.h"
#include "client.h"	#include "client.h"
Line 23 ConnectClient(int sock)	Line 68 ConnectClient(int sock)
printf("Error:: send() #%d - %s\n", errno, strerror(errno));	printf("Error:: send() #%d - %s\n", errno, strerror(errno));
return -1;	return -1;
} else	} else
ioVERBOSE(3) printf("Sended CONNECT %d bytes\n", siz);	EVERBS(3) printf("Sended CONNECT %d bytes\n", siz);

pfd.fd = sock;	pfd.fd = sock;
pfd.events = POLLIN \| POLLPRI;	pfd.events = POLLIN \| POLLPRI;
Line 32 ConnectClient(int sock)	Line 77 ConnectClient(int sock)
printf("Error:: poll() #%d - %s\n", errno, strerror(errno));	printf("Error:: poll() #%d - %s\n", errno, strerror(errno));
return -1;	return -1;
case 0:	case 0:
ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);	EVERBS(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);
return -1;	return -1;
}	}
if (pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL))	if (pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL))
Line 44 ConnectClient(int sock)	Line 89 ConnectClient(int sock)
printf("Error:: recv() #%d - %s\n", errno, strerror(errno));	printf("Error:: recv() #%d - %s\n", errno, strerror(errno));
return -1;	return -1;
} else	} else
ioVERBOSE(3) printf("Received %d bytes\n", siz);	EVERBS(3) printf("Received %d bytes\n", siz);

return (u_char) mqtt_readCONNACK(args->msg);	return (u_char) mqtt_readCONNACK(args->msg);
}	}
Line 84 CloseFile(void)	Line 129 CloseFile(void)
}	}
}	}

inline int	int
SendTo(int sock, int siz)	SendTo(int sock, int siz)
{	{
siz = send(sock, args->msg->msg_base, siz, MSG_NOSIGNAL);	siz = send(sock, args->msg->msg_base, siz, MSG_NOSIGNAL);
Line 92 SendTo(int sock, int siz)	Line 137 SendTo(int sock, int siz)
printf("Error:: send() #%d - %s\n", errno, strerror(errno));	printf("Error:: send() #%d - %s\n", errno, strerror(errno));
return -1;	return -1;
} else	} else
ioVERBOSE(3) printf("Sended %d bytes\n", siz);	EVERBS(3) printf("Sended %d bytes\n", siz);

return siz;	return siz;
}	}

inline int	int
RecvFrom(int sock)	RecvFrom(int sock)
{	{
struct pollfd pfd;	struct pollfd pfd;
Line 113 RecvFrom(int sock)	Line 158 RecvFrom(int sock)
printf("Error:: poll() #%d - %s\n", errno, strerror(errno));	printf("Error:: poll() #%d - %s\n", errno, strerror(errno));
return -1;	return -1;
case 0:	case 0:
ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);	EVERBS(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);
if (mqtt_KeepAlive(sock, args->ka, 1) == -1)	if (mqtt_KeepAlive(sock, args->ka, 1) == -1)
return -1;	return -1;
continue;	continue;
Line 127 RecvFrom(int sock)	Line 172 RecvFrom(int sock)
printf("Error:: recv() #%d - %s\n", errno, strerror(errno));	printf("Error:: recv() #%d - %s\n", errno, strerror(errno));
return -1;	return -1;
} else	} else
ioVERBOSE(3) printf("Received %d bytes\n", siz);	EVERBS(3) printf("Received %d bytes\n", siz);

return siz;	return siz;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.3
changed lines
	Added in v.1.4.4.2