--- mqtt/src/daemon.c	2012/04/27 10:07:50	1.2.2.19
+++ mqtt/src/daemon.c	2012/05/05 15:04:29	1.2.2.26
@@ -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);
@@ -107,110 +98,86 @@ finiSession(struct tagSession *sess)
 	free(sess);
 }
 
-static void
-stopSession(struct tagSession *sess)
+static void *
+leaveClient(sched_task_t *task)
 {
-	mqtt_msg_t msg = { NULL, 0 };
+	struct tagSession *sess;
 	int ret;
 
 	ioTRACE(4);
 
+	assert(task);
+
+	sess = TASK_ARG(task);
 	assert(sess);
 
-	SESS_LOCK;
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
-	SESS_UNLOCK;
 
-	ret = mqtt_msgDISCONNECT(&msg);
-	send(sess->sess_sock, msg.msg_base, ret, MSG_NOSIGNAL);
-	free(msg.msg_base);
+	ret = mqtt_msgDISCONNECT(sess->sess_buf);
+	send(TASK_FD(task), sess->sess_buf->msg_base, ret, MSG_NOSIGNAL);
 
-	ioDEBUG(1, "Close socket=%d", sess->sess_sock);
-	finiSession(sess);
-
+	ioDEBUG(1, "Close socket=%d", TASK_FD(task));
 	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user);
+
+	finiSession(sess);
+	return NULL;
 }
 
 static void *
-thrSession(struct tagSession *sess)
+dispatchSession(sched_task_t *task)
 {
-	int ret, locKill = 42;
-	struct pollfd pfd;
-	struct mqtthdr *hdr;
+	int ret, len = 0;
+	struct tagSession *sess;
 
-	pthread_cleanup_push((void(*)(void*)) stopSession, sess);
 	ioTRACE(2);
 
-	pfd.fd = sess->sess_sock;
-	pfd.events = POLLIN | POLLPRI;
-	while (!Kill && locKill) {
-		if ((ret = poll(&pfd, 1, sess->sess_ka * 1000)) == -1 || 
-				pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
-			ioDEBUG(3, "Error:: poll(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
-			break;
-		} else if (!ret && (ret = mqtt_KeepAlive(sess->sess_sock, sess->sess_ka, 1))) {
-			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, 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));
-			break;
-		} else if (!ret) {
-			ioDEBUG(4, "Session %s EOF received.", sess->sess_cid);
-			break;
-		} else
-			hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
+	assert(task);
 
-		/* dispatch message type */
-		if (mqtt_srv_Dispatch(sess->sess_srv, sess))
-			ioLIBERR(mqtt);
-		switch (hdr->mqtt_msg.type) {
-			case MQTT_TYPE_CONNECT:
-				schedEvent(root, startSession, NULL, (u_long) sess->sess_sock, sess, ret);
-				locKill ^= locKill;
-				break;
-			case MQTT_TYPE_DISCONNECT:
-				finiSession(sess);
-				locKill ^= locKill;
-				continue;
-			case MQTT_TYPE_SUBSCRIBE:
-			case MQTT_TYPE_PINGREQ:
-				break;
-			case MQTT_TYPE_PUBLISH:
-				ioDEBUG(5, "Exec PUBLISH topic QoS=%d", hdr->mqtt_msg.qos);
-				/*
-				if (cmdPUBLISH(sess))
-					locKill ^= locKill;
-					*/
-				break;
-			case MQTT_TYPE_PUBREL:
-				break;
-			case MQTT_TYPE_UNSUBSCRIBE:
-				break;
-			default:
-				ioDEBUG(5, "Error:: Session %s, wrong command %d - DISCARDED", 
-						sess->sess_cid, hdr->mqtt_msg.type);
-				break;
-		}
+	sess = TASK_ARG(task);
+	assert(sess);
+
+	/* 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;
 	}
 
-	pthread_cleanup_pop(locKill);
-	pthread_exit(NULL);
+	do {
+		/* dispatch message type */
+		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 > 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;
 }
 
