--- mqtt/src/mqtt_subs.c	2012/04/27 16:41:56	1.2.2.4
+++ mqtt/src/mqtt_subs.c	2012/05/01 22:30:31	1.2.2.5
@@ -93,7 +93,7 @@ main(int argc, char **argv)
 	ait_val_t val;
 	u_short port = atoi(MQTT_PORT);
 	mqtt_subscr_t *sub;
-	int sock, ret = 0;
+	int ret = 0;
 	char *str, szStr[STRSIZ], szLogName[MAXPATHLEN] = { 0 };
 	FILE *lf;
 
@@ -225,13 +225,13 @@ 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;
 	}
 
-	switch ((ret = ConnectClient(sock))) {
+	switch ((ret = ConnectClient(args->cli->sock))) {
 		case -1:
 			printf(">> FAILED!\n");
 			break;
@@ -261,15 +261,14 @@ main(int argc, char **argv)
 		else
 			lf = stdout;
 		if (lf) {
-			ret = Subscribe(sock, lf);
+			ret = Subscribe(args->cli->sock, lf);
 			fclose(lf);
 		} else
 			printf("Error:: in subscribe file #%d - %s\n", errno, strerror(errno));
-		CloseClient(sock);
-	} else {
-		close(sock);
+	} else
 		ret = 3;
-	}
+
+	mqtt_cli_Close(&args->cli);
 
 	args->free(args);
 	free(args);