--- mqtt/src/daemon.c	2012/01/24 16:28:28	1.1.2.31
+++ mqtt/src/daemon.c	2012/01/27 16:19:04	1.2.2.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;
@@ -40,6 +43,15 @@ initSession(int sock, ait_val_t * __restrict v)
 		return NULL;
 	}
 
+	sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf);
+	if (!sess->sess_srv) {
+		ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+		mqtt_msgFree(&sess->sess_buf, 42);
+		free(sess);
+		io_freeVar(v);
+		return NULL;
+	}
+
 	sess->sess_sock = sock;
 	strlcpy(sess->sess_addr, (char*) AIT_GET_STR(v), sizeof sess->sess_addr);
 	io_freeVar(v);
@@ -59,8 +71,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.msg_base)
+			free(store->st_subscr.sub_topic.msg_base);
+		if (store->st_subscr.sub_value.msg_base)
+			free(store->st_subscr.sub_value.msg_base);
+
 		free(store);
 	}
 
@@ -72,6 +90,7 @@ finiSession(struct tagSession *sess, int preservSock)
 	if (sess->sess_sock > STDERR_FILENO && !preservSock)
 		srv_Close(sess->sess_sock);
 
+	mqtt_srv_Fini(&sess->sess_srv);
 	mqtt_msgFree(&sess->sess_buf, 42);
 
 	free(sess);
@@ -156,7 +175,6 @@ KASession(struct tagSession *sess)
 static void *
 thrSession(struct tagSession *sess)
 {
-	mqtt_msg_t msg = { NULL, 0 };
 	int ret, locKill = 42;
 	struct pollfd pfd;
 	struct mqtthdr *hdr;
@@ -199,8 +217,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.msg_base)
+						free(store->st_subscr.sub_topic.msg_base);
+					if (store->st_subscr.sub_value.msg_base)
+						free(store->st_subscr.sub_value.msg_base);
+
 					free(store);
 				}
 
@@ -234,7 +258,9 @@ thrSession(struct tagSession *sess)
 						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;