--- mqtt/src/daemon.c	2012/01/25 10:34:14	1.1.2.32
+++ mqtt/src/daemon.c	2012/04/25 16:36:26	1.2.2.15
@@ -6,6 +6,7 @@
 
 
 static void *startSession(sched_task_t *task);
+static pthread_attr_t attr;
 
 
 static inline struct tagSession *
@@ -21,15 +22,17 @@ 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));
+		ioSYSERR(0);
 		io_freeVar(v);
 		return NULL;
 	} else
 		memset(sess, 0, sizeof(struct tagSession));
 
-	TAILQ_INIT(&sess->sess_sndqueue);
+	pthread_mutex_init(&sess->sess_mtx, NULL);
 
-	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
@@ -37,12 +40,30 @@ initSession(int sock, ait_val_t * __restrict v)
 
 	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);
+		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);
@@ -50,7 +71,7 @@ initSession(int sock, ait_val_t * __restrict v)
 }
 
 static void
-finiSession(struct tagSession *sess, int preservSock)
+finiSession(struct tagSession *sess)
 {
 	struct tagStore *store;
 
@@ -62,25 +83,30 @@ finiSession(struct tagSession *sess, int preservSock)
 	if (call.FiniSessPUB)
 		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 
-	while ((store = TAILQ_FIRST(&sess->sess_sndqueue))) {
-		TAILQ_REMOVE(&sess->sess_sndqueue, store, st_node);
+	SESS_ELEM_LOCK(sess);
 
-		if (store->st_subscr.sub_topic._base)
-			free(store->st_subscr.sub_topic._base);
-		if (store->st_subscr.sub_value._base)
-			free(store->st_subscr.sub_value._base);
+	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);
 	}
+	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 && !preservSock)
+	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);
@@ -96,81 +122,28 @@ 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)
-		ioDEBUG(3, "Error:: send(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
-	else {
-		ioDEBUG(5, "Sended %d bytes for disconnect", ret);
-		free(msg.msg_base);
-		memset(&msg, 0, sizeof msg);
-	}
+	send(sess->sess_sock, msg.msg_base, ret, MSG_NOSIGNAL);
+	free(msg.msg_base);
 
 	ioDEBUG(1, "Close socket=%d", sess->sess_sock);
-	finiSession(sess, 0);
+	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
-KASession(struct tagSession *sess)
-{
-	mqtt_msg_t msg = { NULL, 0 };
-	int ret;
-	struct pollfd pfd;
-
-	ioTRACE(4);
-
-	assert(sess);
-
-	/* ping request */
-	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));
-		return -1;
-	} else {
-		ioDEBUG(5, "Sended %d bytes for ping request", ret);
-		free(msg.msg_base);
-		memset(&msg, 0, sizeof msg);
-	}
-
-	pfd.fd = sess->sess_sock;
-	pfd.events = POLLIN | POLLPRI;
-	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));
-		return -1;
-	} else if (!ret) {
-		ioDEBUG(5, "Warning:: Session is abandoned ... must be disconnect!");
-		return 1;
-	}
-	/* receive & decode packet */
-	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));
-		return -1;
-	}
-	if (mqtt_readPINGRESP(sess->sess_buf)) {
-		ioDEBUG(5, "Warning:: Session is broken, not hear ping response ... must be disconnect!");
-		return 2;
-	}
-
-	/* Keep Alive is OK! */
-	return 0;
-}
-
 static void *
 thrSession(struct tagSession *sess)
 {
-	mqtt_msg_t msg = { NULL, 0 };
 	int ret, locKill = 42;
 	struct pollfd pfd;
 	struct mqtthdr *hdr;
 	ait_val_t *v;
-	struct tagStore *store;
 
 	pthread_cleanup_push((void(*)(void*)) stopSession, sess);
 	ioTRACE(2);
@@ -182,7 +155,7 @@ thrSession(struct tagSession *sess)
 				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))) {
+		} 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;
@@ -198,32 +171,11 @@ thrSession(struct tagSession *sess)
 			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");
