--- mqtt/src/daemon.c	2011/12/14 13:15:35	1.1.2.19
+++ mqtt/src/daemon.c	2011/12/15 12:58:49	1.1.2.22
@@ -9,14 +9,14 @@ initSession(int sock, ait_val_t * __restrict v)
 	struct tagSession *sess = NULL;
 	const char *str;
 
-	FTRACE(5);
+	ioTRACE(5);
 
 	if (!v)
 		return NULL;
 
 	sess = malloc(sizeof(struct tagSession));
 	if (!sess) {
-		VERB(3) syslog(LOG_ERR, "Error:: in malloc #%d - %s", errno, strerror(errno));
+		ioDEBUG(3, "Error:: in malloc #%d - %s", errno, strerror(errno));
 		io_freeVar(v);
 		return NULL;
 	} else
@@ -30,7 +30,7 @@ initSession(int sock, ait_val_t * __restrict v)
 
 	sess->sess_buf = mqtt_msgAlloc(0);
 	if (!sess->sess_buf) {
-		VERB(3) syslog(LOG_ERR, "Error:: in msgAlloc #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+		ioDEBUG(3, "Error:: in msgAlloc #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		free(sess);
 		io_freeVar(v);
 		return NULL;
@@ -48,7 +48,7 @@ finiSession(struct tagSession *sess)
 	register int i;
 	struct tagStore *store;
 
-	FTRACE(5);
+	ioTRACE(5);
 
 	if (!sess)
 		return;
@@ -82,13 +82,13 @@ thrSession(struct tagSession *sess)
 		pthread_mutex_lock(&mtx_sess);
 		TAILQ_REMOVE(&Sessions, sess, sess_node);
 		pthread_mutex_unlock(&mtx_sess);
-		VERB(1) syslog(LOG_DEBUG, "Close socket=%d", sess->sess_sock);
+		ioDEBUG(1, "Close socket=%d", sess->sess_sock);
 		finiSession(sess);
 	}
 
 	pthread_cleanup_push((void(*)(void*)) thrClean, sess);
 
-	FTRACE(2);
+	ioTRACE(2);
 
 	pthread_cleanup_pop(42);
 	pthread_exit(NULL);
@@ -105,7 +105,7 @@ startSession(sched_task_t *task)
 	int ret;
 	pthread_attr_t attr;
 
-	FTRACE(4);
+	ioTRACE(4);
 
 	sess = initSession(TASK_FD(task), TASK_ARG(task));
 	if (!sess) {
@@ -116,7 +116,7 @@ startSession(sched_task_t *task)
 
 	/* receive & decode packet */
 	if (recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0) == -1) {
-		VERB(3) syslog(LOG_ERR, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
+		ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
 		finiSession(sess);
 		return NULL;
 	}
@@ -126,7 +126,7 @@ startSession(sched_task_t *task)
 	ret = cack.retcode;
 	flg.flags = cack.reserved;
 	if (flg.reserved) {
-		VERB(3) syslog(LOG_ERR, "Error:: in MQTT protocol #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+		ioDEBUG(3, "Error:: in MQTT protocol #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		goto end;
 	} else {
 		sess->sess_clean = flg.clean_sess;
@@ -137,19 +137,22 @@ startSession(sched_task_t *task)
 
 	/* check online table for user */
 	if (call.LoginACC(&cfg, acc, sess->sess_user, sess->sess_pass) < 1) {
-		VERB(1) syslog(LOG_WARNING, "Login:: DENIED for username %s and password %s", 
+		ioDEBUG(0, "Login:: DENIED for username %s and password %s", 
 				sess->sess_user, sess->sess_pass);
+		ret = MQTT_RETCODE_DENIED;
 		goto end;
-	} else
-		VERB(1) syslog(LOG_WARNING, "Login:: ALLOWED for username %s ...", sess->sess_user);
+	} else {
+		ioDEBUG(0, "Login:: ALLOWED for username %s ...", sess->sess_user);
+		ret = MQTT_RETCODE_ACCEPTED;
+	}
 
 	ret = mqtt_msgCONNACK(&msg, ret);
 	if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1) {
-		VERB(3) syslog(LOG_ERR, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
+		ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
 		finiSession(sess);
 		return NULL;
 	} else {
-		VERB(5) ioLOGGER(LOG_DEBUG, "Sended %d bytes", ret);
+		ioDEBUG(5, "Sended %d bytes", ret);
 		free(msg.msg_base);
 		msg.msg_len = 0;
 	}
@@ -163,22 +166,21 @@ startSession(sched_task_t *task)
 	pthread_create(&sess->sess_tid, &attr, (void*(*)(void*)) thrSession, sess);
 	pthread_mutex_unlock(&mtx_sess);
 
-	VERB(1) ioLOGGER(LOG_DEBUG, "ConnID=%s(%s) for %s login OK!", 
-			sess->sess_cid, sess->sess_user, sess->sess_addr);
+	ioDEBUG(1, "ConnID=%s(%s) for %s login OK!", sess->sess_cid, sess->sess_user, sess->sess_addr);
 
 	pthread_attr_destroy(&attr);
 	return NULL;
 end:	/* close client connection */
 	ret = mqtt_msgCONNACK(&msg, ret);
 	if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1) {
-		VERB(3) syslog(LOG_ERR, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
+		ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
 	} else {
-		VERB(5) ioLOGGER(LOG_DEBUG, "Sended %d bytes", ret);
+		ioDEBUG(5, "Sended %d bytes", ret);
 		free(msg.msg_base);
 		msg.msg_len = 0;
 	}
 
-	VERB(1) ioLOGGER(LOG_DEBUG, "Close client %s with socket=%d", sess->sess_addr, sess->sess_sock);
+	ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, sess->sess_sock);
 	finiSession(sess);
 	return NULL;
 }
@@ -188,11 +190,12 @@ end:	/* close client connection */
 static void *
 thrSched(void *arg __unused)
 {
-	FTRACE(1);
 	struct tagSession *sess;
 
-	schedRun(root, (intptr_t*) &Kill);
+	ioTRACE(1);
 
+	schedRun(root, &Kill);
+
 	TAILQ_FOREACH(sess, &Sessions, sess_node)
 		if (sess->sess_tid)
 			pthread_cancel(sess->sess_tid);
@@ -208,25 +211,26 @@ Run(int sock)
 	pthread_t tid;
 	ait_val_t *v;
 
-	FTRACE(1);
+	ioTRACE(1);
 
 	if (pthread_create(&tid, NULL, thrSched, NULL)) {
-		syslog(LOG_ERR, "Error:: thread scheduler #%d - %s", errno, strerror(errno));
+		ioLOGERR(0);
 		return -1;
 	} else
 		pthread_detach(tid);
-	VERB(2) ioLOGGER(LOG_DEBUG, "Run scheduler management thread");
+	ioDEBUG(2, "Run scheduler management thread");
 
-	if (listen(sock, SOMAXCONN) == -1) {
-		syslog(LOG_ERR, "Error:: listen(%d) #%d - %s\n", sock, errno, strerror(errno));
-		pthread_cancel(tid);
+	if (listen(sock, 5 /*SOMAXCONN*/) == -1) {
+		ioLOGERR(0);
 		return -1;
 	}
 
 	while (!Kill) {
 		if ((cli = accept(sock, &sa.sa, &sslen)) == -1) {
-			syslog(LOG_ERR, "Error:: accept() #%d - %s", errno, strerror(errno));
-			continue;
+			if (!Kill)
+				continue;
+			ioLOGERR(0);
+			break;
 		}
 		v = io_allocVar();
 		if (!v) {
@@ -234,13 +238,13 @@ Run(int sock)
 			break;
 		} else
 			io_n2addr(&sa, v);
-		VERB(1) ioLOGGER(LOG_DEBUG, "Connected client with socket=%d from %s:%d", cli, 
+		ioDEBUG(1, "Connected client with socket=%d from %s:%d", cli, 
 				AIT_GET_STR(v), io_n2port(&sa));
 
 		if (!schedRead(root, startSession, v, cli)) {
 			io_freeVar(v);
 			close(cli);
-			VERB(1) ioLOGGER(LOG_DEBUG, "Terminated client with socket=%d", cli);
+			ioDEBUG(1, "Terminated client with socket=%d", cli);
 		}
 	}