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.1.2.4 and 1.1.2.8

version 1.1.2.4, 2011/12/13 14:57:15	version 1.1.2.8, 2011/12/20 15:03:42
Line 24 int	Line 24 int
try2Connect(int sock)	try2Connect(int sock)
{	{
int siz = 0;	int siz = 0;
	struct pollfd pfd;

siz = mqtt_msgCONNECT(args->msg, AIT_GET_STR(&args->ConnID), AIT_GET_STR(&args->User),	siz = mqtt_msgCONNECT(args->msg, (char*) AIT_GET_STR(&args->ConnID), args->ka,
AIT_GET_STR(&args->Pass), args->Will.Topic.val.string,	(char) AIT_GET_STR(&args->User), (char) AIT_GET_STR(&args->Pass),
args->Will.Msg.val.string, args->Clear, args->QoS, args->Retain);	(char) args->Will.Topic.val.string, (char) args->Will.Msg.val.string,
	!args->notClear, args->QoS, args->Retain);
if (siz == -1) {	if (siz == -1) {
printf("Error:: msgCONNECT #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());	printf("Error:: msgCONNECT #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
return -1;	return -1;
Line 38 try2Connect(int sock)	Line 40 try2Connect(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
VERB(3) printf("Sended CONNECT %d bytes\n", siz);	ioVERBOSE(3) printf("Sended CONNECT %d bytes\n", siz);

return siz;	pfd.fd = sock;
	pfd.events = POLLIN;
	switch (poll(&pfd, 1, args->ka * 1000)) {
	case -1:
	printf("Error:: poll() #%d - %s\n", errno, strerror(errno));
	return -1;
	case 0:
	ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);
	return -1;
	}
	if (pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL))
	return -1;

	siz = recv(sock, args->msg->msg_base, args->msg->msg_len, 0);
	if (siz == -1) {
	printf("Error:: recv() #%d - %s\n", errno, strerror(errno));
	return -1;
	} else
	ioVERBOSE(3) printf("Received %d bytes\n", siz);

	return (u_char) mqtt_readCONNACK(args->msg);
}	}

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

Removed from v.1.1.2.4
changed lines
	Added in v.1.1.2.8