--- mqtt/src/daemon.c	2012/01/24 10:18:45	1.1.2.30
+++ mqtt/src/daemon.c	2012/01/30 08:29:55	1.2.2.3
@@ -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,23 @@ 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;
+	} else {
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_CONNECT, cmdCONNECT);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_PUBLISH, cmdPUBLISH);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_PUBREL, cmdPUBREL);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_SUBSCRIBE, cmdSUBSCRIBE);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_UNSUBSCRIBE, cmdUNSUBSCRIBE);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_PINGREQ, cmdPINGREQ);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_DISCONNECT, cmdDISCONNECT);
+	}
+
 	sess->sess_sock = sock;
 	strlcpy(sess->sess_addr, (char*) AIT_GET_STR(v), sizeof sess->sess_addr);
 	io_freeVar(v);
@@ -59,8 +79,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 +98,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,12 +183,10 @@ 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;
 	ait_val_t *v;
-	struct tagStore *store;
 
 	pthread_cleanup_push((void(*)(void*)) stopSession, sess);
 	ioTRACE(2);
@@ -189,46 +214,30 @@ thrSession(struct tagSession *sess)
 			hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
 
 		/* dispatch message type */
+		if (mqtt_srv_Dispatch(sess->sess_srv, sess))
+			ioLIBERR(mqtt);
 		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 = SLIST_FIRST(&sess->sess_sndqueue))) {
-					SLIST_REMOVE_HEAD(&sess->sess_sndqueue, st_node);
-					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;
 				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;
 				continue;
 			case MQTT_TYPE_PUBLISH:
-				ioDEBUG(5, "Work in progress ...");
+				ioDEBUG(5, "Exec PUBLISH topic QoS=%d", hdr->mqtt_msg.qos);
+				/*
+				if (cmdPUBLISH(sess))
+					locKill ^= locKill;
+					*/
 				break;
 			case MQTT_TYPE_PUBREL:
 				break;
@@ -264,7 +273,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 +290,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 +385,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)