--- mqtt/src/daemon.c	2012/01/25 10:34:14	1.1.2.32
+++ mqtt/src/daemon.c	2012/01/27 16:19:04	1.2.2.2
@@ -43,6 +43,15 @@ 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;
+	}
+
 	sess->sess_sock = sock;
 	strlcpy(sess->sess_addr, (char*) AIT_GET_STR(v), sizeof sess->sess_addr);
 	io_freeVar(v);
@@ -65,10 +74,10 @@ finiSession(struct tagSession *sess, int preservSock)
 	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);
 	}
@@ -81,6 +90,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,7 +175,6 @@ 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;
@@ -211,10 +220,10 @@ thrSession(struct tagSession *sess)
 				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);
 				}