-static void *
+void *
 startSession(sched_task_t *task)
 {
 	u_char basebuf[USHRT_MAX];
-	mqtt_msg_t msg = { NULL, 0 }, buf = { basebuf, sizeof basebuf };
+	mqtt_msg_t buf = { basebuf, sizeof basebuf };
 	mqtthdr_connflgs_t flg;
 	mqtthdr_connack_t cack;
 	struct tagSession *s, *sess = NULL;
-	int ret;
+	int ret, wlen;
 
 	ioTRACE(4);
 
@@ -233,6 +200,8 @@ startSession(sched_task_t *task)
 		}
 	} else {
 		sess = TASK_DATA(task);
+		assert(sess);
+
 		buf.msg_len = TASK_DATLEN(task) > sizeof basebuf ? sizeof basebuf : TASK_DATLEN(task);
 		memcpy(buf.msg_base, sess->sess_buf->msg_base, buf.msg_len);
 	}
@@ -268,7 +237,7 @@ startSession(sched_task_t *task)
 		TAILQ_FOREACH(s, &Sessions, sess_node)
 			if (!strcmp(s->sess_cid, sess->sess_cid)) {
 				/* found stale session & disconnect it! */
-				stopSession(s);
+				schedWrite(root, leaveClient, sess, TASK_FD(task), NULL, 0);
 				break;
 			}
 	}
@@ -285,38 +254,26 @@ startSession(sched_task_t *task)
 		ret = MQTT_RETCODE_ACCEPTED;
 	}
 
-	ret = mqtt_msgCONNACK(&msg, ret);
-	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));
-		finiSession(sess);
-		return NULL;
-	} else {
-		ioDEBUG(5, "Sended %d bytes", ret);
-		free(msg.msg_base);
-		memset(&msg, 0, sizeof msg);
-	}
+	/* 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);
 
-	/* Start session thread OK ... */
-	SESS_LOCK;
-	TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);
-	pthread_create(&sess->sess_tid, &attr, (void*(*)(void*)) thrSession, sess);
-	SESS_UNLOCK;
-
 	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);
-	return NULL;
 end:	/* close client connection */
-	ret = mqtt_msgCONNACK(&msg, ret);
-	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));
-	} else {
-		ioDEBUG(5, "Sended %d bytes", ret);
-		free(msg.msg_base);
-		memset(&msg, 0, sizeof msg);
-	}
+	wlen = mqtt_msgCONNACK(sess->sess_buf, ret);
+	if ((wlen = send(TASK_FD(task), sess->sess_buf->msg_base, wlen, 0)) == -1) {
+		ioDEBUG(3, "Error:: send(%d) #%d - %s", TASK_FD(task), errno, strerror(errno));
+	} else
+		ioDEBUG(5, "Sended %d bytes", wlen);
 
-	ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, sess->sess_sock);
-	finiSession(sess);
+	if (ret != MQTT_RETCODE_ACCEPTED) {
+		ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, TASK_FD(task));
+		finiSession(sess);
+	}
 	return NULL;
 }
 
@@ -336,7 +293,7 @@ acceptClient(sched_task_t *task)
 	if ((cli = accept(TASK_FD(task), &sa.sa, &sslen)) == -1)
 		goto end;
 	else
-		fcntl(TASK_FD(task), F_SETFL, fcntl(TASK_FD(task), F_GETFL, 0) | O_NONBLOCK);
+		fcntl(cli, F_SETFL, fcntl(cli, F_GETFL, 0) | O_NONBLOCK);
 
 	v = io_allocVar();
 	if (!v) {
@@ -357,7 +314,7 @@ acceptClient(sched_task_t *task)
 		ioDEBUG(1, "Terminated client with socket=%d", cli);
 	}
 end:
-	if (!schedRead(TASK_ROOT(task), acceptClient, NULL, TASK_FD(task), NULL, 0))
+	if (!schedRead(root, acceptClient, NULL, TASK_FD(task), NULL, 0))
 		ioLIBERR(sched);
 	return NULL;
 }
@@ -368,6 +325,7 @@ int
 Run(int sock)
 {
 	struct tagPub *pub;
+	struct tagSession *sess;
 	struct timespec pl = { 0, 100000000 };
 
 	ioTRACE(1);
@@ -384,16 +342,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);
 
@@ -401,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;
 }