--- mqtt/src/daemon.c	2012/05/05 12:15:25	1.2.2.23
+++ mqtt/src/daemon.c	2012/05/05 15:16:34	1.2.2.27
@@ -5,10 +5,6 @@
 #include "mqttd_calls.h"
 
 
-static void *startSession(sched_task_t *task);
-static pthread_attr_t attr;
-
-
 static inline struct tagSession *
 initSession(int sock, ait_val_t * __restrict v)
 {
@@ -27,8 +23,6 @@ initSession(int sock, ait_val_t * __restrict v)
 	} else
 		memset(sess, 0, sizeof(struct tagSession));
 
-	pthread_mutex_init(&sess->sess_mtx, NULL);
-
 	SLIST_INIT(&sess->sess_subscr);
 
 	str = cfg_getAttribute(&cfg, "mqttd", "retry");
@@ -79,7 +73,6 @@ finiSession(struct tagSession *sess)
 	if (call.FiniSessPUB)
 		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 
-	SESS_ELEM_LOCK(sess);
 	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
 		SLIST_REMOVE_HEAD(&sess->sess_subscr, st_node);
 
@@ -90,8 +83,6 @@ finiSession(struct tagSession *sess)
 
 		free(store);
 	}
-	SESS_ELEM_UNLOCK(sess);
-	pthread_mutex_destroy(&sess->sess_mtx);
 
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);
@@ -120,9 +111,7 @@ leaveClient(sched_task_t *task)
 	sess = TASK_ARG(task);
 	assert(sess);
 
-	SESS_LOCK;
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
-	SESS_UNLOCK;
 
 	ret = mqtt_msgDISCONNECT(sess->sess_buf);
 	send(TASK_FD(task), sess->sess_buf->msg_base, ret, MSG_NOSIGNAL);
@@ -138,8 +127,7 @@ leaveClient(sched_task_t *task)
 static void *
 dispatchSession(sched_task_t *task)
 {
-	int ret;
-	struct mqtthdr *hdr;
+	int ret, len = 0;
 	struct tagSession *sess;
 
 	ioTRACE(2);
@@ -152,26 +140,40 @@ dispatchSession(sched_task_t *task)
 	/* receive & decode packet */
 	if ((ret = recv(TASK_FD(task), 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));
+		TAILQ_REMOVE(&Sessions, sess, sess_node);
 		finiSession(sess);
 		return NULL;
 	} else if (!ret) {
 		ioDEBUG(4, "Session %s EOF received.", sess->sess_cid);
+		TAILQ_REMOVE(&Sessions, sess, sess_node);
 		finiSession(sess);
 		return NULL;
-	} else
-		hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
+	}
 
-	/* dispatch message type */
-	if (mqtt_srv_Dispatch(sess->sess_srv, sess))
-		ioLIBERR(mqtt);
-//			schedEvent(root, startSession, NULL, (u_long) TASK_FD(task), sess, ret);
+	do {
+		/* dispatch message type */
+		if ((len = mqtt_srv_Dispatch(sess->sess_srv, ret, sess)) < 0) {
+			if (len == -1) {
+				ioLIBERR(mqtt);
+				finiSession(sess);
+			} else if (len == -2) {
+				TAILQ_REMOVE(&Sessions, sess, sess_node);
+				finiSession(sess);
+			} else if (len == -3)
+				schedEvent(root, startSession, NULL, (u_long) TASK_FD(task), sess, ret);
+		} else
+			ret -= len;
+	} while (len > 0 && ret > 0);
 
-	if (!schedRead(root, dispatchSession, TASK_ARG(task), TASK_FD(task), NULL, 0))
+	if (len >= 0 && !schedRead(root, dispatchSession, TASK_ARG(task), TASK_FD(task), NULL, 0)) {
 		ioLIBERR(sched);
+		TAILQ_REMOVE(&Sessions, sess, sess_node);
+		finiSession(sess);
+	}
 	return NULL;
 }
 
-static void *
+void *
 startSession(sched_task_t *task)
 {
 	u_char basebuf[USHRT_MAX];
@@ -256,13 +258,12 @@ startSession(sched_task_t *task)
 		ret = MQTT_RETCODE_ACCEPTED;
 	}
 
-	/* Start session thread OK ... */
-	SESS_LOCK;
-	TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);
-	SESS_UNLOCK;
-
-	if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0))
+	/* Start session task OK ... */
+	if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0)) {
 		ioLIBERR(sched);
+		ret = MQTT_RETCODE_DENIED;
+	} else
+		TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);
 
 	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);
@@ -328,6 +329,7 @@ int
 Run(int sock)
 {
 	struct tagPub *pub;
+	struct tagSession *sess;
 	struct timespec pl = { 0, 100000000 };
 
 	ioTRACE(1);
@@ -344,16 +346,10 @@ Run(int sock)
 		return -1;
 	}
 
-	pthread_attr_init(&attr);
-	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-
 	schedPolling(root, &pl, NULL);
 	schedRun(root, &Kill);
 
-	pthread_attr_destroy(&attr);
-
 	/* free all undeleted elements into lists */
-	PUBS_LOCK;
 	TAILQ_FOREACH(pub, &Pubs, pub_node) {
 		TAILQ_REMOVE(&Pubs, pub, pub_node);
 
@@ -361,6 +357,10 @@ Run(int sock)
 		if (pub->pub_packet.msg_base)
 			free(pub->pub_packet.msg_base);
 	}
-	PUBS_UNLOCK;
+	TAILQ_FOREACH(sess, &Sessions, sess_node) {
+		TAILQ_REMOVE(&Sessions, sess, sess_node);
+
+		finiSession(sess);
+	}
 	return 0;
 }