--- mqtt/src/client.c	2011/12/20 15:03:42	1.1.2.8
+++ mqtt/src/client.c	2011/12/24 17:30:29	1.1.2.9
@@ -21,7 +21,7 @@ InitClient(void)
 }
 
 int
-try2Connect(int sock)
+ConnectClient(int sock)
 {
 	int siz = 0;
 	struct pollfd pfd;
@@ -43,7 +43,7 @@ try2Connect(int sock)
 		ioVERBOSE(3) printf("Sended CONNECT %d bytes\n", siz);
 
 	pfd.fd = sock;
-	pfd.events = POLLIN;
+	pfd.events = POLLIN | POLLPRI;
 	switch (poll(&pfd, 1, args->ka * 1000)) {
 		case -1:
 			printf("Error:: poll() #%d - %s\n", errno, strerror(errno));
@@ -63,4 +63,68 @@ try2Connect(int sock)
 		ioVERBOSE(3) printf("Received %d bytes\n", siz);
 
 	return (u_char) mqtt_readCONNACK(args->msg);
+}
+
+int
+CloseClient(int sock)
+{
+	int siz = 0;
+
+	siz = mqtt_msgDISCONNECT(args->msg);
+	if (siz == -1) {
+		printf("Error:: msgDISCONNECT #%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));
+		return -1;
+	} else
+		ioVERBOSE(3) printf("Sended DISCONNECT %d bytes\n", siz);
+
+	close(sock);
+	return siz;
+}
+
+int
+KAClient(int sock)
+{
+	int siz = 0;
+	struct pollfd pfd;
+
+	siz = mqtt_msgPINGREQ(args->msg);
+	if (siz == -1) {
+		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));
+		return -1;
+	} else
+		ioVERBOSE(3) printf("Sended PINGREQ %d bytes\n", siz);
+
+	pfd.fd = sock;
+	pfd.events = POLLIN | POLLPRI;
+	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_readPINGRESP(args->msg);
 }