--- mqtt/src/daemon.c	2011/12/14 13:15:35	1.1.2.19
+++ mqtt/src/daemon.c	2012/01/05 10:01:20	1.1.2.29
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "rtlm.h"
+#include "utils.h"
 #include "mqttd.h"
 
 
@@ -9,14 +10,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 +31,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 +49,7 @@ finiSession(struct tagSession *sess)
 	register int i;
 	struct tagStore *store;
 
-	FTRACE(5);
+	ioTRACE(5);
 
 	if (!sess)
 		return;
@@ -64,32 +65,134 @@ finiSession(struct tagSession *sess)
 	if (sess->sess_will.topic)
 		free(sess->sess_will.topic);
 
-	if (sess->sess_sock > STDERR_FILENO) {
-		shutdown(sess->sess_sock, SHUT_RDWR);
-		close(sess->sess_sock);
-	}
+	if (sess->sess_sock > STDERR_FILENO)
+		srv_Close(sess->sess_sock);
 
 	mqtt_msgFree(&sess->sess_buf, 42);
 
 	free(sess);
 }
 
+static void
+stopSession(struct tagSession *sess)
+{
+	mqtt_msg_t msg = { NULL, 0 };
+	int ret;
+
+	ioTRACE(4);
+
+	assert(sess);
+
+	pthread_mutex_lock(&mtx_sess);
+	TAILQ_REMOVE(&Sessions, sess, sess_node);
+	pthread_mutex_unlock(&mtx_sess);
+
+	ret = mqtt_msgDISCONNECT(&msg);
+	if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1)
+		ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
+	else {
+		ioDEBUG(5, "Sended %d bytes for disconnect", ret);
+		free(msg.msg_base);
+		memset(&msg, 0, sizeof msg);
+	}
+
+	ioDEBUG(1, "Close socket=%d", sess->sess_sock);
+	finiSession(sess);
+
+	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
+			sess->sess_addr, sess->sess_user);
+}
+
+static int
+KASession(struct tagSession *sess)
+{
+	u_char basebuf[USHRT_MAX];
+	mqtt_msg_t msg = { NULL, 0 }, buf = { basebuf, sizeof basebuf };
+	int ret;
+	struct pollfd pfd;
+
+	ioTRACE(4);
+
+	assert(sess);
+
+	/* ping request */
+	ret = mqtt_msgPINGREQ(&msg);
+	if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1) {
+		ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
+		return -1;
+	} else {
+		ioDEBUG(5, "Sended %d bytes for ping request", ret);
+		free(msg.msg_base);
+		memset(&msg, 0, sizeof msg);
+	}
+
+	pfd.fd = sess->sess_sock;
+	pfd.events = POLLIN | POLLPRI;
+	if ((ret = poll(&pfd, 1, sess->sess_ka)) == -1 || 
+			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+		ioDEBUG(3, "Error:: poll(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
+		return -1;
+	} else if (!ret) {
+		/* problem!!! session is abandoned ... must be disconnect! */
+		return 1;
+	}
+	/* receive & decode packet */
+	if (recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0) == -1) {
+		ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
+		return -1;
+	}
+	if (mqtt_readPINGRESP(&buf)) {
+		/* problem!!! session is broken, not hear ping response ... must be disconnect! */
+		return 2;
+	}
+
+	/* Keep Alive is OK! */
+	return 0;
+}
+
 static void *
 thrSession(struct tagSession *sess)
 {
-	void thrClean(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);
-		finiSession(sess);
-	}
+	u_char basebuf[USHRT_MAX];
+	mqtt_msg_t msg = { NULL, 0 }, buf = { basebuf, sizeof basebuf };
+	int ret;
+	struct pollfd pfd;
+	struct mqtthdr *hdr;
 
-	pthread_cleanup_push((void(*)(void*)) thrClean, sess);
+	pthread_cleanup_push((void(*)(void*)) stopSession, sess);
+	ioTRACE(2);
 
