--- mqtt/src/daemon.c	2011/12/15 12:57:40	1.1.2.21
+++ mqtt/src/daemon.c	2012/05/05 14:51:02	1.2.2.25
@@ -1,6 +1,8 @@
 #include "global.h"
 #include "rtlm.h"
+#include "utils.h"
 #include "mqttd.h"
+#include "mqttd_calls.h"
 
 
 static inline struct tagSession *
@@ -16,36 +18,51 @@ initSession(int sock, ait_val_t * __restrict v)
 
 	sess = malloc(sizeof(struct tagSession));
 	if (!sess) {
-		ioDEBUG(3, "Error:: in malloc #%d - %s", errno, strerror(errno));
-		io_freeVar(v);
+		ioSYSERR(0);
 		return NULL;
 	} else
 		memset(sess, 0, sizeof(struct tagSession));
 
-	str = (const char*) cfg_GetAttribute(&cfg, CFG("mqttd"), CFG("retry"));
+	SLIST_INIT(&sess->sess_subscr);
+
+	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());
+		ioLIBERR(mqtt);
 		free(sess);
-		io_freeVar(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);
+		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);
 	return sess;
 }
 
 static void
 finiSession(struct tagSession *sess)
 {
-	register int i;
 	struct tagStore *store;
 
 	ioTRACE(5);
@@ -53,73 +70,138 @@ finiSession(struct tagSession *sess)
 	if (!sess)
 		return;
 
-	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);
-			free(store);
-		}
+	if (call.FiniSessPUB)
+		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 
+	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
+		SLIST_REMOVE_HEAD(&sess->sess_subscr, 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);
+	}
+
 	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) {
-		shutdown(sess->sess_sock, SHUT_RDWR);
-		close(sess->sess_sock);
-	}
+	if (sess->sess_sock > STDERR_FILENO)
+		srv_Close(sess->sess_sock);
 
+	mqtt_srv_Fini(&sess->sess_srv);
 	mqtt_msgFree(&sess->sess_buf, 42);
 
 	free(sess);
 }
 
 static void *
-thrSession(struct tagSession *sess)
+leaveClient(sched_task_t *task)
 {
-	void thrClean(struct tagSession *sess)
-	{
-		pthread_mutex_lock(&mtx_sess);
-		TAILQ_REMOVE(&Sessions, sess, sess_node);
-		pthread_mutex_unlock(&mtx_sess);
-		ioDEBUG(1, "Close socket=%d", sess->sess_sock);
-		finiSession(sess);
-	}
+	struct tagSession *sess;
+	int ret;
 
-	pthread_cleanup_push((void(*)(void*)) thrClean, sess);
+	ioTRACE(4);
 
-	ioTRACE(2);
+	assert(task);
 
-	pthread_cleanup_pop(42);
-	pthread_exit(NULL);
+	sess = TASK_ARG(task);
+	assert(sess);
+
+	TAILQ_REMOVE(&Sessions, sess, sess_node);
+
+	ret = mqtt_msgDISCONNECT(sess->sess_buf);
+	send(TASK_FD(task), sess->sess_buf->msg_base, ret, MSG_NOSIGNAL);
+
+	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 *
+dispatchSession(sched_task_t *task)
+{
+	int ret, len = 0;
+	struct tagSession *sess;
+
+	ioTRACE(2);
+
+	assert(task);
+
+	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));
+		finiSession(sess);
+		return NULL;
+	} else if (!ret) {
+		ioDEBUG(4, "Session %s EOF received.", sess->sess_cid);
+		finiSession(sess);
+		return NULL;
+	}
+
+	do {
+		/* dispatch message type */
+		if ((len = mqtt_srv_Dispatch(sess->sess_srv, ret, sess)) < 0) {
+			if (len == -1)
+				ioLIBERR(mqtt);
+			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);
+		finiSession(sess);
+	}
+	return NULL;
+}
+
+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 *sess = NULL;
-	int ret;
-	pthread_attr_t attr;
+	struct tagSession *s, *sess = NULL;
+	int ret, wlen;
 
 	ioTRACE(4);
 
-	sess = initSession(TASK_FD(task), TASK_ARG(task));
-	if (!sess) {
+	assert(task);
+
+	if (!TASK_DATA(task)) {
+		/* flow from accept new clients */
+		sess = initSession(TASK_FD(task), TASK_ARG(task));
 		io_freeVar(TASK_ARG(task));
-		close(TASK_FD(task));
-		return NULL;
-	}
+		if (!sess) {
+			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);
+			return NULL;
+		}
+	} 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);
 	}
+
 	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);
@@ -142,113 +224,135 @@ startSession(sched_task_t *task)
 		ret = MQTT_RETCODE_DENIED;
 		goto end;
 	} else {
-		ioDEBUG(0, "Login:: ALLOWED for username %s ...", sess->sess_user);
+		ioDEBUG(1, "Login:: ALLOWED for username %s ...", sess->sess_user);
 		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;
+	if (call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%") > 0) {
+		ioDEBUG(2, "Old session %s should be disconnect!", sess->sess_cid);
+		TAILQ_FOREACH(s, &Sessions, sess_node)
+			if (!strcmp(s->sess_cid, sess->sess_cid)) {
+				/* found stale session & disconnect it! */
+				schedWrite(root, leaveClient, sess, TASK_FD(task), NULL, 0);
+				break;
+			}
+	}
+
+	if (call.InitSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, sess->sess_addr, 
+				sess->sess_will.flag, sess->sess_will.topic, sess->sess_will.msg, 
+				sess->sess_will.qos, sess->sess_will.retain) == -1) {
+		ioDEBUG(0, "Session %s DENIED for username %s", sess->sess_cid, sess->sess_user);
+		ret = MQTT_RETCODE_DENIED;
+		goto end;
 	} else {
-		ioDEBUG(5, "Sended %d bytes", ret);
-		free(msg.msg_base);
-		msg.msg_len = 0;
+		ioDEBUG(0, "Session %s from %s and username %s is started", 
+				sess->sess_cid, sess->sess_addr, sess->sess_user);
+		ret = MQTT_RETCODE_ACCEPTED;
 	}
 
