--- mqtt/src/mqtt_pub.c	2011/12/29 14:13:13	1.1.2.4
+++ mqtt/src/mqtt_pub.c	2012/07/03 09:02:50	1.3
@@ -50,7 +50,24 @@ static int
 Publish(int sock)
 {
 	int siz = 0;
+	u_short mid = 0;
 
+#ifdef __NetBSD__
+	srandom(getpid() ^ time(NULL));
+#else
+	srandomdev();
+#endif
+	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("Sended %d bytes \n", siz);
+
 	return siz;
 }
 
@@ -61,9 +78,9 @@ 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)))) {
+	if (!(args = io_malloc(sizeof(struct tagArgs)))) {
 		printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno));
 		return 1;
 	} else
@@ -73,7 +90,7 @@ main(int argc, char **argv)
 	if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) {
 		printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 		args->free(args);
-		free(args);
+		io_free(args);
 		return 1;
 	}
 
@@ -111,7 +128,7 @@ main(int argc, char **argv)
 				if (args->QoS > MQTT_QOS_EXACTLY) {
 					printf("Error:: invalid QoS level %d\n", args->QoS);
 					args->free(args);
-					free(args);
+					io_free(args);
 					return 1;
 				}
 				break;
@@ -133,7 +150,7 @@ main(int argc, char **argv)
 			case 'h':
 			default:
 				args->free(args);
-				free(args);
+				io_free(args);
 				Usage();
 				return 1;
 		}
@@ -142,7 +159,7 @@ main(int argc, char **argv)
 	if (argc < 4) {
 		printf("Error:: host for connect not found, connection id, topic or value not supplied!\n\n");
 		args->free(args);
-		free(args);
+		io_free(args);
 		Usage();
 		return 1;
 	} else {
@@ -156,26 +173,27 @@ main(int argc, char **argv)
 	if (!io_gethostbyname(*argv, port, &args->addr)) {
 		printf("Error:: host not valid #%d - %s\n", io_GetErrno(), io_GetError());
 		args->free(args);
-		free(args);
+		io_free(args);
 		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);
+		io_free(args);
 		return 2;
 	}
 
 	if (args->isFile && !OpenFile()) {
+		mqtt_cli_Close(&args->cli);
 		args->free(args);
-		free(args);
+		io_free(args);
 		return 3;
 	}
 
-	printf("Connected ... ");
-	switch ((ret = ConnectClient(sock))) {
+	switch ((ret = ConnectClient(args->cli->sock))) {
 		case -1:
 			printf(">> FAILED!\n");
 			break;
@@ -200,16 +218,14 @@ main(int argc, char **argv)
 	}
 
 	if (ret == MQTT_RETCODE_ACCEPTED) {
-		ret = Publish(sock);
-		shutdown(sock, SHUT_RDWR);
-		CloseClient(sock);
-	} else {
-		close(sock);
+		ret = (Publish(args->cli->sock) == -1);
+	} else
 		ret = 4;
-	}
 
+	mqtt_cli_Close(&args->cli);
+
 	CloseFile();
 	args->free(args);
-	free(args);
+	io_free(args);
 	return ret;
 }