--- mqtt/src/Attic/mqtt.c	2011/12/13 09:01:43	1.1.1.1.2.23
+++ mqtt/src/Attic/mqtt.c	2011/12/13 15:23:43	1.1.1.1.2.27
@@ -19,17 +19,21 @@ Usage(void)
 {
 	printf(	" -= MQTT Client =- Publisher/Subscriber from ELWIX\n"
 		"=== %s@%s === Compiled: %s ===\n\n"
-		" Syntax: mqtt [options] <connect_to_broker[:port]> [value_for_publish]\n\n"
+		" Syntax: mqtt [options] <connect_to_broker[:port]> <ConnectID> [value_for_publish]\n\n"
 		"\t-t <topic>\t\tPublish topic\n"
 		"\t-s <topic[|QoS]>\tSubscribe for this topic, if wish add different |QoS to topic\n"
 		"\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\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"
+		"\t-M <message>\t\tWill Message\n"
 		"\t-D\t\t\tDaemon mode\n"
 		"\t-v\t\t\tVerbose (more -vvv, more verbose)\n"
 		"\t-h\t\t\tHelp! This screen\n\n", 
@@ -39,10 +43,14 @@ Usage(void)
 static void
 cleanArgs(struct tagArgs * __restrict args)
 {
+	mqtt_msgFree(&args->msg, 42);
+	AIT_FREE_VAL(&args->Will.Msg);
+	AIT_FREE_VAL(&args->Will.Topic);
 	AIT_FREE_VAL(&args->User);
 	AIT_FREE_VAL(&args->Pass);
 	AIT_FREE_VAL(&args->Publish);
 	AIT_FREE_VAL(&args->Value);
+	AIT_FREE_VAL(&args->ConnID);
 	io_freeVars(&args->Subscribes);
 }
 
@@ -50,7 +58,7 @@ cleanArgs(struct tagArgs * __restrict args)
 int
 main(int argc, char **argv)
 {
-	char ch, batch = 1, szStr[STRSIZ] = { 0 };
+	char ch, batch = 1;
 	ait_val_t *v, val;
 	u_short port = atoi(MQTT_PORT);
 	int sock;
@@ -58,16 +66,40 @@ main(int argc, char **argv)
 	if (!(args = malloc(sizeof(struct tagArgs)))) {
 		printf("Error:: in arguments #%d - %s\n", errno, strerror(errno));
 		return 1;
-	} else if (!(args->Subscribes = io_allocVars(1))) {
+	} else
+		memset(args, 0, sizeof(struct tagArgs));
+	if (!(args->Subscribes = io_allocVars(1))) {
 		printf("Error:: in subscribes array #%d - %s\n", io_GetErrno(), io_GetError());
 		free(args);
 		return 1;
 	} else
 		args->free = cleanArgs;
 
+	if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) {
+		printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
+		args->free(args);
+		free(args);
+		return 1;
+	}
+
+	AIT_SET_STR(&args->ConnID, "");
+	AIT_SET_STR(&args->User, "");
+	AIT_SET_STR(&args->Pass, "");
+
 	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
-	while ((ch = getopt(argc, argv, "U:P:p:t:s:q:drc: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);
+				break;
+			case 'W':
+				AIT_FREE_VAL(&args->Will.Topic);
+				AIT_SET_STR(&args->Will.Topic, optarg);
+				break;
 			case 'U':
 				AIT_FREE_VAL(&args->User);
 				AIT_SET_STR(&args->User, optarg);
@@ -84,7 +116,7 @@ main(int argc, char **argv)
 				AIT_SET_STR(&args->Publish, optarg);
 				break;
 			case 's':
-				v = malloc(sizeof(ait_val_t));
+				v = io_allocVar();
 				if (!v) {
 					printf("Error:: not enough memory #%d - %s\n", errno, strerror(errno));
 					args->free(args);
@@ -92,11 +124,11 @@ main(int argc, char **argv)
 					return 1;
 				} else
 					AIT_SET_STR(v, optarg);
-				io_arrayElem(args->Subscribes, io_arraySize(args->Subscribes), (void**) &v);
+				io_arrayElem(args->Subscribes, io_arraySize(args->Subscribes), v);
 				break;
 			case 'q':
 				args->QoS = (char) strtol(optarg, NULL, 0);
-				if (args->QoS < MQTT_QOS_ONCE || args->QoS > MQTT_QOS_EXACTLY) {
+				if (args->QoS > MQTT_QOS_EXACTLY) {
 					printf("Error:: invalid QoS level %d\n", args->QoS);
 					args->free(args);
 					free(args);
@@ -109,6 +141,9 @@ main(int argc, char **argv)
 			case 'r':
 				args->Retain++;
 				break;
+			case 'C':
+				args->notClear++;
+				break;
 			case 'f':
 				args->isFile++;
 				break;
@@ -130,15 +165,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);
@@ -156,9 +194,18 @@ main(int argc, char **argv)
 	}
 
 	if ((sock = InitClient()) == -1) {
+		UnloadConfig(&cfg);
 		args->free(args);
 		free(args);
 		return 2;
+	}
+
+	if (try2Connect(sock) == -1) {
+		close(sock);
+		UnloadConfig(&cfg);
+		args->free(args);
+		free(args);
+		return 3;
 	}
 
 	shutdown(sock, SHUT_RDWR);