--- mqtt/src/daemon.c	2012/05/28 08:08:21	1.2.2.34
+++ mqtt/src/daemon.c	2012/07/02 12:52:19	1.2.2.43
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "rtlm.h"
-#include "utils.h"
 #include "mqttd.h"
 #include "mqttd_calls.h"
+#include "utils.h"
 
 
 static inline struct tagSession *
@@ -39,7 +39,7 @@ initSession(int sock, ait_val_t * __restrict v)
 	}
 
 	/* init server actor */
-	sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf, sess->sess_ka);
+	sess->sess_srv = mqtt_srv_cliInit(sock, sess->sess_buf, sess->sess_ka, 1);
 	if (!sess->sess_srv) {
 		ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		mqtt_msgFree(&sess->sess_buf, 42);
@@ -90,15 +90,18 @@ finiSession(struct tagSession *sess)
 		io_free(store);
 	}
 
-	if (sess->sess_will.msg)
-		free(sess->sess_will.msg);
+	if (sess->sess_will.flag)
+		pubWill(sess);
+
 	if (sess->sess_will.topic)
 		free(sess->sess_will.topic);
+	if (sess->sess_will.msg)
+		free(sess->sess_will.msg);
 
 	if (sess->sess_sock > STDERR_FILENO)
 		srv_Close(sess->sess_sock);
 
-	mqtt_srv_Fini(&sess->sess_srv);
+	mqtt_srv_cliFini(&sess->sess_srv);
 	mqtt_msgFree(&sess->sess_buf, 42);
 
 	io_free(sess);
@@ -158,7 +161,7 @@ dispatchSession(sched_task_t *task)
 
 	do {
 		/* dispatch message type */
-		if ((len = mqtt_srv_Dispatch(sess->sess_srv, ret, sess)) < 0) {
+		if ((len = mqtt_srv_cliDispatch(sess->sess_srv, ret, sess)) < 0) {
 			if (len == -1) {
 				ioLIBERR(mqtt);
 				finiSession(sess);
@@ -179,6 +182,32 @@ dispatchSession(sched_task_t *task)
 	return NULL;
 }
 
+static int
+loadSubscribes(struct tagSession * __restrict sess, mqtt_subscr_t * __restrict subs)
+{
+	register int i;
+	struct tagStore *store;
+
+	if (!subs)
+		return -1;
+
+	for (i = 0; subs[i].sub_topic.msg_base; i++) {
+		store = io_malloc(sizeof(struct tagStore));
+		if (!store) {
+			ioSYSERR(0);
+			continue;
+		} else {
+			store->st_msgid = 0;
+			mqtt_subCopy(&store->st_subscr, &subs[i]);
+		}
+
+		/* add to cache */
+		SLIST_INSERT_HEAD(&sess->sess_subscr, store, st_node);
+	}
+
+	return 0;
+}
+
 void *
 startSession(sched_task_t *task)
 {
@@ -189,6 +218,7 @@ startSession(sched_task_t *task)
 	ait_val_t *v;
 	struct tagSession *s, *sess = NULL;
 	int ret, wlen;
+	mqtt_subscr_t *subs;
 
 	ioTRACE(4);
 
@@ -252,7 +282,8 @@ startSession(sched_task_t *task)
 		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);
+				schedCancelby(root, taskMAX, CRITERIA_FD, (void*) s->sess_sock, NULL);
+				schedWrite(root, leaveClient, s, s->sess_sock, NULL, 0);
 				break;
 			}
 	}
@@ -273,8 +304,10 @@ startSession(sched_task_t *task)
 			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
+	} else if (call.ReadPUB_subscribe) {
+		subs = call.ReadPUB_subscribe(&cfg, pub, sess->sess_cid, "%");
+		loadSubscribes(sess, subs);
+		mqtt_subFree(&subs);
 	}
 
 	/* Start session task OK ... */
@@ -315,8 +348,6 @@ acceptClient(sched_task_t *task)
 
 	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) {
@@ -352,11 +383,10 @@ Run(int sock)
 
 	ioTRACE(1);
 
-	if (listen(sock, SOMAXCONN) == -1) {
-		ioSYSERR(0);
+	if (mqtt_srv_Listen(sock, 0, 1) == -1) {
+		ioLIBERR(mqtt);
 		return -1;
-	} else
-		fcntl(sock, F_SETFL, fcntl(sock, F_GETFL, 0) | O_NONBLOCK);
+	}
 
 	/* state machine - accept new connections */
 	if (!schedRead(root, acceptClient, NULL, sock, NULL, 0)) {