--- mqtt/src/mqttd_calls.c	2012/05/05 13:39:27	1.2.2.9
+++ mqtt/src/mqttd_calls.c	2012/06/01 10:39:48	1.2.2.19
@@ -4,47 +4,182 @@
 #include "mqttd_calls.h"
 
 
+static inline struct tagPkt *
+mkPkt(void * __restrict data, int dlen)
+{
+	struct tagPkt *p = NULL;
+
+	p = io_malloc(sizeof(struct tagPkt));
+	if (!p) {
+		ioDEBUG(7, "Error:: in send packet prepare #%d - %s", io_GetErrno(), io_GetError());
+		return NULL;
+	} else
+		memset(p, 0, sizeof(struct tagPkt));
+
+	p->pkt_data = io_allocVar();
+	if (!p->pkt_data) {
+		ioDEBUG(7, "Error:: in send packet prepare #%d - %s", io_GetErrno(), io_GetError());
+		io_free(p);
+		return NULL;
+	}
+
+	if (data && dlen > 0)
+		AIT_SET_BUF(p->pkt_data, data, dlen);
+
+	return p;
+}
+
+static inline void
+freePkt(struct tagPkt ** __restrict p)
+{
+	if (!p || !*p)
+		return;
+
+	io_freeVar(&(*p)->pkt_data);
+	io_free(*p);
+	*p = NULL;
+}
+
+static void *
+sendPacket(sched_task_t *task)
+{
+	struct tagPkt *p = TASK_ARG(task);
+	register int n, slen;
+	u_char *pos;
+
+	if (!p || !p->pkt_data || AIT_ISEMPTY(p->pkt_data)) {
+		ioDEBUG(9, "Error:: invalid packet or found empty content ...");
+		return NULL;
+	}
+
+	for (slen = AIT_LEN(p->pkt_data), pos = AIT_GET_BUF(p->pkt_data); slen > 0; 
+			slen -= n, pos += n) {
+		n = send(TASK_FD(task), pos, slen, MSG_NOSIGNAL);
+		if (n == -1) {
+			ioSYSERR(0);
+			break;
+		}
+	}
+
+	return NULL;
+}
+
+
+static int
+pubOnce(struct tagSession *sess, u_short mid, char * __restrict psTopic, 
+		int topicLen, char * __restrict data, int datlen)
+{
+	return 0;
+}
+
+static int
+pubAck(struct tagSession *sess, u_short mid, char * __restrict psTopic, 
+		int topicLen, char * __restrict data, int datlen)
+{
+	return 0;
+}
+
+static int
+pubExactly(struct tagSession *sess, u_short mid, char * __restrict psTopic, 
+		int topicLen, char * __restrict data, int datlen)
+{
+	return 0;
+}
+
+
 int
 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;
 
 	ioTRACE(2);
 
 	if (!sess)
 		return -1;
 
