--- mqtt/src/daemon.c	2012/05/05 12:15:25	1.2.2.23
+++ mqtt/src/daemon.c	2012/05/28 08:08:21	1.2.2.34
@@ -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)
 {
@@ -20,15 +16,13 @@ initSession(int sock, ait_val_t * __restrict v)
 	if (!v)
 		return NULL;
 
-	sess = malloc(sizeof(struct tagSession));
+	sess = io_malloc(sizeof(struct tagSession));
 	if (!sess) {
 		ioSYSERR(0);
 		return NULL;
 	} 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");
@@ -40,16 +34,16 @@ initSession(int sock, ait_val_t * __restrict v)
 	sess->sess_buf = mqtt_msgAlloc(USHRT_MAX);
 	if (!sess->sess_buf) {
 		ioLIBERR(mqtt);
-		free(sess);
+		io_free(sess);
 		return NULL;
 	}
 
 	/* init server actor */
-	sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf);
+	sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf, sess->sess_ka);
 	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_free(sess);
 		return NULL;
 	} else {
 		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_CONNECT, cmdCONNECT);
@@ -76,10 +70,15 @@ finiSession(struct tagSession *sess)
 	if (!sess)
 		return;
 
-	if (call.FiniSessPUB)
-		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
+	if (sess->sess_clean) {
+		if (call.FiniSessPUB)
+			call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
+		if (call.DeletePUB_subscribe)
+			call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%");
+		if (call.WipePUB_topic)
+			call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1);
+	}
 
-	SESS_ELEM_LOCK(sess);
 	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
 		SLIST_REMOVE_HEAD(&sess->sess_subscr, st_node);
 
@@ -88,10 +87,8 @@ finiSession(struct tagSession *sess)
 		if (store->st_subscr.sub_value.msg_base)
 			free(store->st_subscr.sub_value.msg_base);
 
-		free(store);
+		io_free(store);
 	}
-	SESS_ELEM_UNLOCK(sess);
-	pthread_mutex_destroy(&sess->sess_mtx);
 
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);
@@ -104,7 +101,7 @@ finiSession(struct tagSession *sess)
 	mqtt_srv_Fini(&sess->sess_srv);
 	mqtt_msgFree(&sess->sess_buf, 42);
 
-	free(sess);
+	io_free(sess);
 }
 
 static void *
@@ -120,14 +117,12 @@ leaveClient(sched_task_t *task)
 	sess = TASK_ARG(task);
 	assert(sess);
 
-	SESS_LOCK;
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
-	SESS_UNLOCK;
 
 	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));
+	ioDEBUG(1, "Close socket=%ld", (long) TASK_FD(task));
 	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user);
 
@@ -138,8 +133,7 @@ leaveClient(sched_task_t *task)
 static void *
 dispatchSession(sched_task_t *task)
 {
-	int ret;
-	struct mqtthdr *hdr;
+	int ret, len = 0;
 	struct tagSession *sess;
 
 	ioTRACE(2);
@@ -152,32 +146,47 @@ dispatchSession(sched_task_t *task)
 	/* 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;
-	} else
-		hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
+	}
 
-	/* dispatch message type */
-	if (mqtt_srv_Dispatch(sess->sess_srv, sess))
-		ioLIBERR(mqtt);
-//			schedEvent(root, startSession, NULL, (u_long) TASK_FD(task), sess, ret);
+	do {
+		/* dispatch message type */
+		if ((len = mqtt_srv_Dispatch(sess->sess_srv, ret, sess)) < 0) {
+			if (len == -1) {
+				ioLIBERR(mqtt);
+				finiSession(sess);
+			} else if (len == -2) {
+				TAILQ_REMOVE(&Sessions, sess, sess_node);
+				finiSession(sess);
+			} else if (len == -3)
+				schedEvent(root, startSession, NULL, (u_long) TASK_FD(task), sess, ret);
+		} else
+			ret -= len;
+	} while (len > 0 && ret > 0);
 
-	if (!schedRead(root, dispatchSession, TASK_ARG(task), TASK_FD(task), NULL, 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 buf = { basebuf, sizeof basebuf };
 	mqtthdr_connflgs_t flg;
 	mqtthdr_connack_t cack;
+	ait_val_t *v;
 	struct tagSession *s, *sess = NULL;
 	int ret, wlen;
 
@@ -186,9 +195,10 @@ startSession(sched_task_t *task)
 	assert(task);
 
 	if (!TASK_DATA(task)) {
+		v = TASK_ARG(task);
 		/* flow from accept new clients */
-		sess = initSession(TASK_FD(task), TASK_ARG(task));
-		io_freeVar(TASK_ARG(task));
+		sess = initSession(TASK_FD(task), v);
+		io_freeVar(&v);
 		if (!sess) {
 			close(TASK_FD(task));
 			return NULL;
@@ -221,6 +231,8 @@ startSession(sched_task_t *task)
 		sess->sess_will.qos = flg.will_qos;
 		sess->sess_will.retain = flg.will_retain;
 		sess->sess_will.flag = flg.will_flg;
+
+		sess->sess_srv->timeout = sess->sess_ka;
 	}
 
 	/* check online table for user */
@@ -234,6 +246,7 @@ startSession(sched_task_t *task)
 		ret = MQTT_RETCODE_ACCEPTED;
 	}
 
+	/* db management */
 	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)
@@ -243,7 +256,6 @@ 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) {
@@ -255,26 +267,34 @@ startSession(sched_task_t *task)
 				sess->sess_cid, sess->sess_addr, sess->sess_user);
 		ret = MQTT_RETCODE_ACCEPTED;
 	}
+	/* clean/load session if requested */
+	if (sess->sess_clean) {
+		if (call.DeletePUB_subscribe)
+			call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%");
+		if (call.WipePUB_topic)
+			call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1);
+	} else {
+		// todo: read_sql subs and prepare publish
+	}
 
-	/* Start session thread OK ... */
-	SESS_LOCK;
-	TAILQ_INSERT_TAIL(&Sessions, sess, sess_node);
-	SESS_UNLOCK;
-
-	if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0))
+	/* 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);
 
 	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 */
 	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));
+		ioDEBUG(3, "Error:: send(%ld) #%d - %s", (long) TASK_FD(task), errno, strerror(errno));
 	} else
 		ioDEBUG(5, "Sended %d bytes", wlen);
 
 	if (ret != MQTT_RETCODE_ACCEPTED) {
-		ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, TASK_FD(task));
+		ioDEBUG(1, "Close client %s with socket=%ld", sess->sess_addr, (long) TASK_FD(task));
 		finiSession(sess);
 	}
 	return NULL;
@@ -312,7 +332,7 @@ acceptClient(sched_task_t *task)
 	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);
+		io_freeVar(&v);
 		close(cli);
 		ioDEBUG(1, "Terminated client with socket=%d", cli);
 	}
@@ -327,7 +347,7 @@ end:
 int
 Run(int sock)
 {
-	struct tagPub *pub;
+	struct tagSession *sess;
 	struct timespec pl = { 0, 100000000 };
 
 	ioTRACE(1);
@@ -344,23 +364,14 @@ 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);
+	TAILQ_FOREACH(sess, &Sessions, sess_node) {
+		TAILQ_REMOVE(&Sessions, sess, sess_node);
 
-		AIT_FREE_VAL(&pub->pub_name);
-		if (pub->pub_packet.msg_base)
-			free(pub->pub_packet.msg_base);
+		finiSession(sess);
 	}
-	PUBS_UNLOCK;
 	return 0;
 }