--- mqtt/src/daemon.c	2012/06/29 08:47:28	1.2.2.40
+++ mqtt/src/daemon.c	2012/07/03 08:39:39	1.2.2.47
@@ -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 *
@@ -70,13 +70,15 @@ finiSession(struct tagSession *sess)
 	if (!sess)
 		return;
 
+	schedCancelby(root, taskTIMER, CRITERIA_CALL, sendRetain, NULL);
+
 	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);
+		if (call.WipePUB_topic)	/* only dynamic messages */
+			call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, 0);
 	}
 
 	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
@@ -90,10 +92,13 @@ 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);
@@ -179,6 +184,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 +220,9 @@ startSession(sched_task_t *task)
 	ait_val_t *v;
 	struct tagSession *s, *sess = NULL;
 	int ret, wlen;
+	mqtt_subscr_t *subs;
+	struct timespec ts = { RETAIN_TIMEOUT, 0 };
+	intptr_t sock;
 
 	ioTRACE(4);
 
@@ -252,7 +286,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! */
-				schedCancelby(root, taskMAX, CRITERIA_FD, (void*) s->sess_sock, NULL);
+				sock = s->sess_sock;
+				schedCancelby(root, taskMAX, CRITERIA_FD, (void*) sock, NULL);
 				schedWrite(root, leaveClient, s, s->sess_sock, NULL, 0);
 				break;
 			}
@@ -272,12 +307,19 @@ startSession(sched_task_t *task)
 	if (sess->sess_clean) {
 		if (call.DeletePUB_subscribe)
 			call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%");
-		if (call.WipePUB_topic)
+		if (call.WipePUB_topic)	/* delete ALL messages */
 			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) {
+		/* load subscribes */
+		subs = call.ReadPUB_subscribe(&cfg, pub, sess->sess_cid, "%");
+		loadSubscribes(sess, subs);
+		mqtt_subFree(&subs);
 	}
 
+	/* timer event for retain messages */
+	if (call.ReadPUB_topic)
+		schedTimer(root, sendRetain, sess, ts, NULL, 0);
+
 	/* Start session task OK ... */
 	if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0)) {
 		ioLIBERR(sched);
@@ -364,6 +406,8 @@ Run(int sock)
 
 	schedPolling(root, &pl, NULL);
 	schedRun(root, &Kill);
+
+	schedCancelby(root, taskTIMER, CRITERIA_CALL, sendRetain, NULL);
 
 	/* free all undeleted elements into lists */
 	TAILQ_FOREACH(sess, &Sessions, sess_node) {