-				pthread_mutex_lock(&mtx_sess);
-				TAILQ_REMOVE(&Sessions, sess, sess_node);
-				pthread_mutex_unlock(&mtx_sess);
-
-				if (call.FiniSessPUB)
-					call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
-
-				while ((store = TAILQ_FIRST(&sess->sess_sndqueue))) {
-					TAILQ_REMOVE(&sess->sess_sndqueue, store, st_node);
-
-					if (store->st_subscr.sub_topic._base)
-						free(store->st_subscr.sub_topic._base);
-					if (store->st_subscr.sub_value._base)
-						free(store->st_subscr.sub_value._base);
-
-					free(store);
-				}
-
-				if (sess->sess_will.msg)
-					free(sess->sess_will.msg);
-				if (sess->sess_will.topic)
-					free(sess->sess_will.topic);
-
 				if ((v = io_allocVar())) {
 					AIT_SET_STR(v, sess->sess_addr);
 					if (!schedEvent(root, startSession, v, (u_long) sess->sess_sock, sess, ret))
@@ -231,27 +183,27 @@ thrSession(struct tagSession *sess)
 				} else
 					ioLIBERR(mqtt);
 
-				locKill ^= locKill;
+				SESS_LOCK;
+				TAILQ_REMOVE(&Sessions, sess, sess_node);
+				SESS_UNLOCK;
 
-				call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
-						sess->sess_addr, sess->sess_user);
-				continue;
+				locKill ^= locKill;
+				break;
 			case MQTT_TYPE_DISCONNECT:
 				ioDEBUG(5, "Exec DISCONNECT session");
-				pthread_mutex_lock(&mtx_sess);
+				SESS_LOCK;
 				TAILQ_REMOVE(&Sessions, sess, sess_node);
-				pthread_mutex_unlock(&mtx_sess);
+				SESS_UNLOCK;
 
-				finiSession(sess, 0);
+				finiSession(sess);
 				locKill ^= locKill;
-
-				call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
-						sess->sess_addr, sess->sess_user);
 				continue;
 			case MQTT_TYPE_PUBLISH:
 				ioDEBUG(5, "Exec PUBLISH topic QoS=%d", hdr->mqtt_msg.qos);
-				if (Publish(sess))
+				/*
+				if (cmdPUBLISH(sess))
 					locKill ^= locKill;
+					*/
 				break;
 			case MQTT_TYPE_PUBREL:
 				break;
@@ -260,7 +212,11 @@ thrSession(struct tagSession *sess)
 			case MQTT_TYPE_UNSUBSCRIBE:
 				break;
 			case MQTT_TYPE_PINGREQ:
+				ioDEBUG(5, "Exec PINGREQ session");
 				break;
+			case MQTT_TYPE_PINGRESP:
+				ioDEBUG(5, "Exec PINGRESP session");
+				break;
 			default:
 				ioDEBUG(5, "Error:: Session %s, wrong command %d - DISCARDED", 
 						sess->sess_cid, hdr->mqtt_msg.type);
@@ -270,6 +226,7 @@ thrSession(struct tagSession *sess)
 
 	pthread_cleanup_pop(locKill);
 	pthread_exit(NULL);
+	return NULL;
 }
 
 static void *
@@ -281,13 +238,13 @@ startSession(sched_task_t *task)
 	mqtthdr_connack_t cack;
 	struct tagSession *s, *sess = NULL;
 	int ret;
