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.4 and 1.4.4.2

version 1.4, 2012/07/03 12:46:00	version 1.4.4.2, 2013/07/19 09:11:48
Line 12 terms:	Line 12 terms:
All of the documentation and software included in the ELWIX and AITNET	All of the documentation and software included in the ELWIX and AITNET
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

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

Redistribution and use in source and binary forms, with or without	Redistribution and use in source and binary forms, with or without
Line 68 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 77 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 89 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 129 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 137 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 158 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 172 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.4
changed lines
	Added in v.1.4.4.2