--- mqtt/src/mqttd_calls.c	2012/06/26 14:51:33	1.2.2.28
+++ mqtt/src/mqttd_calls.c	2012/06/29 15:43:13	1.2.2.32
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "mqttd.h"
+#include "utils.h"
 #include "rtlm.h"
 #include "mqttd_calls.h"
 
@@ -60,14 +61,15 @@ pubOnce(struct tagSession *sess, char * __restrict psT
 {
 	ait_val_t *p = NULL;
 	struct tagSession *s = NULL;
-	struct tagStore *st = NULL;
+	struct tagStore *st_, *st = NULL;
 	regex_t re;
 	regmatch_t match;
 	int ret;
 	char szStr[STRSIZ];
 
+
 	TAILQ_FOREACH(s, &Sessions, sess_node) {
-		SLIST_FOREACH(st, &s->sess_subscr, st_node) {
+		SLIST_FOREACH_SAFE(st, &s->sess_subscr, st_node, st_) {
 			if ((ret = regcomp(&re, st->st_subscr.sub_topic.msg_base, REG_EXTENDED))) {
 				regerror(ret, &re, szStr, sizeof szStr);
 				regfree(&re);
@@ -92,7 +94,7 @@ pubAck(struct tagSession *sess, u_short mid, char * __
 {
 	ait_val_t *p = NULL;
 	struct tagSession *s = NULL;
-	struct tagStore *st = NULL;
+	struct tagStore *st_, *st = NULL;
 	regex_t re;
 	regmatch_t match;
 	int ret;
@@ -109,7 +111,7 @@ pubAck(struct tagSession *sess, u_short mid, char * __
 			sess->sess_user, sess->sess_addr, hdr->mqtt_msg.qos, hdr->mqtt_msg.retain);
 
 	TAILQ_FOREACH(s, &Sessions, sess_node) {
-		SLIST_FOREACH(st, &s->sess_subscr, st_node) {
+		SLIST_FOREACH_SAFE(st, &s->sess_subscr, st_node, st_) {
 			/* check for QoS */
 			if (st->st_subscr.sub_ret < MQTT_QOS_ACK)
 				continue;
@@ -143,7 +145,7 @@ pubExactly(struct tagSession *sess, u_short mid, char 
 {
 	ait_val_t *p = NULL;
 	struct tagSession *s = NULL;
-	struct tagStore *st = NULL;
+	struct tagStore *st_, *st = NULL;
 	regex_t re;
 	regmatch_t match;
 	int ret;
@@ -160,7 +162,7 @@ pubExactly(struct tagSession *sess, u_short mid, char 
 			sess->sess_user, sess->sess_addr, hdr->mqtt_msg.qos, hdr->mqtt_msg.retain);
 
 	TAILQ_FOREACH(s, &Sessions, sess_node) {
-		SLIST_FOREACH(st, &s->sess_subscr, st_node) {
+		SLIST_FOREACH_SAFE(st, &s->sess_subscr, st_node, st_) {
 			/* check for QoS */
 			if (st->st_subscr.sub_ret < MQTT_QOS_EXACTLY)
 				continue;
@@ -262,17 +264,18 @@ cmdPUBREL(void *srv, int len, void *arg)
 		return 0;
 	}
 
-	// TODO:: Delete from database topic
+	/* delete not retain message */
+	call.DeletePUB_topic(&cfg, pub, sess->sess_cid, mid, "%", sess->sess_user, 
+			sess->sess_addr, 0);
 
 	siz = mqtt_msgPUBCOMP(sess->sess_buf, mid);
 	if (siz == -1) {
 		ioDEBUG(5, "Error:: in msgPUBCOMP #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		return 0;
-	} else {
-		p = mkPkt(sess->sess_buf->msg_base, siz);
-		memset(sess->sess_buf->msg_base, 0, sess->sess_buf->msg_len);
 	}
 
+	p = mkPkt(sess->sess_buf->msg_base, siz);
+	memset(sess->sess_buf->msg_base, 0, sess->sess_buf->msg_len);
 	schedWrite(root, sendPacket, p, sess->sess_sock, NULL, 0);
 	return 0;
 }
@@ -304,48 +307,44 @@ cmdSUBSCRIBE(void *srv, int len, void *arg)
 
 	/* add to db */
 	for (i = 0; i < siz; i++, subs[i].sub_ret = MQTT_QOS_DENY) {
-		/* convert topic to sql search statement */
-		if (mqtt_sqlTopic(subs[i].sub_topic.msg_base, buf, sizeof buf) == -1) {
-			ioDEBUG(5, "Error:: in db #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+		store = io_malloc(sizeof(struct tagStore));
+		if (!store) {
+			ioSYSERR(0);
 			continue;
+		} else {
+			store->st_msgid = mid;
+			mqtt_subCopy(&store->st_subscr, &subs[i]);
 		}
-		if (call.WritePUB_subscribe(&cfg, pub, sess->sess_cid, mid, buf, 
-				sess->sess_user, sess->sess_addr, subs[i].sub_ret) > 0) {
-			store = io_malloc(sizeof(struct tagStore));
-			if (!store) {
+
+		/* add to cache */
+		SLIST_INSERT_HEAD(&sess->sess_subscr, store, st_node);
+
+		/* convert topic to regexp */
+		if (mqtt_expandTopic(subs[i].sub_topic.msg_base, buf, sizeof buf, 1, 1) == -1) {
+			ioDEBUG(5, "Error:: in regexp #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+
+			subs[i].sub_ret = MQTT_QOS_DENY;
+		} else {
+			ptr = realloc(store->st_subscr.sub_topic.msg_base, strlen(buf) + 1);
+			if (!ptr) {
 				ioSYSERR(0);
 				continue;
 			} else {
-				store->st_msgid = mid;
-				mqtt_subCopy(&store->st_subscr, &subs[i]);
+				store->st_subscr.sub_topic.msg_base = ptr;
+				store->st_subscr.sub_topic.msg_len = strlen(buf) + 1;
+				memcpy(store->st_subscr.sub_topic.msg_base, buf, 
+						store->st_subscr.sub_topic.msg_len);
 			}
 
-			/* add to cache */
-			SLIST_INSERT_HEAD(&sess->sess_subscr, store, st_node);
+			call.LOG(logg, "Added [%s] SUBSCRIBE '%s'(%d) from %s\n", sess->sess_cid, 
+					store->st_subscr.sub_topic.msg_base, 
+					store->st_subscr.sub_topic.msg_len, sess->sess_addr);
 
-			/* convert topic to regexp */
-			if (mqtt_expandTopic(subs[i].sub_topic.msg_base, buf, sizeof buf, 1, 1) == -1) {
-				ioDEBUG(5, "Error:: in regexp #%d - %s", mqtt_GetErrno(), mqtt_GetError());
-
-				subs[i].sub_ret = MQTT_QOS_DENY;
-			} else {
-				ptr = realloc(store->st_subscr.sub_topic.msg_base, strlen(buf) + 1);
-				if (!ptr)
-					ioSYSERR(0);
-				else {
-					store->st_subscr.sub_topic.msg_base = ptr;
-					store->st_subscr.sub_topic.msg_len = strlen(buf) + 1;
-					memcpy(store->st_subscr.sub_topic.msg_base, buf, 
-							store->st_subscr.sub_topic.msg_len);
-				}
-
-				call.LOG(logg, "Added [%s] SUBSCRIBE '%s'(%d) from %s\n", sess->sess_cid, 
-						store->st_subscr.sub_topic.msg_base, 
-						store->st_subscr.sub_topic.msg_len, sess->sess_addr);
-
-				subs[i].sub_ret = MQTT_QOS_PASS;
-			}
+			subs[i].sub_ret = MQTT_QOS_PASS;
 		}
+
+		call.WritePUB_subscribe(&cfg, pub, sess->sess_cid, mid, buf, 
+				sess->sess_user, sess->sess_addr, subs[i].sub_ret);
 	}
 
 	/* send acknowledge */
@@ -483,6 +482,9 @@ cmdCONNECT(void *srv, int len, void *arg)
 
 		io_free(store);
 	}
+
+	if (sess->sess_will.flag)
+		srv_Will(sess);
 
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);