+	ioDEBUG(5, "Exec PUBLISH session");
+	siz = mqtt_readPUBLISH(sess->sess_buf, szTopic, sizeof szTopic, &mid, &data);
+	if (siz == -1) {
+		ioDEBUG(5, "Error:: in readPUBLISH #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+		return 0;
+	}
+
 	hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
 	switch (hdr->mqtt_msg.qos) {
-		case MQTT_QOS_ONCE:
-			break;
 		case MQTT_QOS_ACK:
+			pubAck(sess, mid, szTopic, sizeof szTopic, data, siz);
+			siz = mqtt_msgPUBACK(sess->sess_buf, mid);
+			if (siz == -1) {
+				ioDEBUG(5, "Error:: in msgPUBACK #%d - %s", 
+						mqtt_GetErrno(), mqtt_GetError());
+				goto end;
+			}
 			break;
 		case MQTT_QOS_EXACTLY:
+			pubExactly(sess, mid, szTopic, sizeof szTopic, data, siz);
+			siz = mqtt_msgPUBREC(sess->sess_buf, mid);
+			if (siz == -1) {
+				ioDEBUG(5, "Error:: in msgPUBREC #%d - %s", 
+						mqtt_GetErrno(), mqtt_GetError());
+				goto end;
+			}
 			break;
+		case MQTT_QOS_ONCE:
+			pubOnce(sess, mid, szTopic, sizeof szTopic, data, siz);
 		default:
-			ioDEBUG(1, "Error:: Unknown QoS %d - rejected publishing request", 
-					hdr->mqtt_msg.qos);
-			return 0;
+			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);
+		memset(sess->sess_buf->msg_base, 0, sess->sess_buf->msg_len);
+	}
+end:
+	if (data)
+		free(data);
 	return 0;
 }
 
 int
 cmdPUBREL(void *srv, int len, void *arg)
 {
-	struct mqtthdr *hdr;
 	struct tagSession *sess = (struct tagSession*) arg;
+	int siz = 0;
+	u_short mid = 0;
 
 	ioTRACE(2);
 
 	if (!sess)
 		return -1;
 
-	hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
+	ioDEBUG(5, "Exec PUBREL session");
+	mid = mqtt_readPUBREL(sess->sess_buf);
+	if (mid == (u_short) -1) {
+		ioDEBUG(5, "Error:: in readPUBREL #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+		return 0;
+	}
 
+	// TODO:: Delete from database topic
+
+	siz = mqtt_msgPUBCOMP(sess->sess_buf, mid);
+	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);
+		memset(sess->sess_buf->msg_base, 0, sess->sess_buf->msg_len);
+	}
+
 	return 0;
 }
 
@@ -57,6 +192,8 @@ cmdSUBSCRIBE(void *srv, int len, void *arg)
 	u_short mid = 0;
 	register int i;
 	struct tagStore *store;
+	char buf[BUFSIZ];
+	void *ptr;
 
 	ioTRACE(2);
 
@@ -72,9 +209,14 @@ cmdSUBSCRIBE(void *srv, int len, void *arg)
 
 	/* add to db */
 	for (i = 0; i < siz; i++) {
-		if (call.WritePUB_subscribe(&cfg, pub, mid, subs[i].sub_topic.msg_base, 
+		/* 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;
+		}
+		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;
@@ -84,10 +226,29 @@ cmdSUBSCRIBE(void *srv, int len, void *arg)
 			}
 
 			/* add to cache */
-			SESS_ELEM_LOCK(sess);
 			SLIST_INSERT_HEAD(&sess->sess_subscr, store, st_node);
-			SESS_ELEM_UNLOCK(sess);
 
+			/* convert topic to regexp */
+			if (mqtt_expandTopic(subs[i].sub_topic.msg_base, buf, sizeof buf, 1, 0) == -1) {
+				ioDEBUG(5, "Error:: in regexp #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+				goto end;
+			} else {
+				ptr = realloc(store->st_subscr.sub_topic.msg_base, strlen(buf) + 1);
+				if (!ptr) {
+					ioSYSERR(0);
+					goto end;
+				} 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;
 		} else
 			subs[i].sub_ret = MQTT_QOS_DENY;
@@ -99,7 +260,7 @@ cmdSUBSCRIBE(void *srv, int len, void *arg)
 		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, 0)) == -1)
+	if ((siz = send(sess->sess_sock, sess->sess_buf->msg_base, siz, MSG_NOSIGNAL)) == -1)
 		ioSYSERR(0);
 	else {
 		ioDEBUG(5, "Sended %d bytes.", siz);
@@ -114,12 +275,59 @@ int
 cmdUNSUBSCRIBE(void *srv, int len, void *arg)
 {
 	struct tagSession *sess = (struct tagSession*) arg;
+	mqtt_subscr_t *subs = NULL;
+	int siz = 0;
+	u_short mid = 0;
+	register int i;
+	struct tagStore *store, *tmp;
 
 	ioTRACE(2);
 
 	if (!sess)
 		return -1;
 
+	ioDEBUG(5, "Exec UNSUBSCRIBE session");
+	siz = mqtt_readUNSUBSCRIBE(sess->sess_buf, &mid, &subs);
+	if (siz == -1) {
+		ioDEBUG(5, "Error:: in readUNSUBSCRIBE #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+		return 0;
+	}
+
+	/* del from db */
+	for (i = 0; i < siz; i++) {
+		SLIST_FOREACH_SAFE(store, &sess->sess_subscr, st_node, tmp) {
+			if (store->st_subscr.sub_ret == subs[i].sub_ret && 
+					store->st_subscr.sub_topic.msg_base && 
+					!strcmp(store->st_subscr.sub_topic.msg_base, 
+						subs[i].sub_topic.msg_base)) {
+				SLIST_REMOVE(&sess->sess_subscr, store, tagStore, st_node);
+
+				if (store->st_subscr.sub_topic.msg_base)
+					free(store->st_subscr.sub_topic.msg_base);
+				if (store->st_subscr.sub_value.msg_base)
+					free(store->st_subscr.sub_value.msg_base);
+				io_free(store);
+			}
+		}
+
+		call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, subs[i].sub_topic.msg_base, 
+				sess->sess_user, "%");
+	}
+
+	/* send acknowledge */
+	siz = mqtt_msgUNSUBACK(sess->sess_buf, mid);
+	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);
+		memset(sess->sess_buf->msg_base, 0, sess->sess_buf->msg_len);
+	}
+end:
+	mqtt_subFree(&subs);
 	return 0;
 }
 
