--- mqtt/src/client.c	2011/12/13 15:23:43	1.1.2.5
+++ mqtt/src/client.c	2011/12/29 14:13:13	1.1.2.10
@@ -21,13 +21,14 @@ InitClient(void)
 }
 
 int
-try2Connect(int sock)
+ConnectClient(int sock)
 {
 	int siz = 0;
+	struct pollfd pfd;
 
-	siz = mqtt_msgCONNECT(args->msg, AIT_GET_STR(&args->ConnID), args->ka, 
-			AIT_GET_STR(&args->User), AIT_GET_STR(&args->Pass), 
-			args->Will.Topic.val.string, args->Will.Msg.val.string, 
+	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());
@@ -39,11 +40,113 @@ 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);
 
-	register int i;
-	for (i = 0; i < siz; i++)
-		printf("%02x ", ((u_char*)args->msg->msg_base)[i]);
-	printf("\n");
+	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_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);
+}
+
+FILE *
+OpenFile(void)
+{
+	if (!args->isFile)
+		return NULL;
+
+	args->isFile = fopen(AIT_GET_STR(&args->Value), "r");
+	if (!args->isFile) {
+		printf("Error:: in open file #%d - %s\n", errno, strerror(errno));
+		return NULL;
+	}
+
+	return args->isFile;
+}
+
+void
+CloseFile(void)
+{
+	if (args->isFile)
+		fclose(args->isFile);
 }