--- mqtt/src/Attic/mqtt.c	2011/12/12 09:45:16	1.1.1.1.2.21
+++ mqtt/src/Attic/mqtt.c	2011/12/13 08:43:51	1.1.1.1.2.22
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "rtlm.h"
 #include "mqtt.h"
+#include "client.h"
 
 
 sl_config cfg;
@@ -19,44 +20,85 @@ 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"
-		"\t-p <topic>\tPublish topic\n"
+		"\t-p <topic>\t\tPublish topic\n"
 		"\t-s <topic[|QoS]>\tSubscribe for this topic, if wish add different |QoS to topic\n"
-		"\t-q <QoS>\tQoS level (0-at most 1, 1-at least 1, 2-explicit 1)\n"
-		"\t-d\t\tSend duplicate message\n"
-		"\t-r\t\tRetain message from broker\n"
-		"\t-c <config>\tService config\n"
-		"\t-f\t\t'value_for_publish' is file instead text\n"
-		"\t-D\t\tDaemon mode\n"
-		"\t-v\t\tVerbose (more -vvv, more verbose)\n"
-		"\t-h\t\tHelp! This screen\n\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 <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-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", 
 		compiledby, compilehost, compiled);
 }
 
+static void
+cleanArgs(struct tagArgs * __restrict args)
+{
+	AIT_FREE_VAL(&args->Publish);
+	AIT_FREE_VAL(&args->Value);
+	io_freeVars(&args->Subscribes);
+}
 
+
 int
 main(int argc, char **argv)
 {
 	char ch, batch = 1, szStr[STRSIZ] = { 0 };
+	ait_val_t *v, val;
+	u_short port = atoi(MQTT_PORT);
+	int sock;
 
 	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))) {
+		printf("Error:: in subscribes array #%d - %s\n", io_GetErrno(), io_GetError());
+		free(args);
+		return 1;
+	} else
+		args->free = cleanArgs;
 
 	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
-	while ((ch = getopt(argc, argv, "p:s:q:drc:fDvh")) != -1)
+	while ((ch = getopt(argc, argv, "P:p:s:q:drc:fDvh")) != -1)
 		switch (ch) {
+			case 'P':
+				port = (u_short) strtol(optarg, NULL, 0);
+				break;
 			case 'p':
+				AIT_FREE_VAL(&args->Publish);
+				AIT_SET_STR(&args->Publish, optarg);
 				break;
 			case 's':
+				v = malloc(sizeof(ait_val_t));
+				if (!v) {
+					printf("Error:: not enough memory #%d - %s\n", errno, strerror(errno));
+					args->free(args);
+					free(args);
+					return 1;
+				} else
+					AIT_SET_STR(v, optarg);
+				io_arrayElem(args->Subscribes, io_arraySize(args->Subscribes), (void**) &v);
 				break;
 			case 'q':
+				args->QoS = (char) strtol(optarg, NULL, 0);
+				if (args->QoS < MQTT_QOS_ONCE || args->QoS > MQTT_QOS_EXACTLY) {
+					printf("Error:: invalid QoS level %d\n", args->QoS);
+					args->free(args);
+					free(args);
+					return 1;
+				}
 				break;
 			case 'd':
+				args->Dup++;
 				break;
 			case 'r':
+				args->Retain++;
 				break;
 			case 'f':
+				args->isFile++;
 				break;
 			case 'c':
 				strlcpy(szCfgName, optarg, sizeof szCfgName);
@@ -69,20 +111,49 @@ main(int argc, char **argv)
 				break;
 			case 'h':
 			default:
+				args->free(args);
 				free(args);
 				Usage();
 				return 1;
 		}
 	argc -= optind;
 	argv += optind;
+	if (!argc) {
+		printf("Error:: host for connect not found!\n");
+		args->free(args);
+		free(args);
+		Usage();
+		return 1;
+	}
+	if (argc > 1)
+		AIT_SET_STR(&args->Value, argv[1]);
+	if (!io_gethostbyname(*argv, port, &args->addr)) {
+		printf("Error:: host not connect #%d - %s\n", io_GetErrno(), io_GetError());
+		args->free(args);
+		free(args);
+		Usage();
+		return 1;
+	}
+	VERB(1) printf("Connecting to %s:%d ...\n", io_n2addr(&args->addr, &val), io_n2port(&args->addr));
 
 	if (LoadConfig(szCfgName, &cfg)) {
 		printf("Error:: can't load #%d - %s\n", cfg_GetErrno(), cfg_GetError());
+		args->free(args);
 		free(args);
 		return 1;
 	}
 
+	if ((sock = InitClient()) == -1) {
+		args->free(args);
+		free(args);
+		return 2;
+	}
+
+	shutdown(sock, SHUT_RDWR);
+	close(sock);
+
 	UnloadConfig(&cfg);
+	args->free(args);
 	free(args);
 	return 0;
 }