--- mqtt/src/daemon.c	2011/12/16 12:55:30	1.1.2.26
+++ mqtt/src/daemon.c	2012/04/15 23:45:34	1.2.2.8
@@ -2,8 +2,12 @@
 #include "rtlm.h"
 #include "utils.h"
 #include "mqttd.h"
+#include "mqttd_calls.h"
 
 
+static void *startSession(sched_task_t *task);
+
+
 static inline struct tagSession *
 initSession(int sock, ait_val_t * __restrict v)
 {
@@ -23,13 +27,19 @@ initSession(int sock, ait_val_t * __restrict v)
 	} else
 		memset(sess, 0, sizeof(struct tagSession));
 
-	str = (const char*) cfg_GetAttribute(&cfg, CFG("mqttd"), CFG("retry"));
+	pthread_mutex_init(&sess->sess_mtx, NULL);
+
+	SLIST_INIT(&sess->sess_txque[MQTT_QOS_ONCE]);
+	SLIST_INIT(&sess->sess_txque[MQTT_QOS_ACK]);
+	SLIST_INIT(&sess->sess_txque[MQTT_QOS_EXACTLY]);
+
+	str = cfg_getAttribute(&cfg, "mqttd", "retry");
 	if (!str)
 		sess->sess_retry = DEFAULT_RETRY;
 	else
 		sess->sess_retry = strtol(str, NULL, 0);
 
-	sess->sess_buf = mqtt_msgAlloc(0);
+	sess->sess_buf = mqtt_msgAlloc(USHRT_MAX);
 	if (!sess->sess_buf) {
 		ioDEBUG(3, "Error:: in msgAlloc #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		free(sess);
@@ -37,6 +47,24 @@ initSession(int sock, ait_val_t * __restrict v)
 		return NULL;
 	}
 
+	/* init server actor */
+	sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf);
+	if (!sess->sess_srv) {
+		ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+		mqtt_msgFree(&sess->sess_buf, 42);
+		free(sess);
+		io_freeVar(v);
+		return NULL;
+	} else {
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_CONNECT, cmdCONNECT);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_PUBLISH, cmdPUBLISH);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_PUBREL, cmdPUBREL);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_SUBSCRIBE, cmdSUBSCRIBE);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_UNSUBSCRIBE, cmdUNSUBSCRIBE);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_PINGREQ, cmdPINGREQ);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_DISCONNECT, cmdDISCONNECT);
+	}
+
 	sess->sess_sock = sock;
 	strlcpy(sess->sess_addr, (char*) AIT_GET_STR(v), sizeof sess->sess_addr);
 	io_freeVar(v);
@@ -44,30 +72,43 @@ initSession(int sock, ait_val_t * __restrict v)
 }
 
 static void
-finiSession(struct tagSession *sess)
+finiSession(struct tagSession *sess, int preservSock)
 {
-	register int i;
 	struct tagStore *store;
+	register int i;
 
 	ioTRACE(5);
 
 	if (!sess)
 		return;
 
+	if (call.FiniSessPUB)
+		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
+
+	SESS_ELEM_LOCK(sess);
 	for (i = 0; i < MQTT_QOS_RESERVED; i++)
-		while ((store = SLIST_FIRST(&sess->sess_store[i]))) {
-			SLIST_REMOVE_HEAD(&sess->sess_store[i], st_node);
+		while ((store = SLIST_FIRST(&sess->sess_txque[i]))) {
+			SLIST_REMOVE_HEAD(&sess->sess_txque[i], st_node);
+
+			if (store->st_subscr.sub_topic.msg_base)
+				free(store->st_subscr.sub_topic.msg_base);
+			if (store->st_subscr.sub_value.msg_base)
+				free(store->st_subscr.sub_value.msg_base);
+
 			free(store);
 		}
+	SESS_ELEM_UNLOCK(sess);
+	pthread_mutex_destroy(&sess->sess_mtx);
 
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);
 	if (sess->sess_will.topic)
 		free(sess->sess_will.topic);
 
-	if (sess->sess_sock > STDERR_FILENO)
+	if (sess->sess_sock > STDERR_FILENO && !preservSock)
 		srv_Close(sess->sess_sock);
 
+	mqtt_srv_Fini(&sess->sess_srv);
 	mqtt_msgFree(&sess->sess_buf, 42);
 
 	free(sess);
@@ -83,9 +124,9 @@ stopSession(struct tagSession *sess)
 
 	assert(sess);
 
-	pthread_mutex_lock(&mtx_sess);
+	SESS_LOCK;
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
-	pthread_mutex_unlock(&mtx_sess);
+	SESS_UNLOCK;
 
 	ret = mqtt_msgDISCONNECT(&msg);
 	if ((ret = send(sess->sess_sock, msg.msg_base, ret, 0)) == -1)
@@ -93,18 +134,20 @@ 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);
+	finiSession(sess, 0);
+
+	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
+			sess->sess_addr, sess->sess_user);
 }
 
 static int
 KASession(struct tagSession *sess)
 {
-	u_char basebuf[USHRT_MAX];
-	mqtt_msg_t msg = { NULL, 0 }, buf = { basebuf, sizeof basebuf };
+	mqtt_msg_t msg = { NULL, 0 };
 	int ret;
 	struct pollfd pfd;
 
@@ -116,7 +159,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 +168,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 * 1000)) == -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);
+		ioDEBUG(5, "Warning:: Session is abandoned ... must be disconnect!");
 		return 1;
 	}
 	/* receive & decode packet */
