--- mqtt/src/mqtt_ping.c	2012/04/26 09:15:26	1.1.2.3
+++ mqtt/src/mqtt_ping.c	2012/07/03 09:02:50	1.2
@@ -36,50 +36,23 @@ cleanArgs(struct tagArgs * __restrict args)
 }
 
 static int
-Ping(int sock, int num)
+Ping(int sock, int num, struct timeval * __restrict accu)
 {
-	int siz = 0;
-	struct timeval before, after;
+	struct timeval before, after, calc;
 	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);
 
+	timersub(&after, &before, &calc);
+	timeradd(accu, &calc, accu);
+
 	printf(" + Ping %d MQTT broker %s ... %f sec.\n", num, io_n2addr(&args->addr, &val), 
-			((after.tv_sec - before.tv_sec) + (after.tv_usec - before.tv_usec) / 1.e6));
+			calc.tv_sec + calc.tv_usec / 1.e6);
 	AIT_FREE_VAL(&val);
 
 	return 0;
@@ -92,10 +65,11 @@ 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;
+	struct timeval accu;
 
-	if (!(args = malloc(sizeof(struct tagArgs)))) {
+	if (!(args = io_malloc(sizeof(struct tagArgs)))) {
 		printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno));
 		return 1;
 	} else
@@ -105,7 +79,7 @@ main(int argc, char **argv)
 	if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) {
 		printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 		args->free(args);
-		free(args);
+		io_free(args);
 		return 1;
 	}
 
@@ -118,6 +92,7 @@ main(int argc, char **argv)
 		switch (ch) {
 			case 'c':
 				num = (int) strtol(optarg, NULL, 0);
+				break;
 			case 'T':
 				args->ka = (u_short) strtol(optarg, NULL, 0);
 				break;
@@ -138,7 +113,7 @@ main(int argc, char **argv)
 			case 'h':
 			default:
 				args->free(args);
-				free(args);
+				io_free(args);
 				Usage();
 				return 1;
 		}
@@ -147,7 +122,7 @@ main(int argc, char **argv)
 	if (argc < 2) {
 		printf("Error:: host for connect not found or connection id!\n\n");
 		args->free(args);
-		free(args);
+		io_free(args);
 		Usage();
 		return 1;
 	} else {
@@ -157,20 +132,20 @@ main(int argc, char **argv)
 	if (!io_gethostbyname(*argv, port, &args->addr)) {
 		printf("Error:: host not valid #%d - %s\n", io_GetErrno(), io_GetError());
 		args->free(args);
-		free(args);
+		io_free(args);
 		Usage();
 		return 1;
 	}
 	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->ka))) {
 		args->free(args);
-		free(args);
+		io_free(args);
 		return 2;
 	}
 
-	switch ((ret = ConnectClient(sock))) {
+	switch ((ret = ConnectClient(args->cli->sock))) {
 		case -1:
 			printf(">> FAILED!\n");
 			break;
@@ -194,21 +169,21 @@ main(int argc, char **argv)
 			break;
 	}
 
+	timerclear(&accu);
 	if (ret == MQTT_RETCODE_ACCEPTED) {
 		for (i = 0; i < num; i++)
-			if ((ret = Ping(sock, i))) {
+			if ((ret = Ping(args->cli->sock, i, &accu))) {
 				ret = 3;
 				lost++;
 			}
-		CloseClient(sock);
-
-		printf("\nMQTT ping sended %d requests with %d lost responses\n", num, lost);
-	} else {
-		close(sock);
+		printf("\nMQTT ping sended %d requests with %d lost responses and avarage %f sec.\n", 
+				num, lost, (accu.tv_sec + accu.tv_usec / 1.e6) / (num - lost));
+	} else
 		ret = 4;
-	}
 
+	mqtt_cli_Close(&args->cli);
+
 	args->free(args);
-	free(args);
+	io_free(args);
 	return ret;
 }