--- mqtt/src/daemon.c	2011/12/16 12:55:30	1.1.2.26
+++ mqtt/src/daemon.c	2012/01/05 10:01:20	1.1.2.29
@@ -93,11 +93,14 @@ stopSession(struct tagSession *sess)
 	else {
 		ioDEBUG(5, "Sended %d bytes for disconnect", ret);
 		free(msg.msg_base);
-		msg.msg_len = 0;
+		memset(&msg, 0, sizeof msg);
 	}
 
 	ioDEBUG(1, "Close socket=%d", sess->sess_sock);
 	finiSession(sess);
+
+	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
+			sess->sess_addr, sess->sess_user);
 }
 
 static int
@@ -116,7 +119,6 @@ KASession(struct tagSession *sess)
 	ret = mqtt_msgPINGREQ(&msg);
 	if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1) {
 		ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
-		stopSession(sess);
 		return -1;
 	} else {
 		ioDEBUG(5, "Sended %d bytes for ping request", ret);
@@ -126,24 +128,21 @@ KASession(struct tagSession *sess)
 
 	pfd.fd = sess->sess_sock;
 	pfd.events = POLLIN | POLLPRI;
-	if ((ret = poll(&pfd, 1, sess->sess_ka)) == -1) {
+	if ((ret = poll(&pfd, 1, sess->sess_ka)) == -1 || 
+			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 		ioDEBUG(3, "Error:: poll(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
-		stopSession(sess);
 		return -1;
 	} else if (!ret) {
 		/* problem!!! session is abandoned ... must be disconnect! */
-		stopSession(sess);
 		return 1;
 	}
 	/* receive & decode packet */
 	if (recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0) == -1) {
 		ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
-		stopSession(sess);
 		return -1;
 	}
 	if (mqtt_readPINGRESP(&buf)) {
 		/* problem!!! session is broken, not hear ping response ... must be disconnect! */
-		stopSession(sess);
 		return 2;
 	}
 
@@ -154,10 +153,46 @@ KASession(struct tagSession *sess)
 static void *
 thrSession(struct tagSession *sess)
 {
-	pthread_cleanup_push((void(*)(void*)) stopSession, sess);
+	u_char basebuf[USHRT_MAX];
+	mqtt_msg_t msg = { NULL, 0 }, buf = { basebuf, sizeof basebuf };
+	int ret;
+	struct pollfd pfd;
+	struct mqtthdr *hdr;
 
+	pthread_cleanup_push((void(*)(void*)) stopSession, sess);
 	ioTRACE(2);
 
+	pfd.fd = sess->sess_sock;
+	pfd.events = POLLIN | POLLPRI;
+	while (!Kill) {
+		if ((ret = poll(&pfd, 1, sess->sess_ka)) == -1 || 
+				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+			ioDEBUG(3, "Error:: poll(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
+			break;
+		} else if (!ret && (ret = KASession(sess))) {
+			call.LOG(logg, "Session %s keep-alive missing from %s for user %s ...\n", 
+					sess->sess_cid, sess->sess_addr, sess->sess_user);
+			break;
+		}
+		/* receive & decode packet */
+		if ((ret = recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0)) == -1) {
+			ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
+			break;
+		} else if (!ret) {
+			ioDEBUG(4, "Session %s EOF received.", sess->sess_cid);
+			break;
+		} else
+			hdr = (struct mqtthdr*) buf.msg_base;
+
+		/* dispatch message type */
+		switch (hdr->mqtt_msg.type) {
+			default:
+				ioDEBUG(5, "Error:: Session %s, wrong command %d - DISCARDED", 
+						sess->sess_cid, hdr->mqtt_msg.type);
+				break;
+		}
+	}
+
 	pthread_cleanup_pop(42);
 	pthread_exit(NULL);
 }
@@ -244,7 +279,7 @@ startSession(sched_task_t *task)
 	} else {
 		ioDEBUG(5, "Sended %d bytes", ret);
 		free(msg.msg_base);
-		msg.msg_len = 0;
+		memset(&msg, 0, sizeof msg);
 	}
 
 	/* Start session thread OK ... */
@@ -268,7 +303,7 @@ end:	/* close client connection */
 	} else {
 		ioDEBUG(5, "Sended %d bytes", ret);
 		free(msg.msg_base);
-		msg.msg_len = 0;
+		memset(&msg, 0, sizeof msg);
 	}
 
 	ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, sess->sess_sock);