--- mqtt/src/daemon.c	2012/05/05 15:16:34	1.2.2.27
+++ 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 *
@@ -16,7 +16,7 @@ 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;
@@ -34,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_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);
-		free(sess);
+		io_free(sess);
 		return NULL;
 	} else {
 		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_CONNECT, cmdCONNECT);
@@ -70,9 +70,17 @@ finiSession(struct tagSession *sess)
 	if (!sess)
 		return;
 
-	if (call.FiniSessPUB)
-		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
+	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)	/* only dynamic messages */
+			call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, 0);
+	}
+
 	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
 		SLIST_REMOVE_HEAD(&sess->sess_subscr, st_node);
 
@@ -81,21 +89,24 @@ 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);
 	}
 
-	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);
 
-	free(sess);
+	io_free(sess);
 }
 
 static void *
@@ -116,7 +127,7 @@ leaveClient(sched_task_t *task)
 	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);
 
@@ -152,7 +163,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);
@@ -173,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)
 {
@@ -180,17 +217,22 @@ startSession(sched_task_t *task)
 	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;
+	mqtt_subscr_t *subs;
+	struct timespec ts = { RETAIN_TIMEOUT, 0 };
+	intptr_t sock;
 
 	ioTRACE(4);
 
 	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;
@@ -223,6 +265,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 */
@@ -236,16 +280,18 @@ 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)
 			if (!strcmp(s->sess_cid, sess->sess_cid)) {
 				/* found stale session & disconnect it! */
-				schedWrite(root, leaveClient, sess, TASK_FD(task), NULL, 0);
+				sock = s->sess_sock;
+				schedCancelby(root, taskMAX, CRITERIA_FD, (void*) sock, NULL);
+				schedWrite(root, leaveClient, s, s->sess_sock, 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) {
@@ -257,7 +303,23 @@ 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)	/* delete ALL messages */
+			call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1);
+	} 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);
@@ -270,12 +332,12 @@ startSession(sched_task_t *task)
 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;
@@ -296,8 +358,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) {
@@ -313,7 +373,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);
 	}
@@ -328,17 +388,15 @@ end:
 int
 Run(int sock)
 {
-	struct tagPub *pub;
 	struct tagSession *sess;
 	struct timespec pl = { 0, 100000000 };
 
 	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)) {
@@ -349,14 +407,9 @@ Run(int sock)
 	schedPolling(root, &pl, NULL);
 	schedRun(root, &Kill);
 
-	/* free all undeleted elements into lists */
-	TAILQ_FOREACH(pub, &Pubs, pub_node) {
-		TAILQ_REMOVE(&Pubs, pub, pub_node);
+	schedCancelby(root, taskTIMER, CRITERIA_CALL, sendRetain, NULL);
 
-		AIT_FREE_VAL(&pub->pub_name);
-		if (pub->pub_packet.msg_base)
-			free(pub->pub_packet.msg_base);
-	}
+	/* free all undeleted elements into lists */
 	TAILQ_FOREACH(sess, &Sessions, sess_node) {
 		TAILQ_REMOVE(&Sessions, sess, sess_node);