--- mqtt/src/mqttd_calls.c	2012/01/30 08:29:55	1.2.2.1
+++ mqtt/src/mqttd_calls.c	2012/04/11 16:37:17	1.2.2.3
@@ -85,6 +85,7 @@ cmdPINGREQ(void *srv, void *arg)
 {
 	struct mqtthdr *hdr;
 	struct tagSession *sess = (struct tagSession*) arg;
+	int siz = 0;
 
 	ioTRACE(2);
 
@@ -92,6 +93,16 @@ cmdPINGREQ(void *srv, void *arg)
 		return -1;
 
 	hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
+	siz = mqtt_msgPINGRESP(sess->sess_buf);
+	if (siz == -1) {
+		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) {
+		ioSYSERR(0);
+		return 0;
+	} else
+		ioDEBUG(5, "Sended %d bytes.", siz);
 
 	return 0;
 }
@@ -101,29 +112,33 @@ cmdCONNECT(void *srv, void *arg)
 {
 	struct tagStore *store;
 	struct tagSession *sess = (struct tagSession*) arg;
+	register int i;
 
 	ioTRACE(2);
 
 	if (!sess)
 		return -1;
 
-	pthread_mutex_lock(&mtx_sess);
+	SESS_LOCK;
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
-	pthread_mutex_unlock(&mtx_sess);
+	SESS_UNLOCK;
 
 	if (call.FiniSessPUB)
 		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 
-	while ((store = TAILQ_FIRST(&sess->sess_sndqueue))) {
-		TAILQ_REMOVE(&sess->sess_sndqueue, store, st_node);
+	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);
 
-		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)
 		free(sess->sess_will.msg);
@@ -145,9 +160,9 @@ cmdDISCONNECT(void *srv, void *arg)
 	if (!sess)
 		return -1;
 
-	pthread_mutex_lock(&mtx_sess);
+	SESS_LOCK;
 	TAILQ_REMOVE(&Sessions, sess, sess_node);
-	pthread_mutex_unlock(&mtx_sess);
+	SESS_UNLOCK;
 
 	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user);