--- mqtt/src/mqttd_calls.c	2012/04/27 16:41:56	1.2.2.8
+++ 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;
@@ -84,9 +84,7 @@ cmdSUBSCRIBE(void *srv, 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
@@ -111,7 +109,7 @@ end:
 }
 
 int
-cmdUNSUBSCRIBE(void *srv, void *arg)
+cmdUNSUBSCRIBE(void *srv, int len, void *arg)
 {
 	struct tagSession *sess = (struct tagSession*) arg;
 
@@ -124,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;
@@ -152,7 +150,7 @@ cmdPINGREQ(void *srv, void *arg)
 }
 
 int
-cmdCONNECT(void *srv, void *arg)
+cmdCONNECT(void *srv, int len, void *arg)
 {
 	struct tagStore *store;
 	struct tagSession *sess = (struct tagSession*) arg;
@@ -163,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);
 
@@ -181,7 +176,6 @@ cmdCONNECT(void *srv, void *arg)
 
 		free(store);
 	}
-	SESS_ELEM_UNLOCK(sess);
 
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);
@@ -190,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;
 
@@ -204,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 */
 }