--- mqtt/src/daemon.c	2012/01/05 10:01:20	1.1.2.29
+++ mqtt/src/daemon.c	2012/01/25 10:34:14	1.1.2.32
@@ -2,8 +2,12 @@
 #include "rtlm.h"
 #include "utils.h"
 #include "mqttd.h"
+#include "mqttd_calls.h"
 
 
+static void *startSession(sched_task_t *task);
+
+
 static inline struct tagSession *
 initSession(int sock, ait_val_t * __restrict v)
 {
@@ -23,13 +27,15 @@ initSession(int sock, ait_val_t * __restrict v)
 	} else
 		memset(sess, 0, sizeof(struct tagSession));
 
+	TAILQ_INIT(&sess->sess_sndqueue);
+
 	str = (const char*) cfg_GetAttribute(&cfg, CFG("mqttd"), CFG("retry"));
 	if (!str)
 		sess->sess_retry = DEFAULT_RETRY;
 	else
 		sess->sess_retry = strtol(str, NULL, 0);
 
-	sess->sess_buf = mqtt_msgAlloc(0);
+	sess->sess_buf = mqtt_msgAlloc(USHRT_MAX);
 	if (!sess->sess_buf) {
 		ioDEBUG(3, "Error:: in msgAlloc #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		free(sess);
@@ -44,9 +50,8 @@ initSession(int sock, ait_val_t * __restrict v)
 }
 
 static void
-finiSession(struct tagSession *sess)
+finiSession(struct tagSession *sess, int preservSock)
 {
-	register int i;
 	struct tagStore *store;
 
 	ioTRACE(5);
@@ -54,18 +59,26 @@ finiSession(struct tagSession *sess)
 	if (!sess)
 		return;
 
-	for (i = 0; i < MQTT_QOS_RESERVED; i++)
-		while ((store = SLIST_FIRST(&sess->sess_store[i]))) {
-			SLIST_REMOVE_HEAD(&sess->sess_store[i], st_node);
-			free(store);
-		}
+	if (call.FiniSessPUB)
+		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 
+	while ((store = TAILQ_FIRST(&sess->sess_sndqueue))) {
+		TAILQ_REMOVE(&sess->sess_sndqueue, store, st_node);
+
+		if (store->st_subscr.sub_topic._base)
+			free(store->st_subscr.sub_topic._base);
+		if (store->st_subscr.sub_value._base)
+			free(store->st_subscr.sub_value._base);
+
+		free(store);
+	}
+
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);
 	if (sess->sess_will.topic)
 		free(sess->sess_will.topic);
 
-	if (sess->sess_sock > STDERR_FILENO)
+	if (sess->sess_sock > STDERR_FILENO && !preservSock)
 		srv_Close(sess->sess_sock);
 
 	mqtt_msgFree(&sess->sess_buf, 42);
@@ -97,7 +110,7 @@ stopSession(struct tagSession *sess)
 	}
 
 	ioDEBUG(1, "Close socket=%d", sess->sess_sock);
-	finiSession(sess);
+	finiSession(sess, 0);
 
 	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user);
