--- mqtt/src/mqtt_pub.c	2011/12/20 15:03:42	1.1.2.1
+++ mqtt/src/mqtt_pub.c	2012/05/09 13:57:39	1.2.2.6
@@ -6,9 +6,7 @@
 
 io_enableDEBUG;
 
-sl_config cfg;
 extern char compiled[], compiledby[], compilehost[];
-static char szCfgName[MAXPATHLEN];
 
 struct tagArgs *args;
 
@@ -30,7 +28,6 @@ Usage(void)
 		"\t-P <password>\t\tPassword\n"
 		"\t-W <topic>\t\tWill Topic\n"
 		"\t-M <message>\t\tWill Message\n"
-		"\t-c <config>\t\tService config\n"
 		"\t-v\t\t\tVerbose (more -vvv, more verbose)\n"
 		"\t-h\t\t\tHelp! This screen\n\n", 
 		compiledby, compilehost, compiled);
@@ -52,7 +49,22 @@ cleanArgs(struct tagArgs * __restrict args)
 static int
 Publish(int sock)
 {
-	return 0;
+	int siz = 0;
+	u_short mid = 0;
+
+	srandomdev();
+	mid = random() % USHRT_MAX;
+
+	printf(" > Execute PUBLISH request #%d ... ", mid);
+	siz = mqtt_cli_Publish(args->cli, mid, args->Dup, args->QoS, args->Retain, 
+			AIT_GET_STR(&args->Publish), AIT_ADDR(&args->Value), AIT_LEN(&args->Value));
+	if (siz == -1) {
+		printf("Error:: Publish #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
+		return -1;
+	} else
+		printf("OK\n");
+
+	return siz;
 }
 
 
@@ -62,7 +74,7 @@ main(int argc, char **argv)
 	char ch;
 	ait_val_t val;
 	u_short port = atoi(MQTT_PORT);
-	int sock, ret = 0;
+	int ret = 0;
 
 	if (!(args = malloc(sizeof(struct tagArgs)))) {
 		printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno));
@@ -83,8 +95,7 @@ main(int argc, char **argv)
 	AIT_SET_STR(&args->Pass, "");
 
 	args->ka = MQTT_KEEPALIVE;
-	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
-	while ((ch = getopt(argc, argv, "T:U:P:p:q:drCc:W:M:fvh")) != -1)
+	while ((ch = getopt(argc, argv, "T:U:P:p:q:drCW:M:fvh")) != -1)
 		switch (ch) {
 			case 'T':
 				args->ka = (u_short) strtol(optarg, NULL, 0);
@@ -129,9 +140,6 @@ main(int argc, char **argv)
 			case 'f':
 				args->isFile++;
 				break;
-			case 'c':
-				strlcpy(szCfgName, optarg, sizeof szCfgName);
-				break;
 			case 'v':
 				io_incDebug;
 				break;
@@ -165,16 +173,23 @@ 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) {
+	if (!(args->cli = mqtt_cli_Open(&args->addr.sa, args->ka))) {
 		args->free(args);
 		free(args);
 		return 2;
 	}
 
-	printf("Connected ... ");
-	switch ((ret = try2Connect(sock))) {
+	if (args->isFile && !OpenFile()) {
+		mqtt_cli_Close(&args->cli);
+		args->free(args);
+		free(args);
+		return 3;
+	}
+
+	switch ((ret = ConnectClient(args->cli->sock))) {
 		case -1:
 			printf(">> FAILED!\n");
 			break;
@@ -199,12 +214,13 @@ main(int argc, char **argv)
 	}
 
 	if (ret == MQTT_RETCODE_ACCEPTED) {
-		ret = Publish(sock);
-		shutdown(sock, SHUT_RDWR);
+		ret = (Publish(args->cli->sock) == -1);
 	} else
-		ret = 3;
+		ret = 4;
 
-	close(sock);
+	mqtt_cli_Close(&args->cli);
+
+	CloseFile();
 	args->free(args);
 	free(args);
 	return ret;