--- mqtt/src/daemon.c	2012/05/05 14:51:02	1.2.2.25
+++ mqtt/src/daemon.c	2012/05/08 11:45:57	1.2.2.28
@@ -39,7 +39,7 @@ initSession(int sock, ait_val_t * __restrict v)
 	}
 
 	/* init server actor */
-	sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf);
+	sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf, sess->sess_ka);
 	if (!sess->sess_srv) {
 		ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		mqtt_msgFree(&sess->sess_buf, 42);
@@ -140,10 +140,12 @@ 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;
 	}
@@ -151,15 +153,21 @@ dispatchSession(sched_task_t *task)
 	do {
 		/* dispatch message type */
 		if ((len = mqtt_srv_Dispatch(sess->sess_srv, ret, sess)) < 0) {
-			if (len == -1)
+			if (len == -1) {
 				ioLIBERR(mqtt);
-			finiSession(sess);
+				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 (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;
@@ -215,6 +223,8 @@ startSession(sched_task_t *task)
 		sess->sess_will.qos = flg.will_qos;
 		sess->sess_will.retain = flg.will_retain;
 		sess->sess_will.flag = flg.will_flg;
+
+		sess->sess_srv->timeout = sess->sess_ka;
 	}
 
 	/* check online table for user */
@@ -251,12 +261,11 @@ startSession(sched_task_t *task)
 	}
 
 	/* Start session task OK ... */
-	TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);
-
 	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);
@@ -352,6 +361,7 @@ Run(int sock)
 	}
 	TAILQ_FOREACH(sess, &Sessions, sess_node) {
 		TAILQ_REMOVE(&Sessions, sess, sess_node);
+
 		finiSession(sess);
 	}
 	return 0;