--- mqtt/src/Attic/mqtt.c	2011/12/13 15:23:43	1.1.1.1.2.27
+++ mqtt/src/Attic/mqtt.c	2011/12/14 15:09:31	1.1.1.1.2.29
@@ -4,12 +4,14 @@
 #include "client.h"
 
 
+io_enableDEBUG;
+
 sl_config cfg;
 sqlite3 *acc, *pub;
 FILE *logg;
 extern char compiled[], compiledby[], compilehost[];
 static char szCfgName[MAXPATHLEN];
-int Verbose, Kill;
+intptr_t Kill;
 
 struct tagArgs *args;
 
@@ -86,6 +88,7 @@ main(int argc, char **argv)
 	AIT_SET_STR(&args->User, "");
 	AIT_SET_STR(&args->Pass, "");
 
+	args->ka = MQTT_KEEPALIVE;
 	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
 	while ((ch = getopt(argc, argv, "T:U:P:p:t:s:q:drc:W:M:fDvh")) != -1)
 		switch (ch) {
@@ -154,7 +157,7 @@ main(int argc, char **argv)
 				batch = 0;
 				break;
 			case 'v':
-				Verbose++;
+				io_incDebug;
 				break;
 			case 'h':
 			default:
@@ -184,7 +187,7 @@ main(int argc, char **argv)
 		Usage();
 		return 1;
 	}
-	VERB(1) printf("Connecting to %s:%d ...\n", io_n2addr(&args->addr, &val), io_n2port(&args->addr));
+	ioVERBOSE(1) printf("Connecting to %s:%d ...\n", io_n2addr(&args->addr, &val), io_n2port(&args->addr));
 
 	if (LoadConfig(szCfgName, &cfg)) {
 		printf("Error:: can't load #%d - %s\n", cfg_GetErrno(), cfg_GetError());
@@ -200,12 +203,33 @@ main(int argc, char **argv)
 		return 2;
 	}
 
-	if (try2Connect(sock) == -1) {
-		close(sock);
-		UnloadConfig(&cfg);
-		args->free(args);
-		free(args);
-		return 3;
+	printf("Connected ... ");
+	switch (try2Connect(sock)) {
+		case -1:
+			printf("FAILED!\n");
+			close(sock);
+			UnloadConfig(&cfg);
+			args->free(args);
+			free(args);
+			return 3;
+		case MQTT_RETCODE_ACCEPTED:
+			printf("OK\n");
+			break;
+		case MQTT_RETCODE_REFUSE_VER:
+			printf("Incorrect version\n");
+			break;
+		case MQTT_RETCODE_REFUSE_ID:
+			printf("Incorrect connectID\n");
+			break;
+		case MQTT_RETCODE_REFUSE_UNAVAIL:
+			printf("Service unavailable\n");
+			break;
+		case MQTT_RETCODE_REFUSE_USERPASS:
+			printf("Refuse user/pass\n");
+			break;
+		case MQTT_RETCODE_DENIED:
+			printf("DENIED.\n");
+			break;
 	}
 
 	shutdown(sock, SHUT_RDWR);