@@ -128,6 +336,7 @@ cmdPINGREQ(void *srv, int len, void *arg)
 {
 	struct tagSession *sess = (struct tagSession*) arg;
 	int siz = 0;
+	struct tagPkt *p = NULL;
 
 	ioTRACE(2);
 
@@ -139,15 +348,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, 0)) == -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;
 }
 
@@ -155,6 +361,7 @@ int
 cmdCONNECT(void *srv, int len, void *arg)
 {
 	struct tagStore *store;
+	struct tagPkt *p;
 	struct tagSession *sess = (struct tagSession*) arg;
 
 	ioTRACE(2);
@@ -163,14 +370,17 @@ cmdCONNECT(void *srv, int len, void *arg)
 		return -1;
 
 	ioDEBUG(5, "Exec CONNECT session");
-	SESS_LOCK;
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
-	SESS_UNLOCK;
 
-	if (call.FiniSessPUB)
-		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
+	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);
+	}
 
-	SESS_ELEM_LOCK(sess);
 	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
 		SLIST_REMOVE_HEAD(&sess->sess_subscr, st_node);
 
@@ -179,10 +389,16 @@ 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);
 	}
-	SESS_ELEM_UNLOCK(sess);
 
+	while ((p = SLIST_FIRST(&sess->sess_sndpkt))) {
+		SLIST_REMOVE_HEAD(&sess->sess_sndpkt, pkt_node);
+
+		io_freeVar(&p->pkt_data);
+		io_free(p);
+	}
+
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);
 	if (sess->sess_will.topic)
@@ -191,8 +407,7 @@ cmdCONNECT(void *srv, int len, void *arg)
 	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user);
 
-//	schedEvent(root, startSession, NULL, (u_long) sess->sess_sock, sess, ret);
-	return 0;
+	return -3;	/* reconnect client */
 }
 
 int
@@ -206,13 +421,9 @@ cmdDISCONNECT(void *srv, int len, void *arg)
 		return -1;
 
 	ioDEBUG(5, "Exec DISCONNECT session");
-	SESS_LOCK;
-	TAILQ_REMOVE(&Sessions, sess, sess_node);
-	SESS_UNLOCK;
 
 	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user);
 
-	finiSession(sess);
-	return 0;
+	return -2;	/* must terminate dispatcher */
 }