--- mqtt/src/mqttd_calls.c	2012/04/27 16:41:56	1.2.2.8
+++ mqtt/src/mqttd_calls.c	2012/05/05 13:39:27	1.2.2.9
@@ -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;
@@ -111,7 +111,7 @@ end:
 }
 
 int
-cmdUNSUBSCRIBE(void *srv, void *arg)
+cmdUNSUBSCRIBE(void *srv, int len, void *arg)
 {
 	struct tagSession *sess = (struct tagSession*) arg;
 
@@ -124,7 +124,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 +152,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;
@@ -190,11 +190,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;
 
@@ -210,5 +212,7 @@ cmdDISCONNECT(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);
+
+	finiSession(sess);
 	return 0;
 }