--- mqtt/src/daemon.c	2012/05/05 13:39:27	1.2.2.24
+++ mqtt/src/daemon.c	2012/05/05 15:04:29	1.2.2.26
@@ -23,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");
@@ -62,7 +60,7 @@ initSession(int sock, ait_val_t * __restrict v)
 	return sess;
 }
 
-void
+static void
 finiSession(struct tagSession *sess)
 {
 	struct tagStore *store;
@@ -75,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);
 
@@ -86,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);
@@ -116,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);
@@ -147,25 +140,32 @@ 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;
 	}
 
 	do {
 		/* dispatch message type */
-		if ((len = mqtt_srv_Dispatch(sess->sess_srv, ret, sess)) == -1) {
-			ioLIBERR(mqtt);
-			ret = 0;
+		if ((len = mqtt_srv_Dispatch(sess->sess_srv, ret, sess)) < 0) {
+			if (len == -1)
+				ioLIBERR(mqtt);
+			TAILQ_REMOVE(&Sessions, sess, sess_node);
+			finiSession(sess);
 		} else
 			ret -= len;
-	} while (len && ret > 0);
+	} 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;
 }
 
@@ -254,13 +254,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);
@@ -326,6 +325,7 @@ int
 Run(int sock)
 {
 	struct tagPub *pub;
+	struct tagSession *sess;
 	struct timespec pl = { 0, 100000000 };
 
 	ioTRACE(1);
@@ -346,7 +346,6 @@ Run(int sock)
 	schedRun(root, &Kill);
 
 	/* free all undeleted elements into lists */
-	PUBS_LOCK;
 	TAILQ_FOREACH(pub, &Pubs, pub_node) {
 		TAILQ_REMOVE(&Pubs, pub, pub_node);
 
@@ -354,6 +353,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;
 }