--- mqtt/src/mqttd_calls.c	2012/05/22 14:15:04	1.2.2.17
+++ mqtt/src/mqttd_calls.c	2012/06/26 08:05:58	1.2.2.26
@@ -4,23 +4,135 @@
 #include "mqttd_calls.h"
 
 
+static inline ait_val_t *
+mkPkt(void * __restrict data, int dlen)
+{
+	ait_val_t *p = NULL;
+
+	if (!(p = io_allocVar())) {
+		ioDEBUG(7, "Error:: in send packet prepare #%d - %s", io_GetErrno(), io_GetError());
+		return NULL;
+	}
+
+	if (data && dlen > 0)
+		AIT_SET_BUF(p, data, dlen);
+
+	return p;
+}
+
+static inline void
+freePkt(ait_val_t ** __restrict p)
+{
+	if (!p)
+		return;
+
+	io_freeVar(p);
+}
+
+static void *
+sendPacket(sched_task_t *task)
+{
+	ait_val_t *p = TASK_ARG(task);
+	register int n, slen;
+	u_char *pos;
+
+	if (!p || AIT_ISEMPTY(p)) {
+		ioDEBUG(9, "Error:: invalid packet or found empty content ...");
+		return NULL;
+	}
+
+	for (slen = AIT_LEN(p), pos = AIT_GET_BUF(p); slen > 0; slen -= n, pos += n) {
+		n = send(TASK_FD(task), pos, slen, MSG_NOSIGNAL);
+		if (n == -1) {
+			ioSYSERR(0);
+			break;
+		}
+	}
+
+	freePkt(&p);
+	return NULL;
+}
+
+/* --------------------------------------------------- */
+
 static int
-pubOnce(struct tagSession *sess, u_short mid, char * __restrict psTopic, 
-		int topicLen, char * __restrict data, int datlen)
+pubOnce(struct tagSession *sess, char * __restrict psTopic, int datlen)
 {
+	ait_val_t *p = NULL;
+	struct tagSession *s = NULL;
+	struct tagStore *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) {
+			if ((ret = regcomp(&re, st->st_subscr.sub_topic.msg_base, REG_EXTENDED))) {
+				regerror(ret, &re, szStr, sizeof szStr);
+				regfree(&re);
+				ioDEBUG(3, "Error:: regcomp(%s) %s\n", (char*)
+						st->st_subscr.sub_topic.msg_base, szStr);
+			}
+			if (!regexec(&re, psTopic, 1, &match, 0)) {
+				/* MATCH */
+				p = mkPkt(sess->sess_buf->msg_base, datlen);
+				schedWrite(root, sendPacket, p, s->sess_sock, NULL, 0);
+			}
+
+			regfree(&re);
+		}
+	}
+
 	return 0;
 }
 
 static int
-pubAck(struct tagSession *sess, u_short mid, char * __restrict psTopic, 
-		int topicLen, char * __restrict data, int datlen)
+pubAck(struct tagSession *sess, u_short mid, char * __restrict psTopic, int datlen)
 {
+	ait_val_t *p = NULL;
+	struct tagSession *s = NULL;
+	struct tagStore *st = NULL;
+	regex_t re;
+	regmatch_t match;
+	int ret, flg = 0;
+	char szStr[STRSIZ];
+	struct mqtthdr *hdr;
+
+	p = mkPkt(sess->sess_buf->msg_base, datlen);
+	hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
+
+	/* write topic to database */
+	call.WritePUB_topic(&cfg, pub, sess->sess_cid, mid, psTopic, AIT_GET_BUF(p), AIT_LEN(p), 
+			sess->sess_user, sess->sess_addr, hdr->mqtt_msg.retain);
+
+	TAILQ_FOREACH(s, &Sessions, sess_node) {
+		SLIST_FOREACH(st, &s->sess_subscr, st_node) {
+			if ((ret = regcomp(&re, st->st_subscr.sub_topic.msg_base, REG_EXTENDED))) {
+				regerror(ret, &re, szStr, sizeof szStr);
+				regfree(&re);
+				ioDEBUG(3, "Error:: regcomp(%s) %s\n", (char*)
+						st->st_subscr.sub_topic.msg_base, szStr);
+			}
+			if (!regexec(&re, psTopic, 1, &match, 0)) {
+				flg = 1;	/* MATCH */
+				schedWrite(root, sendPacket, p, s->sess_sock, NULL, 0);
+			}
+
+			regfree(&re);
+		}
+	}
+
+	/* if subscriber not found then free packet */
+	if (!flg)
+		freePkt(&p);
+
+	call.DeletePUB_topic(&cfg, pub, sess->sess_cid, mid, psTopic, sess->sess_user, sess->sess_addr, -1);
 	return 0;
 }
 
 static int
