--- mqtt/src/daemon.c	2012/01/24 10:18:45	1.1.2.30
+++ mqtt/src/daemon.c	2012/01/27 15:05:38	1.2
@@ -2,6 +2,7 @@
 #include "rtlm.h"
 #include "utils.h"
 #include "mqttd.h"
+#include "mqttd_calls.h"
 
 
 static void *startSession(sched_task_t *task);
@@ -26,6 +27,8 @@ 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;
@@ -59,8 +62,14 @@ finiSession(struct tagSession *sess, int preservSock)
 	if (call.FiniSessPUB)
 		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 
-	while ((store = SLIST_FIRST(&sess->sess_sndqueue))) {
-		SLIST_REMOVE_HEAD(&sess->sess_sndqueue, st_node);
+	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);
 	}
 
@@ -199,8 +208,14 @@ thrSession(struct tagSession *sess)
 				if (call.FiniSessPUB)
 					call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 
-				while ((store = SLIST_FIRST(&sess->sess_sndqueue))) {
-					SLIST_REMOVE_HEAD(&sess->sess_sndqueue, st_node);
+				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);
 				}
 
@@ -217,6 +232,9 @@ thrSession(struct tagSession *sess)
 					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");
@@ -226,9 +244,14 @@ thrSession(struct tagSession *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, "Work in progress ...");
+				ioDEBUG(5, "Exec PUBLISH topic QoS=%d", hdr->mqtt_msg.qos);
+				if (Publish(sess))
+					locKill ^= locKill;
 				break;
 			case MQTT_TYPE_PUBREL:
 				break;
@@ -264,7 +287,6 @@ startSession(sched_task_t *task)
 
 	assert(task);
 
-	ioDEBUG(3, "task_Data=%p", TASK_DATA(task));
 	if (!TASK_DATA(task)) {
 		sess = initSession(TASK_FD(task), TASK_ARG(task));
 		if (!sess) {
@@ -282,7 +304,6 @@ startSession(sched_task_t *task)
 	} else {
 		sess = TASK_DATA(task);
 		buf.msg_len = TASK_DATLEN(task) > sizeof basebuf ? sizeof basebuf : TASK_DATLEN(task);
-		ioDEBUG(3, "debug:: sock=%d s=%p sbuf=%p sbl=%d ret=%d\n", sess->sess_sock, sess->sess_buf, sess->sess_buf->msg_base, (int) sess->sess_buf->msg_len, (int) TASK_DATLEN(task));
 		memcpy(buf.msg_base, sess->sess_buf->msg_base, buf.msg_len);
 	}
 
@@ -378,9 +399,11 @@ 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)