--- mqtt/src/mqtt_ping.c	2012/04/26 09:15:26	1.1.2.3
+++ mqtt/src/mqtt_ping.c	2012/05/01 22:19:29	1.1.2.4
@@ -38,44 +38,14 @@ cleanArgs(struct tagArgs * __restrict args)
 static int
 Ping(int sock, int num)
 {
-	int siz = 0;
 	struct timeval before, after;
 	ait_val_t val;
-	struct mqtthdr *hdr;
 
 	gettimeofday(&before, NULL);
 
-	siz = mqtt_msgPINGREQ(args->msg);
-	if (siz == -1) {
-		printf("Error:: msgPINGREQ #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
+	if (mqtt_KeepAlive(args->cli->sock, args->ka, 1) == -1)
 		return -1;
-	}
-	if (SendTo(sock, siz) == -1)
-		return -1;
 
-reply:
-	if ((siz = RecvFrom(sock)) == -1 || !siz)
-		return -1;
-	else
-		hdr = (struct mqtthdr*) args->msg->msg_base;
-	if (hdr->mqtt_msg.type == MQTT_TYPE_PINGREQ) {
-		siz = mqtt_msgPINGRESP(args->msg);
-		if (siz == -1) {
-			printf("Error:: msgPINGRESP #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
-			return -1;
-		}
-		if (SendTo(sock, siz) == -1)
-			return -1;
-
-		goto reply;
-	} else {
-		siz = mqtt_readPINGRESP(args->msg);
-		if (siz == -1) {
-			printf("Error:: readPINGRESP #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
-			return -1;
-		}
-	}
-
 	gettimeofday(&after, NULL);
 
 	printf(" + Ping %d MQTT broker %s ... %f sec.\n", num, io_n2addr(&args->addr, &val), 
@@ -92,7 +62,7 @@ main(int argc, char **argv)
 	char ch;
 	ait_val_t val;
 	u_short port = atoi(MQTT_PORT);
-	int sock, num = 1, ret = 0, lost = 0;
+	int num = 1, ret = 0, lost = 0;
 	register int i;
 
 	if (!(args = malloc(sizeof(struct tagArgs)))) {
@@ -164,13 +134,13 @@ main(int argc, char **argv)
 	printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_n2port(&args->addr));
 	AIT_FREE_VAL(&val);
 
-	if ((sock = InitClient()) == -1) {
+	if (!(args->cli = mqtt_cli_Open(&args->addr.sa))) {
 		args->free(args);
 		free(args);
 		return 2;
 	}
 
-	switch ((ret = ConnectClient(sock))) {
+	switch ((ret = ConnectClient(args->cli->sock))) {
 		case -1:
 			printf(">> FAILED!\n");
 			break;
@@ -196,17 +166,15 @@ main(int argc, char **argv)
 
 	if (ret == MQTT_RETCODE_ACCEPTED) {
 		for (i = 0; i < num; i++)
-			if ((ret = Ping(sock, i))) {
+			if ((ret = Ping(args->cli->sock, i))) {
 				ret = 3;
 				lost++;
 			}
-		CloseClient(sock);
-
 		printf("\nMQTT ping sended %d requests with %d lost responses\n", num, lost);
-	} else {
-		close(sock);
+	} else
 		ret = 4;
-	}
+
+	mqtt_cli_Close(&args->cli);
 
 	args->free(args);
 	free(args);