-pubExactly(struct tagSession *sess, u_short mid, char * __restrict psTopic, 
-		int topicLen, char * __restrict data, int datlen)
+pubExactly(struct tagSession *sess, u_short mid, char * __restrict psTopic, int datlen)
 {
 	return 0;
 }
@@ -31,10 +143,10 @@ cmdPUBLISH(void *srv, int len, void *arg)
 {
 	struct mqtthdr *hdr;
 	struct tagSession *sess = (struct tagSession*) arg;
-	void *data = NULL;
 	char szTopic[STRSIZ] = { 0 };
 	int siz = 0;
 	u_short mid = 0;
+	ait_val_t *p = NULL;
 
 	ioTRACE(2);
 
@@ -42,7 +154,7 @@ cmdPUBLISH(void *srv, int len, void *arg)
 		return -1;
 
 	ioDEBUG(5, "Exec PUBLISH session");
-	siz = mqtt_readPUBLISH(sess->sess_buf, szTopic, sizeof szTopic, &mid, &data);
+	siz = mqtt_readPUBLISH(sess->sess_buf, szTopic, sizeof szTopic, &mid, NULL);
 	if (siz == -1) {
 		ioDEBUG(5, "Error:: in readPUBLISH #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		return 0;
@@ -51,38 +163,34 @@ cmdPUBLISH(void *srv, int len, void *arg)
 	hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
 	switch (hdr->mqtt_msg.qos) {
 		case MQTT_QOS_ACK:
-			pubAck(sess, mid, szTopic, sizeof szTopic, data, siz);
+			if (pubAck(sess, mid, szTopic, mqtt_pktLen(hdr)))
+				return 0;
 			siz = mqtt_msgPUBACK(sess->sess_buf, mid);
 			if (siz == -1) {
 				ioDEBUG(5, "Error:: in msgPUBACK #%d - %s", 
 						mqtt_GetErrno(), mqtt_GetError());
-				goto end;
+				return 0;
 			}
 			break;
 		case MQTT_QOS_EXACTLY:
-			pubExactly(sess, mid, szTopic, sizeof szTopic, data, siz);
+			if (pubExactly(sess, mid, szTopic, mqtt_pktLen(hdr)))
+				return 0;
 			siz = mqtt_msgPUBREC(sess->sess_buf, mid);
 			if (siz == -1) {
 				ioDEBUG(5, "Error:: in msgPUBREC #%d - %s", 
 						mqtt_GetErrno(), mqtt_GetError());
-				goto end;
+				return 0;
 			}
 			break;
 		case MQTT_QOS_ONCE:
-			pubOnce(sess, mid, szTopic, sizeof szTopic, data, siz);
+			pubOnce(sess, szTopic, mqtt_pktLen(hdr));
 		default:
-			goto end;
+			return 0;
 	}
 
-	if ((siz = send(sess->sess_sock, sess->sess_buf->msg_base, siz, MSG_NOSIGNAL)) == -1)
-		ioSYSERR(0);
-	else {
-		ioDEBUG(5, "Sended %d bytes.", siz);
-		memset(sess->sess_buf->msg_base, 0, sess->sess_buf->msg_len);
-	}
-end:
-	if (data)
-		free(data);
+	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;
 }
 
@@ -92,6 +200,7 @@ cmdPUBREL(void *srv, int len, void *arg)
 	struct tagSession *sess = (struct tagSession*) arg;
 	int siz = 0;
 	u_short mid = 0;
+	ait_val_t *p = NULL;
 
 	ioTRACE(2);
 
@@ -111,14 +220,12 @@ cmdPUBREL(void *srv, int len, void *arg)
 	if (siz == -1) {
 		ioDEBUG(5, "Error:: in msgPUBCOMP #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		return 0;
-	}
-	if ((siz = send(sess->sess_sock, sess->sess_buf->msg_base, siz, MSG_NOSIGNAL)) == -1)
-		ioSYSERR(0);
-	else {
-		ioDEBUG(5, "Sended %d bytes.", siz);
+	} else {
+		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;
 }
 
@@ -133,6 +240,7 @@ cmdSUBSCRIBE(void *srv, int len, void *arg)
 	struct tagStore *store;
 	char buf[BUFSIZ];
 	void *ptr;
+	ait_val_t *p = NULL;
 
 	ioTRACE(2);
 
@@ -147,18 +255,18 @@ cmdSUBSCRIBE(void *srv, int len, void *arg)
 	}
 
 	/* add to db */
-	for (i = 0; i < siz; i++) {
+	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());
-			goto end;
+			continue;
 		}
 		if (call.WritePUB_subscribe(&cfg, pub, sess->sess_cid, mid, buf, 
 				sess->sess_user, sess->sess_addr, subs[i].sub_ret) > 0) {
-			store = malloc(sizeof(struct tagStore));
+			store = io_malloc(sizeof(struct tagStore));
 			if (!store) {
 				ioSYSERR(0);
-				goto end;
+				continue;
 			} else {
 				store->st_msgid = mid;
 				mqtt_subCopy(&store->st_subscr, &subs[i]);
@@ -168,29 +276,28 @@ cmdSUBSCRIBE(void *srv, int len, void *arg)
 			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, 0) == -1) {
+			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());
-				goto end;
+
+				subs[i].sub_ret = MQTT_QOS_DENY;
 			} else {
 				ptr = realloc(store->st_subscr.sub_topic.msg_base, strlen(buf) + 1);
-				if (!ptr) {
+				if (!ptr)
 					ioSYSERR(0);
-					goto end;
-				} else {
+				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);
+				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;
-		} else
-			subs[i].sub_ret = MQTT_QOS_DENY;
+				subs[i].sub_ret = MQTT_QOS_PASS;
+			}
+		}
 	}
 
 	/* send acknowledge */