-	FTRACE(2);
+	pfd.fd = sess->sess_sock;
+	pfd.events = POLLIN | POLLPRI;
+	while (!Kill) {
+		if ((ret = poll(&pfd, 1, sess->sess_ka)) == -1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+			ioDEBUG(3, "Error:: poll(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
+			break;
+		} else if (!ret && (ret = KASession(sess))) {
+			call.LOG(logg, "Session %s keep-alive missing from %s for user %s ...\n", 
+					sess->sess_cid, sess->sess_addr, sess->sess_user);
+			break;
+		}
+		/* receive & decode packet */
+		if ((ret = recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0)) == -1) {
+			ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
+			break;
+		} else if (!ret) {
+			ioDEBUG(4, "Session %s EOF received.", sess->sess_cid);
+			break;
+		} else
+			hdr = (struct mqtthdr*) buf.msg_base;
 
+		/* dispatch message type */
+		switch (hdr->mqtt_msg.type) {
+			default:
+				ioDEBUG(5, "Error:: Session %s, wrong command %d - DISCARDED", 
+						sess->sess_cid, hdr->mqtt_msg.type);
+				break;
+		}
+	}
+
 	pthread_cleanup_pop(42);
 	pthread_exit(NULL);
 }
@@ -101,12 +204,14 @@ startSession(sched_task_t *task)
 	mqtt_msg_t msg = { NULL, 0 }, buf = { basebuf, sizeof basebuf };
 	mqtthdr_connflgs_t flg;
 	mqtthdr_connack_t cack;
-	struct tagSession *sess = NULL;
+	struct tagSession *s, *sess = NULL;
 	int ret;
 	pthread_attr_t attr;
 
-	FTRACE(4);
+	ioTRACE(4);
 
+	assert(task);
+
 	sess = initSession(TASK_FD(task), TASK_ARG(task));
 	if (!sess) {
 		io_freeVar(TASK_ARG(task));
@@ -116,7 +221,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 +231,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,21 +242,44 @@ 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(1, "Login:: ALLOWED for username %s ...", sess->sess_user);
+		ret = MQTT_RETCODE_ACCEPTED;
+	}
+	if (call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%") > 0) {
+		ioDEBUG(2, "Old session %s should be disconnect!", sess->sess_cid);
+		TAILQ_FOREACH(s, &Sessions, sess_node)
+			if (!strcmp(s->sess_cid, sess->sess_cid)) {
+				/* found stale session & disconnect it! */
+				stopSession(s);
+				break;
+			}
+	}
+	if (call.InitSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, sess->sess_addr, 
+				sess->sess_will.flag, sess->sess_will.topic, sess->sess_will.msg, 
+				sess->sess_will.qos, sess->sess_will.retain) == -1) {
+		ioDEBUG(0, "Session %s DENIED for username %s", sess->sess_cid, sess->sess_user);
+		ret = MQTT_RETCODE_DENIED;
+		goto end;
+	} else {
+		ioDEBUG(0, "Session %s from %s and username %s is started", 
+				sess->sess_cid, sess->sess_addr, 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;
+		memset(&msg, 0, sizeof msg);
 	}
 
 	/* Start session thread OK ... */
@@ -163,22 +291,22 @@ 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);
+	call.LOG(logg, "Session %s started from %s for user %s OK!\n", sess->sess_cid, 
+			sess->sess_addr, sess->sess_user);
 
 	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;
+		memset(&msg, 0, sizeof msg);
 	}
 
-	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 +316,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);
@@ -207,40 +336,44 @@ Run(int sock)
 	int cli;
 	pthread_t tid;
 	ait_val_t *v;
+	char str[STRSIZ];
 
-	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);
+		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) {
 			ioLIBERR(mqtt);
 			break;
-		} else
-			io_n2addr(&sa, v);
-		VERB(1) ioLOGGER(LOG_DEBUG, "Connected client with socket=%d from %s:%d", cli, 
-				AIT_GET_STR(v), io_n2port(&sa));
+		} else {
+			memset(str, 0, sizeof str);
+			snprintf(str, sizeof str, "%s:%hu", io_n2addr(&sa, v), io_n2port(&sa));
+			AIT_SET_STR(v, str);
+		}
+		ioDEBUG(1, "Connected client with socket=%d from %s", cli, AIT_GET_STR(v));
 
 		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);
 		}
 	}