--- mqtt/src/client.c	2011/12/13 14:57:15	1.1.2.4
+++ mqtt/src/client.c	2011/12/20 15:03:42	1.1.2.8
@@ -24,10 +24,12 @@ int
 try2Connect(int sock)
 {
 	int siz = 0;
+	struct pollfd pfd;
 
-	siz = mqtt_msgCONNECT(args->msg, AIT_GET_STR(&args->ConnID), AIT_GET_STR(&args->User), 
-			AIT_GET_STR(&args->Pass), args->Will.Topic.val.string, 
-			args->Will.Msg.val.string, args->Clear, args->QoS, args->Retain);
+	siz = mqtt_msgCONNECT(args->msg, (char*) AIT_GET_STR(&args->ConnID), args->ka, 
+			(char*) AIT_GET_STR(&args->User), (char*) AIT_GET_STR(&args->Pass), 
+			(char*) args->Will.Topic.val.string, (char*) args->Will.Msg.val.string, 
+			!args->notClear, args->QoS, args->Retain);
 	if (siz == -1) {
 		printf("Error:: msgCONNECT #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 		return -1;
@@ -38,7 +40,27 @@ try2Connect(int sock)
 		printf("Error:: send() #%d - %s\n", errno, strerror(errno));
 		return -1;
 	} 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);
 }