--- mqtt/src/mqtt_ping.c	2012/01/30 13:39:22	1.1.2.1
+++ mqtt/src/mqtt_ping.c	2012/04/26 09:15:26	1.1.2.3
@@ -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,11 +36,12 @@ cleanArgs(struct tagArgs * __restrict args)
 }
 
 static int
-Ping(int sock)
+Ping(int sock, int num)
 {
 	int siz = 0;
 	struct timeval before, after;
 	ait_val_t val;
+	struct mqtthdr *hdr;
 
 	gettimeofday(&before, NULL);
 
@@ -51,17 +53,32 @@ Ping(int sock)
 	if (SendTo(sock, siz) == -1)
 		return -1;
 
+reply:
 	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;
+	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 MQTT broker %s ... %f sec.\n", io_n2addr(&args->addr, &val), 
+	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));
 	AIT_FREE_VAL(&val);
 
@@ -75,7 +92,8 @@ main(int argc, char **argv)
 	char ch;
 	ait_val_t val;
 	u_short port = atoi(MQTT_PORT);
-	int sock, ret = 0;
+	int sock, num = 1, ret = 0, lost = 0;
+	register int i;
 
 	if (!(args = malloc(sizeof(struct tagArgs)))) {
 		printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno));
@@ -96,8 +114,10 @@ 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);
 			case 'T':
 				args->ka = (u_short) strtol(optarg, NULL, 0);
 				break;
@@ -141,7 +161,7 @@ main(int argc, char **argv)
 		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) {
@@ -175,8 +195,14 @@ main(int argc, char **argv)
 	}
 
 	if (ret == MQTT_RETCODE_ACCEPTED) {
-		ret = Ping(sock) ? 3 : 0;
+		for (i = 0; i < num; i++)
+			if ((ret = Ping(sock, i))) {
+				ret = 3;
+				lost++;
+			}
 		CloseClient(sock);
+
+		printf("\nMQTT ping sended %d requests with %d lost responses\n", num, lost);
 	} else {
 		close(sock);
 		ret = 4;