--- mqtt/src/mqttd.c	2011/12/01 08:15:25	1.1.1.1.2.8
+++ mqtt/src/mqttd.c	2012/01/27 15:05:38	1.2
@@ -1,14 +1,21 @@
 #include "global.h"
+#include "mqttd.h"
 #include "rtlm.h"
 #include "utils.h"
 #include "daemon.h"
 
 
+io_enableDEBUG;
+
 sl_config cfg;
+sessions_t Sessions;
 sched_root_task_t *root;
+sqlite3 *acc, *pub;
+pthread_mutex_t mtx_sess, mtx_pub;
+FILE *logg;
 extern char compiled[], compiledby[], compilehost[];
 static char szCfgName[MAXPATHLEN];
-int Verbose, Kill;
+intptr_t Kill;
 
 
 static void
@@ -32,18 +39,20 @@ sigHand(int sig)
 		case SIGHUP:
 			UnloadConfig(&cfg);
 			if (!LoadConfig(szCfgName, &cfg)) {
-				VERB(1) syslog(LOG_DEBUG, "Config reload OK!");
+				ioDEBUG(1, "Config reload OK!");
 				break;
 			}
 
 			syslog(LOG_ERR, "Error:: can't reload #%d - %s", cfg_GetErrno(), cfg_GetError());
 		case SIGTERM:
-			VERB(1) syslog(LOG_DEBUG, "Terminate MQTT service in progress");
+			ioDEBUG(1, "Terminate MQTT service in progress");
 			Kill++;
 			break;
 		case SIGCHLD:
 			while (waitpid(-1, &stat, WNOHANG) > 0);
 			break;
+		case SIGPIPE:
+			break;
 	}
 }
 
@@ -53,12 +62,12 @@ main(int argc, char **argv)
 {
 	char ch, batch = 0, szStr[STRSIZ];
 	register int i;
-	sqlite3 *acc = NULL, *pub = NULL;
-	FILE *logg = NULL;
 	int sock = -1, ret = 0;
 	struct passwd *pass;
 	struct sigaction sa;
 
+	TAILQ_INIT(&Sessions);
+
 	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
 	while ((ch = getopt(argc, argv, "hvbc:")) != -1)
 		switch (ch) {
@@ -69,7 +78,7 @@ main(int argc, char **argv)
 				batch++;
 				break;
 			case 'v':
-				Verbose++;
+				io_incDebug;
 				break;
 			case 'h':
 			default:
@@ -83,6 +92,8 @@ main(int argc, char **argv)
 		printf("Error:: can't load #%d - %s\n", cfg_GetErrno(), cfg_GetError());
 		return 1;
 	}
+	pthread_mutex_init(&mtx_sess, NULL);
+	pthread_mutex_init(&mtx_pub, NULL);
 	openlog("mqttd", LOG_PID | LOG_CONS, LOG_DAEMON);
 	for (i = 0; i < 3; i++)
 		if (!mqttLoadRTLM(&cfg, i)) {
@@ -91,6 +102,8 @@ main(int argc, char **argv)
 				mqttUnloadRTLM(i);
 			UnloadConfig(&cfg);
 			closelog();
+			pthread_mutex_destroy(&mtx_pub);
+			pthread_mutex_destroy(&mtx_sess);
 			return 2;
 		}
 	acc = call.OpenACC(&cfg);
@@ -115,13 +128,6 @@ main(int argc, char **argv)
 		goto end;
 	}
 
-	memset(&sa, 0, sizeof sa);
-	sigemptyset(&sa.sa_mask);
-	sa.sa_handler = sigHand;
-	sigaction(SIGHUP, &sa, NULL);
-	sigaction(SIGTERM, &sa, NULL);
-	sigaction(SIGCHLD, &sa, NULL);
-
 	if (!batch)
 		switch (fork()) {
 			case -1:
@@ -138,18 +144,25 @@ main(int argc, char **argv)
 					dup2(ret, STDERR_FILENO);
 					close(ret);
 				}
-				VERB(2) syslog(LOG_DEBUG, "Welcome MQTT service into shadow land!");
+				ioDEBUG(2, "Welcome MQTT service into shadow land!");
 				break;
 			default:
-				VERB(2) syslog(LOG_DEBUG, "MQTT service go to shadow land ...");
+				ioDEBUG(2, "MQTT service go to shadow land ...");
 				sleep(1);
 				ret = 0;
 				goto end;
 		}
 	else
-		VERB(1) printf("Start service in batch mode ...\n");
+		ioVERBOSE(1) printf("Start service in batch mode ...\n");
 
-	VERB(2) syslog(LOG_DEBUG, "Service is ready for start engine ...");
+	memset(&sa, 0, sizeof sa);
+	sigemptyset(&sa.sa_mask);
+	sa.sa_handler = sigHand;
+	sigaction(SIGHUP, &sa, NULL);
+	sigaction(SIGTERM, &sa, NULL);
+	sigaction(SIGCHLD, &sa, NULL);
+	sigaction(SIGPIPE, &sa, NULL);
+	ioDEBUG(2, "Service is ready for start engine ...");
 
 	if ((sock = srv_Socket(&cfg)) == -1) {
 		ret = 4;
@@ -161,7 +174,7 @@ main(int argc, char **argv)
 	if (pass) {
 		setgid(pass->pw_gid);
 		setuid(pass->pw_uid);
-		VERB(1) syslog(LOG_WARNING, "Try to change group #%d and user #%d", pass->pw_gid, pass->pw_uid);
+		ioDEBUG(2, "Try to change group #%d and user #%d", pass->pw_gid, pass->pw_uid);
 	}
 
 	if (!(root = schedBegin())) {
@@ -174,8 +187,7 @@ main(int argc, char **argv)
 
 	schedEnd(&root);
 end:
-	if (sock > STDERR_FILENO)
-		srv_Close(sock);
+	srv_Close(sock);
 	call.CloseLOG(logg);
 	call.ClosePUB(pub);
 	call.CloseACC(acc);
@@ -183,5 +195,7 @@ end:
 		mqttUnloadRTLM(i);
 	closelog();
 	UnloadConfig(&cfg);
+	pthread_mutex_destroy(&mtx_pub);
+	pthread_mutex_destroy(&mtx_sess);
 	return ret;
 }