--- mqtt/src/client.c	2012/01/05 10:01:20	1.1.2.11
+++ mqtt/src/client.c	2012/01/05 10:26:02	1.1.2.12
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "mqtt.h"
+#include "client.h"
 
 
 int
@@ -99,13 +100,8 @@ KAClient(int sock)
 		printf("Error:: msgPINGREQ #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 		return -1;
 	}
-
-	siz = send(sock, args->msg->msg_base, siz, 0);
-	if (siz == -1) {
-		printf("Error:: send() #%d - %s\n", errno, strerror(errno));
+	if (SendTo(sock, siz) == -1)
 		return -1;
-	} else
-		ioVERBOSE(3) printf("Sended PINGREQ %d bytes\n", siz);
 
 	pfd.fd = sock;
 	pfd.events = POLLIN | POLLPRI;
@@ -127,7 +123,7 @@ KAClient(int sock)
 	} else
 		ioVERBOSE(3) printf("Received %d bytes\n", siz);
 
-	return (u_char) mqtt_readPINGRESP(args->msg);
+	return mqtt_readPINGRESP(args->msg);
 }
 
 void *
@@ -163,4 +159,50 @@ CloseFile(void)
 		munmap(AIT_GET_PTR(&args->Value), AIT_LEN(&args->Value));
 		AIT_FREE_VAL(&args->Value);
 	}
+}
+
+inline int
+SendTo(int sock, int siz)
+{
+	siz = send(sock, args->msg->msg_base, siz, 0);
+	if (siz == -1) {
+		printf("Error:: send() #%d - %s\n", errno, strerror(errno));
+		return -1;
+	} else
+		ioVERBOSE(3) printf("Sended PUBLISH %d bytes\n", siz);
+
+	return siz;
+}
+
+inline int
+RecvFrom(int sock)
+{
+	struct pollfd pfd;
+	int siz = 0;
+
+	pfd.fd = sock;
+	pfd.events = POLLIN | POLLPRI;
+	do {
+		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);
+				if (KAClient(sock) == -1)
+					return -1;
+				continue;
+		}
+		if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL))
+			return -1;
+	} while (0);
+
+	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 siz;
 }