--- mqtt/src/mqtt_pub.c	2012/04/16 00:09:57	1.2.2.3
+++ mqtt/src/mqtt_pub.c	2012/05/01 22:30:31	1.2.2.4
@@ -122,7 +122,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));
@@ -229,19 +229,20 @@ main(int argc, char **argv)
 	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->free(args);
 		free(args);
 		return 2;
 	}
 
 	if (args->isFile && !OpenFile()) {
+		mqtt_cli_Close(&args->cli);
 		args->free(args);
 		free(args);
 		return 3;
 	}
 
-	switch ((ret = ConnectClient(sock))) {
+	switch ((ret = ConnectClient(args->cli->sock))) {
 		case -1:
 			printf(">> FAILED!\n");
 			break;
@@ -266,12 +267,11 @@ main(int argc, char **argv)
 	}
 
 	if (ret == MQTT_RETCODE_ACCEPTED) {
-		ret = !(Publish(sock) == args->MsgID);
-		CloseClient(sock);
-	} else {
-		close(sock);
+		ret = !(Publish(args->cli->sock) == args->MsgID);
+	} else
 		ret = 4;
-	}
+
+	mqtt_cli_Close(&args->cli);
 
 	CloseFile();
 	args->free(args);