--- mqtt/src/mqttd_calls.c	2012/04/11 16:37:17	1.2.2.3
+++ mqtt/src/mqttd_calls.c	2012/04/27 16:41:56	1.2.2.8
@@ -51,23 +51,68 @@ cmdPUBREL(void *srv, void *arg)
 int
 cmdSUBSCRIBE(void *srv, void *arg)
 {
-	struct mqtthdr *hdr;
 	struct tagSession *sess = (struct tagSession*) arg;
+	mqtt_subscr_t *subs = NULL;
+	int siz = 0;
+	u_short mid = 0;
+	register int i;
+	struct tagStore *store;
 
 	ioTRACE(2);
 
 	if (!sess)
 		return -1;
 
-	hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
+	ioDEBUG(5, "Exec SUBSCRIBE session");
+	siz = mqtt_readSUBSCRIBE(sess->sess_buf, &mid, &subs);
+	if (siz == -1) {
+		ioDEBUG(5, "Error:: in readSUBSCRIBE #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+		return 0;
+	}
 
+	/* add to db */
+	for (i = 0; i < siz; i++) {
+		if (call.WritePUB_subscribe(&cfg, pub, mid, subs[i].sub_topic.msg_base, 
+				sess->sess_user, sess->sess_addr, subs[i].sub_ret) > 0) {
+			store = malloc(sizeof(struct tagStore));
+			if (!store) {
+				ioSYSERR(0);
+				goto end;
+			} else {
+				store->st_msgid = mid;
+				mqtt_subCopy(&store->st_subscr, &subs[i]);
+			}
+
+			/* add to cache */
+			SESS_ELEM_LOCK(sess);
+			SLIST_INSERT_HEAD(&sess->sess_subscr, store, st_node);
+			SESS_ELEM_UNLOCK(sess);
+
+			subs[i].sub_ret = MQTT_QOS_PASS;
+		} else
+			subs[i].sub_ret = MQTT_QOS_DENY;
+	}
+
+	/* send acknowledge */
+	siz = mqtt_msgSUBACK(sess->sess_buf, subs, mid);
+	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, 0)) == -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;
 }
 
 int
 cmdUNSUBSCRIBE(void *srv, void *arg)
 {
-	struct mqtthdr *hdr;
 	struct tagSession *sess = (struct tagSession*) arg;
 
 	ioTRACE(2);
@@ -75,15 +120,12 @@ cmdUNSUBSCRIBE(void *srv, void *arg)
 	if (!sess)
 		return -1;
 
-	hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
-
 	return 0;
 }
 
 int
 cmdPINGREQ(void *srv, void *arg)
 {
-	struct mqtthdr *hdr;
 	struct tagSession *sess = (struct tagSession*) arg;
 	int siz = 0;
 
@@ -92,7 +134,7 @@ cmdPINGREQ(void *srv, void *arg)
 	if (!sess)
 		return -1;
 
-	hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
+	ioDEBUG(5, "Exec PINGREQ session");
 	siz = mqtt_msgPINGRESP(sess->sess_buf);
 	if (siz == -1) {
 		ioDEBUG(5, "Error:: in msgPINGRESP #%d - %s", mqtt_GetErrno(), mqtt_GetError());
@@ -101,8 +143,10 @@ cmdPINGREQ(void *srv, void *arg)
 	if ((siz = send(sess->sess_sock, sess->sess_buf->msg_base, siz, 0)) == -1) {
 		ioSYSERR(0);
 		return 0;
-	} else
+	} else {
 		ioDEBUG(5, "Sended %d bytes.", siz);
+		memset(sess->sess_buf->msg_base, 0, sess->sess_buf->msg_len);
+	}
 
 	return 0;
 }
@@ -112,13 +156,13 @@ cmdCONNECT(void *srv, void *arg)
 {
 	struct tagStore *store;
 	struct tagSession *sess = (struct tagSession*) arg;
-	register int i;
 
 	ioTRACE(2);
 
 	if (!sess)
 		return -1;
 
+	ioDEBUG(5, "Exec CONNECT session");
 	SESS_LOCK;
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
 	SESS_UNLOCK;
@@ -127,17 +171,16 @@ cmdCONNECT(void *srv, void *arg)
 		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 
 	SESS_ELEM_LOCK(sess);
-	for (i = 0; i < MQTT_QOS_RESERVED; i++)
-		while ((store = SLIST_FIRST(&sess->sess_txque[i]))) {
-			SLIST_REMOVE_HEAD(&sess->sess_txque[i], st_node);
+	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
+		SLIST_REMOVE_HEAD(&sess->sess_subscr, 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);
+		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);
 
-			free(store);
-		}
+		free(store);
+	}
 	SESS_ELEM_UNLOCK(sess);
 
 	if (sess->sess_will.msg)
@@ -160,6 +203,7 @@ cmdDISCONNECT(void *srv, void *arg)
 	if (!sess)
 		return -1;
 
+	ioDEBUG(5, "Exec DISCONNECT session");
 	SESS_LOCK;
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
 	SESS_UNLOCK;