--- mqtt/src/mqtt_subs.c	2012/04/27 10:07:51	1.2.2.3
+++ mqtt/src/mqtt_subs.c	2012/04/27 16:41:56	1.2.2.4
@@ -54,9 +54,12 @@ Subscribe(int sock, FILE *lf)
 {
 	int siz;
 	u_char *qoses;
-	u_short mid;
+	u_short mid[2];
 
-	siz = mqtt_msgSUBSCRIBE(args->msg, args->subscr, AIT_GET_U16(&args->ConnID), args->Dup, args->QoS);
+	srandomdev();
+	mid[0] = random() % USHRT_MAX;
+
+	siz = mqtt_msgSUBSCRIBE(args->msg, args->subscr, mid[0], args->Dup, args->QoS);
 	if (siz == -1) {
 		printf("Error:: in msgSUBSCRIBE #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 		return -1;
@@ -68,17 +71,17 @@ Subscribe(int sock, FILE *lf)
 	siz = RecvFrom(sock);
 	if (siz == -1)
 		return -1;
-	siz = mqtt_readSUBACK(args->msg, &mid, &qoses);
+	siz = mqtt_readSUBACK(args->msg, &mid[1], &qoses);
 	if (siz == -1) {
 		printf("Error:: in readSUBACK #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 		return -1;
 	}
-	if (mid != AIT_GET_U16(&args->ConnID)) {
-		printf("Error:: received different connection ID %d != %d\n", 
-				mid, AIT_GET_U16(&args->ConnID));
+	if (mid[1] != mid[0]) {
+		printf("Error:: received different connection ID %d != %d\n", mid[1], mid[0]);
 		return -1;
 	}
 
+	free(qoses);
 	return 0;
 }
 
@@ -113,6 +116,7 @@ main(int argc, char **argv)
 		return 1;
 	}
 
+	AIT_SET_STR(&args->ConnID, "");
 	AIT_SET_STR(&args->User, "");
 	AIT_SET_STR(&args->Pass, "");
 
@@ -203,8 +207,10 @@ main(int argc, char **argv)
 		free(args);
 		Usage();
 		return 1;
-	} else
-		AIT_SET_U16(&args->ConnID, strtol(argv[1], NULL, 0));
+	} else {
+		AIT_FREE_VAL(&args->ConnID);
+		AIT_SET_STR(&args->ConnID, argv[1]);
+	}
 	if (argc > 2) {
 		AIT_FREE_VAL(&args->Value);
 		AIT_SET_STR(&args->Value, argv[2]);