@@ -106,8 +119,7 @@ stopSession(struct tagSession *sess)
 static int
 KASession(struct tagSession *sess)
 {
-	u_char basebuf[USHRT_MAX];
-	mqtt_msg_t msg = { NULL, 0 }, buf = { basebuf, sizeof basebuf };
+	mqtt_msg_t msg = { NULL, 0 };
 	int ret;
 	struct pollfd pfd;
 
@@ -128,21 +140,21 @@ KASession(struct tagSession *sess)
 
 	pfd.fd = sess->sess_sock;
 	pfd.events = POLLIN | POLLPRI;
-	if ((ret = poll(&pfd, 1, sess->sess_ka)) == -1 || 
+	if ((ret = poll(&pfd, 1, sess->sess_ka * 1000)) == -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! */
+		ioDEBUG(5, "Warning:: Session is abandoned ... must be disconnect!");
 		return 1;
 	}
 	/* receive & decode packet */
-	if (recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0) == -1) {
+	if (recv(sess->sess_sock, sess->sess_buf->msg_base, sess->sess_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! */
+	if (mqtt_readPINGRESP(sess->sess_buf)) {
+		ioDEBUG(5, "Warning:: Session is broken, not hear ping response ... must be disconnect!");
 		return 2;
 	}
 
@@ -153,19 +165,20 @@ KASession(struct tagSession *sess)
 static void *
 thrSession(struct tagSession *sess)
 {
-	u_char basebuf[USHRT_MAX];
-	mqtt_msg_t msg = { NULL, 0 }, buf = { basebuf, sizeof basebuf };
-	int ret;
+	mqtt_msg_t msg = { NULL, 0 };
+	int ret, locKill = 42;
 	struct pollfd pfd;
 	struct mqtthdr *hdr;
+	ait_val_t *v;
+	struct tagStore *store;
 
 	pthread_cleanup_push((void(*)(void*)) stopSession, sess);
 	ioTRACE(2);
 
 	pfd.fd = sess->sess_sock;
 	pfd.events = POLLIN | POLLPRI;
-	while (!Kill) {
-		if ((ret = poll(&pfd, 1, sess->sess_ka)) == -1 || 
+	while (!Kill && locKill) {
+		if ((ret = poll(&pfd, 1, sess->sess_ka * 1000)) == -1 || 
 				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 			ioDEBUG(3, "Error:: poll(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
 			break;
@@ -175,17 +188,79 @@ thrSession(struct tagSession *sess)
 			break;
 		}
 		/* receive & decode packet */
-		if ((ret = recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0)) == -1) {
+		if ((ret = recv(sess->sess_sock, sess->sess_buf->msg_base, sess->sess_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;
+			hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
 
 		/* dispatch message type */
 		switch (hdr->mqtt_msg.type) {
+			case MQTT_TYPE_CONNECT:
+				ioDEBUG(5, "Exec CONNECT session");
+				pthread_mutex_lock(&mtx_sess);
+				TAILQ_REMOVE(&Sessions, sess, sess_node);
+				pthread_mutex_unlock(&mtx_sess);
+
+				if (call.FiniSessPUB)
+					call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
+
+				while ((store = TAILQ_FIRST(&sess->sess_sndqueue))) {
+					TAILQ_REMOVE(&sess->sess_sndqueue, store, st_node);
+
+					if (store->st_subscr.sub_topic._base)
+						free(store->st_subscr.sub_topic._base);
+					if (store->st_subscr.sub_value._base)
+						free(store->st_subscr.sub_value._base);
+
+					free(store);
+				}
+
+				if (sess->sess_will.msg)
+					free(sess->sess_will.msg);
+				if (sess->sess_will.topic)
+					free(sess->sess_will.topic);
+
+				if ((v = io_allocVar())) {
+					AIT_SET_STR(v, sess->sess_addr);
+					if (!schedEvent(root, startSession, v, (u_long) sess->sess_sock, sess, ret))
+						io_freeVar(v);
+				} else
+					ioLIBERR(mqtt);
+
+				locKill ^= locKill;
+
+				call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
+						sess->sess_addr, sess->sess_user);
+				continue;
+			case MQTT_TYPE_DISCONNECT:
+				ioDEBUG(5, "Exec DISCONNECT session");
+				pthread_mutex_lock(&mtx_sess);
+				TAILQ_REMOVE(&Sessions, sess, sess_node);
+				pthread_mutex_unlock(&mtx_sess);
+
+				finiSession(sess, 0);
+				locKill ^= locKill;
+
+				call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
+						sess->sess_addr, sess->sess_user);
+				continue;
+			case MQTT_TYPE_PUBLISH:
+				ioDEBUG(5, "Exec PUBLISH topic QoS=%d", hdr->mqtt_msg.qos);
+				if (Publish(sess))
+					locKill ^= locKill;
+				break;
+			case MQTT_TYPE_PUBREL:
+				break;
+			case MQTT_TYPE_SUBSCRIBE:
+				break;
+			case MQTT_TYPE_UNSUBSCRIBE:
+				break;
+			case MQTT_TYPE_PINGREQ:
+				break;
 			default:
 				ioDEBUG(5, "Error:: Session %s, wrong command %d - DISCARDED", 
 						sess->sess_cid, hdr->mqtt_msg.type);
@@ -193,7 +268,7 @@ thrSession(struct tagSession *sess)
 		}
 	}
 
-	pthread_cleanup_pop(42);
+	pthread_cleanup_pop(locKill);
 	pthread_exit(NULL);
 }
 
@@ -212,19 +287,26 @@ startSession(sched_task_t *task)
 
 	assert(task);
 
-	sess = initSession(TASK_FD(task), TASK_ARG(task));
-	if (!sess) {
-		io_freeVar(TASK_ARG(task));
-		close(TASK_FD(task));
-		return NULL;
-	}
+	if (!TASK_DATA(task)) {
+		sess = initSession(TASK_FD(task), TASK_ARG(task));
+		if (!sess) {
+			io_freeVar(TASK_ARG(task));
+			close(TASK_FD(task));
+			return NULL;
+		}
 
-	/* 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));
-		finiSession(sess);
-		return NULL;
+		/* 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));
+			finiSession(sess, 0);
+			return NULL;
+		}
+	} else {
+		sess = TASK_DATA(task);
+		buf.msg_len = TASK_DATLEN(task) > sizeof basebuf ? sizeof basebuf : TASK_DATLEN(task);
+		memcpy(buf.msg_base, sess->sess_buf->msg_base, buf.msg_len);
 	}
+
 	cack = mqtt_readCONNECT(&buf, &sess->sess_ka, sess->sess_cid, sizeof sess->sess_cid, 
 			sess->sess_user, sizeof sess->sess_user, sess->sess_pass, sizeof sess->sess_pass, 
 			&sess->sess_will.topic, &sess->sess_will.msg);
@@ -274,7 +356,7 @@ startSession(sched_task_t *task)
 	ret = mqtt_msgCONNACK(&msg, ret);
 	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));
-		finiSession(sess);
+		finiSession(sess, 0);
 		return NULL;
 	} else {
 		ioDEBUG(5, "Sended %d bytes", ret);
@@ -291,8 +373,8 @@ startSession(sched_task_t *task)
 	pthread_create(&sess->sess_tid, &attr, (void*(*)(void*)) thrSession, sess);
 	pthread_mutex_unlock(&mtx_sess);
 
-	call.LOG(logg, "Session %s started from %s for user %s OK!\n", sess->sess_cid, 
-			sess->sess_addr, sess->sess_user);
+	call.LOG(logg, "Session %s started from %s for user %s (timeout=%d) OK!\n", sess->sess_cid, 
+			sess->sess_addr, sess->sess_user, sess->sess_ka);
 
 	pthread_attr_destroy(&attr);
 	return NULL;
@@ -307,7 +389,7 @@ end:	/* close client connection */
 	}
 
 	ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, sess->sess_sock);
-	finiSession(sess);
+	finiSession(sess, 0);
 	return NULL;
 }
 
@@ -317,14 +399,17 @@ static void *
 thrSched(void *arg __unused)
 {
 	struct tagSession *sess;
+	struct timespec pl = { 0, 10000000 };
 
 	ioTRACE(1);
 
+	schedPolling(root, &pl, NULL);
 	schedRun(root, &Kill);
 
 	TAILQ_FOREACH(sess, &Sessions, sess_node)
 		if (sess->sess_tid)
 			pthread_cancel(sess->sess_tid);
+	ioDEBUG(5, "EXIT from Scheduler thread !!!");
 	pthread_exit(NULL);
 }
 
@@ -341,14 +426,14 @@ Run(int sock)
 	ioTRACE(1);
 
 	if (pthread_create(&tid, NULL, thrSched, NULL)) {
-		ioLOGERR(0);
+		ioSYSERR(0);
 		return -1;
 	} else
 		pthread_detach(tid);
 	ioDEBUG(2, "Run scheduler management thread");
 
 	if (listen(sock, SOMAXCONN) == -1) {
-		ioLOGERR(0);
+		ioSYSERR(0);
 		return -1;
 	}
 
@@ -356,7 +441,7 @@ Run(int sock)
 		if ((cli = accept(sock, &sa.sa, &sslen)) == -1) {
 			if (!Kill)
 				continue;
-			ioLOGERR(0);
+			ioSYSERR(0);
 			break;
 		}
 		v = io_allocVar();
@@ -370,7 +455,7 @@ Run(int sock)
 		}
 		ioDEBUG(1, "Connected client with socket=%d from %s", cli, AIT_GET_STR(v));
 
-		if (!schedRead(root, startSession, v, cli)) {
+		if (!schedRead(root, startSession, v, cli, NULL, 0)) {
 			io_freeVar(v);
 			close(cli);
 			ioDEBUG(1, "Terminated client with socket=%d", cli);