-	if (recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0) == -1) {
+	if (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));
-		stopSession(sess);
 		return -1;
 	}
-	if (mqtt_readPINGRESP(&buf)) {
-		/* problem!!! session is broken, not hear ping response ... must be disconnect! */
-		stopSession(sess);
+	if (mqtt_readPINGRESP(sess->sess_buf)) {
+		ioDEBUG(5, "Warning:: Session is broken, not hear ping response ... must be disconnect!");
 		return 2;
 	}
 
@@ -154,11 +193,79 @@ KASession(struct tagSession *sess)
 static void *
 thrSession(struct tagSession *sess)
 {
-	pthread_cleanup_push((void(*)(void*)) stopSession, sess);
+	int ret, locKill = 42;
+	struct pollfd pfd;
+	struct mqtthdr *hdr;
+	ait_val_t *v;
 
+	pthread_cleanup_push((void(*)(void*)) stopSession, sess);
 	ioTRACE(2);
 
-	pthread_cleanup_pop(42);
+	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 = 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, 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;
+
+		/* dispatch message type */
+		if (mqtt_srv_Dispatch(sess->sess_srv, sess))
+			ioLIBERR(mqtt);
+		switch (hdr->mqtt_msg.type) {
+			case MQTT_TYPE_CONNECT:
+				ioDEBUG(5, "Exec CONNECT session");
+				if ((v = io_allocVar())) {
+					AIT_SET_STR(v, sess->sess_addr);
+					if (!schedEvent(root, startSession, v, (u_long) sess->sess_sock, sess, ret))
+						io_freeVar(v);
+				} else
+					ioLIBERR(mqtt);
+				locKill ^= locKill;
+				continue;
+			case MQTT_TYPE_DISCONNECT:
+				ioDEBUG(5, "Exec DISCONNECT session");
+				finiSession(sess, 0);
+				locKill ^= locKill;
+				continue;
+			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_SUBSCRIBE:
+				break;
+			case MQTT_TYPE_UNSUBSCRIBE:
+				break;
+			case MQTT_TYPE_PINGREQ:
+				ioDEBUG(5, "Exec PINGREQ session");
+				break;
+			default:
+				ioDEBUG(5, "Error:: Session %s, wrong command %d - DISCARDED", 
+						sess->sess_cid, hdr->mqtt_msg.type);
+				break;
+		}
+	}
+
+	pthread_cleanup_pop(locKill);
 	pthread_exit(NULL);
 }
 
@@ -177,19 +284,27 @@ startSession(sched_task_t *task)
 
 	assert(task);
 
