--- mqtt/src/mqttd.c	2011/12/09 09:53:54	1.1.1.1.2.10
+++ mqtt/src/mqttd.c	2012/04/24 13:54:50	1.2.2.6
@@ -5,12 +5,18 @@
 #include "daemon.h"
 
 
-sl_config cfg;
+io_enableDEBUG;
+
+cfg_root_t cfg;
 sessions_t Sessions;
+pubs_t Pubs;
 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;
+volatile intptr_t Kill;
 
 
 static void
@@ -29,23 +35,32 @@ static void
 sigHand(int sig)
 {
 	int stat;
+	struct tagSession *sess;
 
 	switch (sig) {
 		case SIGHUP:
-			UnloadConfig(&cfg);
-			if (!LoadConfig(szCfgName, &cfg)) {
-				VERB(1) syslog(LOG_DEBUG, "Config reload OK!");
+			cfgUnloadConfig(&cfg);
+			if (!cfgLoadConfig(szCfgName, &cfg)) {
+				ioDEBUG(1, "Config reload OK!");
 				break;
 			}
 
-			syslog(LOG_ERR, "Error:: can't reload #%d - %s", cfg_GetErrno(), cfg_GetError());
+			ioLIBERR(cfg);
 		case SIGTERM:
-			VERB(1) syslog(LOG_DEBUG, "Terminate MQTT service in progress");
+			ioDEBUG(1, "Terminate MQTT service in progress");
 			Kill++;
+
+			SESS_LOCK;
+			TAILQ_FOREACH(sess, &Sessions, sess_node)
+				if (sess->sess_tid)
+					pthread_cancel(sess->sess_tid);
+			SESS_UNLOCK;
 			break;
 		case SIGCHLD:
 			while (waitpid(-1, &stat, WNOHANG) > 0);
 			break;
+		case SIGPIPE:
+			break;
 	}
 }
 
@@ -53,15 +68,15 @@ sigHand(int sig)
 int
 main(int argc, char **argv)
 {
-	char ch, batch = 0, szStr[STRSIZ];
+	char ch, batch = 0;
 	register int i;
-	sqlite3 *acc = NULL, *pub = NULL;
-	FILE *logg = NULL;
 	int sock = -1, ret = 0;
 	struct passwd *pass;
 	struct sigaction sa;
+	ait_val_t v;
 
 	TAILQ_INIT(&Sessions);
+	TAILQ_INIT(&Pubs);
 
 	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
 	while ((ch = getopt(argc, argv, "hvbc:")) != -1)
@@ -73,7 +88,7 @@ main(int argc, char **argv)
 				batch++;
 				break;
 			case 'v':
-				Verbose++;
+				io_incDebug;
 				break;
 			case 'h':
 			default:
@@ -83,18 +98,23 @@ main(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
-	if (LoadConfig(szCfgName, &cfg)) {
+	if (cfgLoadConfig(szCfgName, &cfg)) {
 		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);
+	/* load 3 plugins */
 	for (i = 0; i < 3; i++)
 		if (!mqttLoadRTLM(&cfg, i)) {
 			printf("Error:: Can't load RTL module\n");
 			while (i--)
 				mqttUnloadRTLM(i);
-			UnloadConfig(&cfg);
+			cfgUnloadConfig(&cfg);
 			closelog();
+			pthread_mutex_destroy(&mtx_pub);
+			pthread_mutex_destroy(&mtx_sess);
 			return 2;
 		}
 	acc = call.OpenACC(&cfg);
@@ -119,13 +139,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:
@@ -142,50 +155,60 @@ 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");
+		ioDEBUG(1, "Start service in batch mode ...");
 
-	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 starting engine ...");
 
 	if ((sock = srv_Socket(&cfg)) == -1) {
 		ret = 4;
 		goto end;
 	}
 
-	cfg_LoadAttribute(&cfg, CFG("mqttd"), CFG("user"), CFG(szStr), sizeof szStr, MQTT_USER);
-	pass = getpwnam(szStr);
+	cfg_loadAttribute(&cfg, "mqttd", "user", &v, MQTT_USER);
+	pass = getpwnam(AIT_GET_STR(&v));
+	AIT_FREE_VAL(&v);
 	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())) {
-		printf("Error:: scheduler #%d - %s\n", sched_GetErrno(), sched_GetError());
+		ioLIBERR(sched);
 		ret = 6;
 		goto end;
 	}
 
+	/* go catch the cat ... */
 	Run(sock);
 
 	schedEnd(&root);
-end:
-	if (sock > STDERR_FILENO)
-		srv_Close(sock);
+end:	/* free all resources */
+	srv_Close(sock);
 	call.CloseLOG(logg);
 	call.ClosePUB(pub);
 	call.CloseACC(acc);
 	for (i = 0; i < 3; i++)
 		mqttUnloadRTLM(i);
 	closelog();
-	UnloadConfig(&cfg);
+	cfgUnloadConfig(&cfg);
+	pthread_mutex_destroy(&mtx_pub);
+	pthread_mutex_destroy(&mtx_sess);
 	return ret;
 }