--- mqtt/src/daemon.c	2012/01/27 15:05:38	1.2
+++ mqtt/src/daemon.c	2012/04/11 15:08:27	1.2.2.5
@@ -27,9 +27,11 @@ initSession(int sock, ait_val_t * __restrict v)
 	} else
 		memset(sess, 0, sizeof(struct tagSession));
 
+	pthread_mutex_init(&sess->sess_mtx, NULL);
+
 	TAILQ_INIT(&sess->sess_sndqueue);
 
-	str = (const char*) cfg_GetAttribute(&cfg, CFG("mqttd"), CFG("retry"));
+	str = cfg_getAttribute(&cfg, "mqttd", "retry");
 	if (!str)
 		sess->sess_retry = DEFAULT_RETRY;
 	else
@@ -43,6 +45,23 @@ initSession(int sock, ait_val_t * __restrict v)
 		return NULL;
 	}
 
+	sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf);
+	if (!sess->sess_srv) {
+		ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+		mqtt_msgFree(&sess->sess_buf, 42);
+		free(sess);
+		io_freeVar(v);
+		return NULL;
+	} else {
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_CONNECT, cmdCONNECT);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_PUBLISH, cmdPUBLISH);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_PUBREL, cmdPUBREL);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_SUBSCRIBE, cmdSUBSCRIBE);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_UNSUBSCRIBE, cmdUNSUBSCRIBE);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_PINGREQ, cmdPINGREQ);
+		mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_DISCONNECT, cmdDISCONNECT);
+	}
+
 	sess->sess_sock = sock;
 	strlcpy(sess->sess_addr, (char*) AIT_GET_STR(v), sizeof sess->sess_addr);
 	io_freeVar(v);
@@ -62,16 +81,19 @@ finiSession(struct tagSession *sess, int preservSock)
 	if (call.FiniSessPUB)
 		call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
 
+	pthread_mutex_lock(&sess->sess_mtx);
 	while ((store = TAILQ_FIRST(&sess->sess_sndqueue))) {
 		TAILQ_REMOVE(&sess->sess_sndqueue, store, st_node);
 
-		if (store->st_subscr.sub_topic._base)
-			free(store->st_subscr.sub_topic._base);
-		if (store->st_subscr.sub_value._base)
-			free(store->st_subscr.sub_value._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);
 	}
+	pthread_mutex_unlock(&sess->sess_mtx);
+	pthread_mutex_destroy(&sess->sess_mtx);
 
 	if (sess->sess_will.msg)
 		free(sess->sess_will.msg);
@@ -81,6 +103,7 @@ finiSession(struct tagSession *sess, int preservSock)
 	if (sess->sess_sock > STDERR_FILENO && !preservSock)
 		srv_Close(sess->sess_sock);
 
+	mqtt_srv_Fini(&sess->sess_srv);
 	mqtt_msgFree(&sess->sess_buf, 42);
 
 	free(sess);
@@ -165,12 +188,10 @@ KASession(struct tagSession *sess)
 static void *
 thrSession(struct tagSession *sess)
 {
-	mqtt_msg_t msg = { NULL, 0 };
 	int ret, locKill = 42;
 	struct pollfd pfd;
 	struct mqtthdr *hdr;
 	ait_val_t *v;
-	struct tagStore *store;
 
 	pthread_cleanup_push((void(*)(void*)) stopSession, sess);
 	ioTRACE(2);
@@ -198,60 +219,30 @@ thrSession(struct tagSession *sess)
 			hdr = (struct mqtthdr*) sess->sess_buf->msg_base;
 
 		/* dispatch message type */
+		if (mqtt_srv_Dispatch(sess->sess_srv, sess))
+			ioLIBERR(mqtt);
 		switch (hdr->mqtt_msg.type) {
 			case MQTT_TYPE_CONNECT:
 				ioDEBUG(5, "Exec CONNECT session");
-				pthread_mutex_lock(&mtx_sess);
-				TAILQ_REMOVE(&Sessions, sess, sess_node);
-				pthread_mutex_unlock(&mtx_sess);
-
-				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);
-
-					if (store->st_subscr.sub_topic._base)
-						free(store->st_subscr.sub_topic._base);
-					if (store->st_subscr.sub_value._base)
-						free(store->st_subscr.sub_value._base);
-
-					free(store);
-				}
-
-				if (sess->sess_will.msg)
-					free(sess->sess_will.msg);
-				if (sess->sess_will.topic)
-					free(sess->sess_will.topic);
-
 				if ((v = io_allocVar())) {
 					AIT_SET_STR(v, sess->sess_addr);
 					if (!schedEvent(root, startSession, v, (u_long) sess->sess_sock, sess, ret))
 						io_freeVar(v);
 				} else
 					ioLIBERR(mqtt);
-
 				locKill ^= locKill;
-
-				call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
-						sess->sess_addr, sess->sess_user);
 				continue;
 			case MQTT_TYPE_DISCONNECT:
 				ioDEBUG(5, "Exec DISCONNECT session");
-				pthread_mutex_lock(&mtx_sess);
-				TAILQ_REMOVE(&Sessions, sess, sess_node);
-				pthread_mutex_unlock(&mtx_sess);
-
 				finiSession(sess, 0);
 				locKill ^= locKill;
-
-				call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
-						sess->sess_addr, sess->sess_user);
 				continue;
 			case MQTT_TYPE_PUBLISH:
 				ioDEBUG(5, "Exec PUBLISH topic QoS=%d", hdr->mqtt_msg.qos);
-				if (Publish(sess))
+				/*
+				if (cmdPUBLISH(sess))
 					locKill ^= locKill;
+					*/
 				break;
 			case MQTT_TYPE_PUBREL:
 				break;
@@ -260,6 +251,7 @@ thrSession(struct tagSession *sess)
 			case MQTT_TYPE_UNSUBSCRIBE:
 				break;
 			case MQTT_TYPE_PINGREQ:
+				ioDEBUG(5, "Exec PINGREQ session");
 				break;
 			default:
 				ioDEBUG(5, "Error:: Session %s, wrong command %d - DISCARDED",