--- mqtt/src/mqtt_ping.c	2012/01/30 13:39:22	1.1.2.1
+++ mqtt/src/mqtt_ping.c	2012/05/27 10:04:05	1.1.2.7
@@ -16,6 +16,7 @@ Usage(void)
 	printf(	" -= MQTT PING =- MQTT Ping from ELWIX\n"
 		"=== %s@%s === Compiled: %s ===\n\n"
 		" Syntax: mqtt_ping [options] <connect_to_broker[:port]> <ConnectID>\n\n"
+		"\t-c <num>\t\tNumber of ping requests (default: 1)\n"
 		"\t-p <port>\t\tDifferent port for connect (default: 1883)\n"
 		"\t-T <timeout>\t\tKeep alive timeout in seconds (default: 10sec)\n"
 		"\t-U <username>\t\tUsername\n"
@@ -35,34 +36,23 @@ cleanArgs(struct tagArgs * __restrict args)
 }
 
 static int
-Ping(int sock)
+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;
 
 	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;
 
-	if ((siz = RecvFrom(sock)) == -1 || !siz)
-		return -1;
-	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 MQTT broker %s ... %f sec.\n", io_n2addr(&args->addr, &val), 
-			((after.tv_sec - before.tv_sec) + (after.tv_usec - before.tv_usec) / 1.e6));
+	timersub(&after, &before, &calc);
+	timeradd(accu, &calc, accu);
+
+	printf(" + Ping %d MQTT broker %s ... %f sec.\n", num, io_n2addr(&args->addr, &val), 
+			calc.tv_sec + calc.tv_usec / 1.e6);
 	AIT_FREE_VAL(&val);
 
 	return 0;
@@ -75,9 +65,11 @@ main(int argc, char **argv)
 	char ch;
 	ait_val_t val;
 	u_short port = atoi(MQTT_PORT);
-	int sock, ret = 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
@@ -87,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;
 	}
 
@@ -96,8 +88,11 @@ main(int argc, char **argv)
 	AIT_SET_STR(&args->Pass, "");
 
 	args->ka = MQTT_KEEPALIVE;
-	while ((ch = getopt(argc, argv, "T:U:P:p:vh")) != -1)
+	while ((ch = getopt(argc, argv, "T:U:P:p:c:vh")) != -1)
 		switch (ch) {
+			case 'c':
+				num = (int) strtol(optarg, NULL, 0);
+				break;
 			case 'T':
 				args->ka = (u_short) strtol(optarg, NULL, 0);
 				break;
@@ -118,7 +113,7 @@ main(int argc, char **argv)
 			case 'h':
 			default:
 				args->free(args);
-				free(args);
+				io_free(args);
 				Usage();
 				return 1;
 		}
@@ -127,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 {
@@ -137,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;
 	}
-	ioVERBOSE(1) printf("Connecting to %s:%d ...\n", io_n2addr(&args->addr, &val), io_n2port(&args->addr));
+	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;
@@ -174,15 +169,21 @@ main(int argc, char **argv)
 			break;
 	}
 
+	timerclear(&accu);
 	if (ret == MQTT_RETCODE_ACCEPTED) {
-		ret = Ping(sock) ? 3 : 0;
-		CloseClient(sock);
-	} else {
-		close(sock);
+		for (i = 0; i < num; i++)
+			if ((ret = Ping(args->cli->sock, i, &accu))) {
+				ret = 3;
+				lost++;
+			}
+		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;
 }