-	pthread_attr_t attr;
 
 	ioTRACE(4);
 
 	assert(task);
 
 	if (!TASK_DATA(task)) {
+		/* flow from accept new clients */
 		sess = initSession(TASK_FD(task), TASK_ARG(task));
 		if (!sess) {
 			io_freeVar(TASK_ARG(task));
@@ -298,7 +255,7 @@ startSession(sched_task_t *task)
 		/* 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);
+			finiSession(sess);
 			return NULL;
 		}
 	} else {
@@ -332,6 +289,7 @@ startSession(sched_task_t *task)
 		ioDEBUG(1, "Login:: ALLOWED for username %s ...", sess->sess_user);
 		ret = MQTT_RETCODE_ACCEPTED;
 	}
+
 	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)
@@ -341,6 +299,7 @@ startSession(sched_task_t *task)
 				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) {
@@ -356,7 +315,7 @@ 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, 0);
+		finiSession(sess);
 		return NULL;
 	} else {
 		ioDEBUG(5, "Sended %d bytes", ret);
@@ -365,18 +324,13 @@ startSession(sched_task_t *task)
 	}
 
 	/* 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 (timeout=%d) OK!\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user, sess->sess_ka);
-
-	pthread_attr_destroy(&attr);
 	return NULL;
 end:	/* close client connection */
 	ret = mqtt_msgCONNACK(&msg, ret);
@@ -389,78 +343,90 @@ end:	/* close client connection */
 	}
 
 	ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, sess->sess_sock);
-	finiSession(sess, 0);
+	finiSession(sess);
 	return NULL;
 }
 
-/* ----------------------------------------------------------------------- */
-
 static void *
-thrSched(void *arg __unused)
+acceptClient(sched_task_t *task)
 {
-	struct tagSession *sess;
-	struct timespec pl = { 0, 10000000 };
+	int cli;
+	io_sockaddr_t sa;
+	socklen_t sslen = sizeof sa.ss;
+	ait_val_t *v;
+	char str[STRSIZ];
 
-	ioTRACE(1);
+	ioTRACE(4);
 
-	schedPolling(root, &pl, NULL);
-	schedRun(root, &Kill);
+	assert(task);
 
-	TAILQ_FOREACH(sess, &Sessions, sess_node)
-		if (sess->sess_tid)
-			pthread_cancel(sess->sess_tid);
-	ioDEBUG(5, "EXIT from Scheduler thread !!!");
-	pthread_exit(NULL);
+	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);
+
+	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_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(TASK_ROOT(task), 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;
-	char str[STRSIZ];
+	struct tagPub *pub;
+	struct timespec pl = { 0, 100000000 };
 
 	ioTRACE(1);
 
-	if (pthread_create(&tid, NULL, thrSched, NULL)) {
+	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, SOMAXCONN) == -1) {
-		ioSYSERR(0);
+	/* state machine - accept new connections */
+	if (!schedRead(root, acceptClient, NULL, sock, NULL, 0)) {
+		ioLIBERR(sched);
 		return -1;
 	}
 
-	while (!Kill) {
-		if ((cli = accept(sock, &sa.sa, &sslen)) == -1) {
-			if (!Kill)
-				continue;
-			ioSYSERR(0);
-			break;
-		}
-		v = io_allocVar();
-		if (!v) {
-			ioLIBERR(mqtt);
-			break;
-		} else {
-			memset(str, 0, sizeof str);
-			snprintf(str, sizeof str, "%s:%hu", io_n2addr(&sa, v), io_n2port(&sa));
-			AIT_SET_STR(v, str);
-		}
-		ioDEBUG(1, "Connected client with socket=%d from %s", cli, AIT_GET_STR(v));
+	pthread_attr_init(&attr);
+	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 
-		if (!schedRead(root, startSession, v, cli, NULL, 0)) {
-			io_freeVar(v);
-			close(cli);
-			ioDEBUG(1, "Terminated client with socket=%d", cli);
-		}
-	}
+	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);
+
+		AIT_FREE_VAL(&pub->pub_name);
+		if (pub->pub_packet.msg_base)
+			free(pub->pub_packet.msg_base);
+	}
+	PUBS_UNLOCK;
 	return 0;
 }