--- mqtt/src/Attic/mqtt.c	2011/12/13 14:57:15	1.1.1.1.2.26
+++ mqtt/src/Attic/mqtt.c	2011/12/14 12:45:30	1.1.1.1.2.28
@@ -25,10 +25,11 @@ Usage(void)
 		"\t-q <QoS>\t\tQoS level (0-at most 1, 1-at least 1, 2-exactly 1)\n"
 		"\t-d\t\t\tSend duplicate message\n"
 		"\t-r\t\t\tRetain message from broker\n"
-		"\t-C\t\t\tClear before connect\n"
+		"\t-C\t\t\tNot clear before connect!\n"
 		"\t-c <config>\t\tService config\n"
 		"\t-f\t\t\t'value_for_publish' is file instead text\n"
 		"\t-p <port>\t\tDifferent port for connect (default: 1883)\n"
+		"\t-T <timeout>\t\tKeep alive timeout in seconds\n"
 		"\t-U <username>\t\tUsername\n"
 		"\t-P <password>\t\tPassword\n"
 		"\t-W <topic>\t\tWill Topic\n"
@@ -85,9 +86,13 @@ main(int argc, char **argv)
 	AIT_SET_STR(&args->User, "");
 	AIT_SET_STR(&args->Pass, "");
 
+	args->ka = MQTT_KEEPALIVE;
 	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
-	while ((ch = getopt(argc, argv, "U:P:p:t:s:q:drc:W:M:fDvh")) != -1)
+	while ((ch = getopt(argc, argv, "T:U:P:p:t:s:q:drc:W:M:fDvh")) != -1)
 		switch (ch) {
+			case 'T':
+				args->ka = (u_short) strtol(optarg, NULL, 0);
+				break;
 			case 'M':
 				AIT_FREE_VAL(&args->Will.Msg);
 				AIT_SET_STR(&args->Will.Msg, optarg);
@@ -138,7 +143,7 @@ main(int argc, char **argv)
 				args->Retain++;
 				break;
 			case 'C':
-				args->Clear++;
+				args->notClear++;
 				break;
 			case 'f':
 				args->isFile++;
@@ -161,15 +166,18 @@ main(int argc, char **argv)
 		}
 	argc -= optind;
 	argv += optind;
-	if (!argc) {
-		printf("Error:: host for connect not found!\n");
+	if (argc < 2) {
+		printf("Error:: host for connect not found or connection id not supplied!\n");
 		args->free(args);
 		free(args);
 		Usage();
 		return 1;
+	} else {
+		AIT_FREE_VAL(&args->ConnID);
+		AIT_SET_STR(&args->ConnID, argv[1]);
 	}
-	if (argc > 1)
-		AIT_SET_STR(&args->Value, argv[1]);
+	if (argc > 2)
+		AIT_SET_STR(&args->Value, argv[2]);
 	if (!io_gethostbyname(*argv, port, &args->addr)) {
 		printf("Error:: host not connect #%d - %s\n", io_GetErrno(), io_GetError());
 		args->free(args);
@@ -193,12 +201,33 @@ main(int argc, char **argv)
 		return 2;
 	}
 
-	if (try2Connect(sock) == -1) {
-		close(sock);
-		UnloadConfig(&cfg);
-		args->free(args);
-		free(args);
-		return 3;
+	printf("Connected ... ");
+	switch (try2Connect(sock)) {
+		case -1:
+			printf("FAILED!\n");
+			close(sock);
+			UnloadConfig(&cfg);
+			args->free(args);
+			free(args);
+			return 3;
+		case MQTT_RETCODE_ACCEPTED:
+			printf("OK\n");
+			break;
+		case MQTT_RETCODE_REFUSE_VER:
+			printf("Incorrect version\n");
+			break;
+		case MQTT_RETCODE_REFUSE_ID:
+			printf("Incorrect connectID\n");
+			break;
+		case MQTT_RETCODE_REFUSE_UNAVAIL:
+			printf("Service unavailable\n");
+			break;
+		case MQTT_RETCODE_REFUSE_USERPASS:
+			printf("Refuse user/pass\n");
+			break;
+		case MQTT_RETCODE_DENIED:
+			printf("DENIED.\n");
+			break;
 	}
 
 	shutdown(sock, SHUT_RDWR);