--- mqtt/src/mqtt_subs.c	2011/12/20 16:04:34	1.1.2.1
+++ mqtt/src/mqtt_subs.c	2012/02/01 16:18:04	1.2.2.1
@@ -181,7 +181,8 @@ 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) {
 		args->free(args);
@@ -189,8 +190,7 @@ main(int argc, char **argv)
 		return 2;
 	}
 
-	printf("Connected ... ");
-	switch ((ret = try2Connect(sock))) {
+	switch ((ret = ConnectClient(sock))) {
 		case -1:
 			printf(">> FAILED!\n");
 			break;
@@ -222,13 +222,14 @@ main(int argc, char **argv)
 		if (lf) {
 			ret = Subscribe(sock, lf);
 			fclose(lf);
-			shutdown(sock, SHUT_RDWR);
 		} else
 			printf("Error:: in subscribe file #%d - %s\n", errno, strerror(errno));
-	} else
+		CloseClient(sock);
+	} else {
+		close(sock);
 		ret = 3;
+	}
 
-	close(sock);
 	args->free(args);
 	free(args);
 	return ret;