--- mqtt/src/mqttd_calls.c	2012/04/27 10:07:51	1.2.2.7
+++ mqtt/src/mqttd_calls.c	2012/05/05 14:51:02	1.2.2.10
@@ -5,7 +5,7 @@
 
 
 int
-cmdPUBLISH(void *srv, void *arg)
+cmdPUBLISH(void *srv, int len, void *arg)
 {
 	struct mqtthdr *hdr;
 	struct tagSession *sess = (struct tagSession*) arg;
@@ -33,7 +33,7 @@ cmdPUBLISH(void *srv, void *arg)
 }
 
 int
-cmdPUBREL(void *srv, void *arg)
+cmdPUBREL(void *srv, int len, void *arg)
 {
 	struct mqtthdr *hdr;
 	struct tagSession *sess = (struct tagSession*) arg;
@@ -49,7 +49,7 @@ cmdPUBREL(void *srv, void *arg)
 }
 
 int
-cmdSUBSCRIBE(void *srv, void *arg)
+cmdSUBSCRIBE(void *srv, int len, void *arg)
 {
 	struct tagSession *sess = (struct tagSession*) arg;
 	mqtt_subscr_t *subs = NULL;
@@ -72,21 +72,19 @@ cmdSUBSCRIBE(void *srv, void *arg)
 
 	/* add to db */
 	for (i = 0; i < siz; i++) {
-		if ((siz = call.WritePUB_subscribe(&cfg, pub, mid, subs[i].sub_topic.msg_base, 
-				sess->sess_user, sess->sess_addr, subs[i].sub_ret)) > 0) {
+		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;
-				store->st_subscr = subs[i];
+				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
@@ -101,15 +99,17 @@ cmdSUBSCRIBE(void *srv, void *arg)
 	}
 	if ((siz = send(sess->sess_sock, sess->sess_buf->msg_base, siz, 0)) == -1)
 		ioSYSERR(0);
-	else
+	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)
+cmdUNSUBSCRIBE(void *srv, int len, void *arg)
 {
 	struct tagSession *sess = (struct tagSession*) arg;
 
@@ -122,7 +122,7 @@ cmdUNSUBSCRIBE(void *srv, void *arg)
 }
 
 int
-cmdPINGREQ(void *srv, void *arg)
+cmdPINGREQ(void *srv, int len, void *arg)
 {
 	struct tagSession *sess = (struct tagSession*) arg;
 	int siz = 0;
@@ -141,14 +141,16 @@ 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;
 }
 
 int
-cmdCONNECT(void *srv, void *arg)
+cmdCONNECT(void *srv, int len, void *arg)
 {
 	struct tagStore *store;
 	struct tagSession *sess = (struct tagSession*) arg;
@@ -159,14 +161,11 @@ cmdCONNECT(void *srv, 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, "%");
 
-	SESS_ELEM_LOCK(sess);
 	while ((store = SLIST_FIRST(&sess->sess_subscr))) {
 		SLIST_REMOVE_HEAD(&sess->sess_subscr, st_node);
 
@@ -177,7 +176,6 @@ cmdCONNECT(void *srv, void *arg)
 
 		free(store);
 	}
-	SESS_ELEM_UNLOCK(sess);
 
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);
@@ -186,11 +184,13 @@ cmdCONNECT(void *srv, 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;
 }
 
 int
-cmdDISCONNECT(void *srv, void *arg)
+cmdDISCONNECT(void *srv, int len, void *arg)
 {
 	struct tagSession *sess = (struct tagSession*) arg;
 
@@ -200,11 +200,11 @@ cmdDISCONNECT(void *srv, 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);
-	return 0;
+
+	return -2;	/* must terminate dispatcher */
 }