@@ -198,13 +305,12 @@ cmdSUBSCRIBE(void *srv, int len, void *arg)
 	if (siz == -1) {
 		ioDEBUG(5, "Error:: in msgSUBACK #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		goto end;
-	}
-	if ((siz = send(sess->sess_sock, sess->sess_buf->msg_base, siz, MSG_NOSIGNAL)) == -1)
-		ioSYSERR(0);
-	else {
-		ioDEBUG(5, "Sended %d bytes.", siz);
+	} else {
+		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);
 end:
 	mqtt_subFree(&subs);
 	return 0;
@@ -219,6 +325,7 @@ cmdUNSUBSCRIBE(void *srv, int len, void *arg)
 	u_short mid = 0;
 	register int i;
 	struct tagStore *store, *tmp;
+	ait_val_t *p = NULL;
 
 	ioTRACE(2);
 
@@ -245,7 +352,7 @@ cmdUNSUBSCRIBE(void *srv, int len, void *arg)
 					free(store->st_subscr.sub_topic.msg_base);
 				if (store->st_subscr.sub_value.msg_base)
 					free(store->st_subscr.sub_value.msg_base);
-				free(store);
+				io_free(store);
 			}
 		}
 
@@ -258,13 +365,12 @@ cmdUNSUBSCRIBE(void *srv, int len, void *arg)
 	if (siz == -1) {
 		ioDEBUG(5, "Error:: in msgUNSUBACK #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		goto end;
-	}
-	if ((siz = send(sess->sess_sock, sess->sess_buf->msg_base, siz, MSG_NOSIGNAL)) == -1)
-		ioSYSERR(0);
-	else {
-		ioDEBUG(5, "Sended %d bytes.", siz);
+	} else {
+		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);
 end:
 	mqtt_subFree(&subs);
 	return 0;
@@ -275,6 +381,7 @@ cmdPINGREQ(void *srv, int len, void *arg)
 {
 	struct tagSession *sess = (struct tagSession*) arg;
 	int siz = 0;
+	ait_val_t *p = NULL;
 
 	ioTRACE(2);
 
@@ -286,15 +393,12 @@ cmdPINGREQ(void *srv, int len, void *arg)
 	if (siz == -1) {
 		ioDEBUG(5, "Error:: in msgPINGRESP #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		return 0;
-	}
-	if ((siz = send(sess->sess_sock, sess->sess_buf->msg_base, siz, MSG_NOSIGNAL)) == -1) {
-		ioSYSERR(0);
-		return 0;
 	} else {
-		ioDEBUG(5, "Sended %d bytes.", siz);
+		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;
 }
 
@@ -329,7 +433,7 @@ cmdCONNECT(void *srv, int len, void *arg)
 		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)