-	/* Start session thread OK ... */
-	pthread_attr_init(&attr);
-	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-
-	pthread_mutex_lock(&mtx_sess);
+	/* Start session task OK ... */
 	TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);
-	pthread_create(&sess->sess_tid, &attr, (void*(*)(void*)) thrSession, sess);
-	pthread_mutex_unlock(&mtx_sess);
 
-	ioDEBUG(1, "ConnID=%s(%s) for %s login OK!", sess->sess_cid, sess->sess_user, sess->sess_addr);
+	if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0)) {
+		ioLIBERR(sched);
+		ret = MQTT_RETCODE_DENIED;
+	}
 
-	pthread_attr_destroy(&attr);
-	return NULL;
+	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);
 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);
-		msg.msg_len = 0;
-	}
+	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;
 }
 
-/* ----------------------------------------------------------------------- */
-
 static void *
-thrSched(void *arg __unused)
+acceptClient(sched_task_t *task)
 {
-	struct tagSession *sess;
+	int cli;
+	io_sockaddr_t sa;
+	socklen_t sslen = sizeof sa.ss;
+	ait_val_t *v;
+	char str[STRSIZ];
 
-	ioTRACE(1);
+	ioTRACE(4);
 
-	schedRun(root, &Kill);
+	assert(task);
 
-	TAILQ_FOREACH(sess, &Sessions, sess_node)
-		if (sess->sess_tid)
-			pthread_cancel(sess->sess_tid);
-	pthread_exit(NULL);
+	if ((cli = accept(TASK_FD(task), &sa.sa, &sslen)) == -1)
+		goto end;
+	else
+		fcntl(cli, F_SETFL, fcntl(cli, F_GETFL, 0) | O_NONBLOCK);
+
+	v = io_allocVar();
+	if (!v) {
+		ioLIBERR(io);
+		close(cli);
+		goto end;
+	} 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, NULL, 0)) {
+		io_freeVar(v);
+		close(cli);
+		ioDEBUG(1, "Terminated client with socket=%d", cli);
+	}
+end:
+	if (!schedRead(root, acceptClient, NULL, TASK_FD(task), NULL, 0))
+		ioLIBERR(sched);
+	return NULL;
 }
 
+/* ----------------------------------------------------------------------- */
+
 int
 Run(int sock)
 {
-	io_sockaddr_t sa;
-	socklen_t sslen = sizeof sa.ss;
-	int cli;
-	pthread_t tid;
-	ait_val_t *v;
+	struct tagPub *pub;
+	struct tagSession *sess;
+	struct timespec pl = { 0, 100000000 };
 
 	ioTRACE(1);
 
-	if (pthread_create(&tid, NULL, thrSched, NULL)) {
-		ioLOGERR(0);
+	if (listen(sock, SOMAXCONN) == -1) {
+		ioSYSERR(0);
 		return -1;
 	} else
-		pthread_detach(tid);
-	ioDEBUG(2, "Run scheduler management thread");
+		fcntl(sock, F_SETFL, fcntl(sock, F_GETFL, 0) | O_NONBLOCK);
 
-	if (listen(sock, 5 /*SOMAXCONN*/) == -1) {
-		ioLOGERR(0);
+	/* state machine - accept new connections */
+	if (!schedRead(root, acceptClient, NULL, sock, NULL, 0)) {
+		ioLIBERR(sched);
 		return -1;
 	}
 
-	while (!Kill) {
-	printf("%%%%%%%%%%rrrrrrrrrrrrrrrrrrrrr errno=%d\n", errno);
-		if ((cli = accept(sock, &sa.sa, &sslen)) == -1) {
-	printf("rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr errno=%d\n", errno);
-			if (!Kill)
-				continue;
-			ioLOGERR(0);
-			break;
-		}
-		v = io_allocVar();
-		if (!v) {
-			ioLIBERR(mqtt);
-			break;
-		} else
-			io_n2addr(&sa, v);
-		ioDEBUG(1, "Connected client with socket=%d from %s:%d", cli, 
-				AIT_GET_STR(v), io_n2port(&sa));
+	schedPolling(root, &pl, NULL);
+	schedRun(root, &Kill);
 
-		if (!schedRead(root, startSession, v, cli)) {
-			io_freeVar(v);
-			close(cli);
-			ioDEBUG(1, "Terminated client with socket=%d", cli);
-		}
-	}
+	/* free all undeleted elements into lists */
+	TAILQ_FOREACH(pub, &Pubs, pub_node) {
+		TAILQ_REMOVE(&Pubs, pub, pub_node);
 
+		AIT_FREE_VAL(&pub->pub_name);
+		if (pub->pub_packet.msg_base)
+			free(pub->pub_packet.msg_base);
+	}
+	TAILQ_FOREACH(sess, &Sessions, sess_node) {
+		TAILQ_REMOVE(&Sessions, sess, sess_node);
+		finiSession(sess);
+	}
 	return 0;
 }