-	sess = initSession(TASK_FD(task), TASK_ARG(task));
-	if (!sess) {
-		io_freeVar(TASK_ARG(task));
-		close(TASK_FD(task));
-		return NULL;
-	}
+	if (!TASK_DATA(task)) {
+		/* flow from accept new clients */
+		sess = initSession(TASK_FD(task), TASK_ARG(task));
+		if (!sess) {
+			io_freeVar(TASK_ARG(task));
+			close(TASK_FD(task));
+			return NULL;
+		}
 
-	/* 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));
-		finiSession(sess);
-		return NULL;
+		/* 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));
+			finiSession(sess, 0);
+			return NULL;
+		}
+	} else {
+		sess = TASK_DATA(task);
+		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);
 	}
+
 	cack = mqtt_readCONNECT(&buf, &sess->sess_ka, sess->sess_cid, sizeof sess->sess_cid, 
 			sess->sess_user, sizeof sess->sess_user, sess->sess_pass, sizeof sess->sess_pass, 
 			&sess->sess_will.topic, &sess->sess_will.msg);
@@ -239,25 +354,25 @@ startSession(sched_task_t *task)
 	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);
+		finiSession(sess, 0);
 		return NULL;
 	} else {
 		ioDEBUG(5, "Sended %d bytes", ret);
 		free(msg.msg_base);
-		msg.msg_len = 0;
+		memset(&msg, 0, sizeof msg);
 	}
 
 	/* Start session thread OK ... */
 	pthread_attr_init(&attr);
 	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 
-	pthread_mutex_lock(&mtx_sess);
+	SESS_LOCK;
 	TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);
 	pthread_create(&sess->sess_tid, &attr, (void*(*)(void*)) thrSession, sess);
-	pthread_mutex_unlock(&mtx_sess);
+	SESS_UNLOCK;
 
-	call.LOG(logg, "Session %s started from %s for user %s OK!\n", sess->sess_cid, 
-			sess->sess_addr, sess->sess_user);
+	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);
 
 	pthread_attr_destroy(&attr);
 	return NULL;
@@ -268,11 +383,11 @@ 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);
-	finiSession(sess);
+	finiSession(sess, 0);
 	return NULL;
 }
 
@@ -282,14 +397,18 @@ static void *
 thrSched(void *arg __unused)
 {
 	struct tagSession *sess;
+	struct timespec pl = { 0, 100000000 };
 
 	ioTRACE(1);
 
+	/* start scheduler loop */
+	schedPolling(root, &pl, NULL);
 	schedRun(root, &Kill);
 
 	TAILQ_FOREACH(sess, &Sessions, sess_node)
 		if (sess->sess_tid)
 			pthread_cancel(sess->sess_tid);
+	ioDEBUG(5, "EXIT from Scheduler thread !!!");
 	pthread_exit(NULL);
 }
 
@@ -305,37 +424,40 @@ Run(int sock)
 
 	ioTRACE(1);
 
+	/* start alternative thread for scheduler */
 	if (pthread_create(&tid, NULL, thrSched, NULL)) {
-		ioLOGERR(0);
+		ioSYSERR(0);
 		return -1;
 	} else
 		pthread_detach(tid);
 	ioDEBUG(2, "Run scheduler management thread");
 
 	if (listen(sock, SOMAXCONN) == -1) {
-		ioLOGERR(0);
+		ioSYSERR(0);
 		return -1;
 	}
 
+	/* state machine - accept new connections */
 	while (!Kill) {
 		if ((cli = accept(sock, &sa.sa, &sslen)) == -1) {
 			if (!Kill)
 				continue;
-			ioLOGERR(0);
+			ioSYSERR(0);
 			break;
 		}
 		v = io_allocVar();
 		if (!v) {
-			ioLIBERR(mqtt);
+			ioLIBERR(io);
 			break;
 		} else {
 			memset(str, 0, sizeof str);
 			snprintf(str, sizeof str, "%s:%hu", io_n2addr(&sa, v), io_n2port(&sa));
+			AIT_FREE_VAL(v);
 			AIT_SET_STR(v, str);
 		}
 		ioDEBUG(1, "Connected client with socket=%d from %s", cli, AIT_GET_STR(v));
 
-		if (!schedRead(root, startSession, v, cli)) {
+		if (!schedRead(root, startSession, v, cli, NULL, 0)) {
 			io_freeVar(v);
 			close(cli);
 			ioDEBUG(1, "Terminated client with socket=%d", cli);