--- mqtt/src/mqttd_calls.c	2012/05/05 13:39:27	1.2.2.9
+++ mqtt/src/mqttd_calls.c	2012/05/08 14:36:10	1.2.2.16
@@ -72,7 +72,7 @@ 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, 
+		if (call.WritePUB_subscribe(&cfg, pub, sess->sess_cid, 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) {
@@ -84,9 +84,7 @@ 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);
 
 			subs[i].sub_ret = MQTT_QOS_PASS;
 		} else
@@ -99,7 +97,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 +112,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);
+				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;
 }
 
@@ -140,7 +185,7 @@ cmdPINGREQ(void *srv, int len, void *arg)
 		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) {
+	if ((siz = send(sess->sess_sock, sess->sess_buf->msg_base, siz, MSG_NOSIGNAL)) == -1) {
 		ioSYSERR(0);
 		return 0;
 	} else {
@@ -163,14 +208,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);
 
@@ -181,7 +229,6 @@ cmdCONNECT(void *srv, int len, void *arg)
 
 		free(store);
 	}
-	SESS_ELEM_UNLOCK(sess);
 
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);
@@ -191,8 +238,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 +252,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 */
 }