--- mqtt/src/daemon.c	2012/04/26 07:25:00	1.2.2.16
+++ mqtt/src/daemon.c	2012/05/03 13:39:34	1.2.2.20
@@ -23,7 +23,6 @@ initSession(int sock, ait_val_t * __restrict v)
 	sess = malloc(sizeof(struct tagSession));
 	if (!sess) {
 		ioSYSERR(0);
-		io_freeVar(v);
 		return NULL;
 	} else
 		memset(sess, 0, sizeof(struct tagSession));
@@ -42,7 +41,6 @@ initSession(int sock, ait_val_t * __restrict v)
 	if (!sess->sess_buf) {
 		ioLIBERR(mqtt);
 		free(sess);
-		io_freeVar(v);
 		return NULL;
 	}
 
@@ -52,7 +50,6 @@ initSession(int sock, ait_val_t * __restrict v)
 		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);
@@ -66,7 +63,6 @@ initSession(int sock, ait_val_t * __restrict v)
 
 	sess->sess_sock = sock;
 	strlcpy(sess->sess_addr, (char*) AIT_GET_STR(v), sizeof sess->sess_addr);
-	io_freeVar(v);
 	return sess;
 }
 
@@ -84,7 +80,6 @@ finiSession(struct tagSession *sess)
 		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);
 
@@ -131,10 +126,10 @@ stopSession(struct tagSession *sess)
 	free(msg.msg_base);
 
 	ioDEBUG(1, "Close socket=%d", sess->sess_sock);
-	finiSession(sess);
-
 	call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, 
 			sess->sess_addr, sess->sess_user);
+
+	finiSession(sess);
 }
 
 static void *
@@ -143,7 +138,6 @@ thrSession(struct tagSession *sess)
 	int ret, locKill = 42;
 	struct pollfd pfd;
 	struct mqtthdr *hdr;
-	ait_val_t *v;
 
 	pthread_cleanup_push((void(*)(void*)) stopSession, sess);
 	ioTRACE(2);
@@ -175,31 +169,16 @@ thrSession(struct tagSession *sess)
 			ioLIBERR(mqtt);
 		switch (hdr->mqtt_msg.type) {
 			case MQTT_TYPE_CONNECT:
-				ioDEBUG(5, "Exec CONNECT session");
-				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);
-
-				SESS_LOCK;
-				TAILQ_REMOVE(&Sessions, sess, sess_node);
-				SESS_UNLOCK;
-
+				schedEvent(root, startSession, NULL, (u_long) sess->sess_sock, sess, ret);
 				locKill ^= locKill;
 				break;
 			case MQTT_TYPE_DISCONNECT:
-				/*
-				ioDEBUG(5, "Exec DISCONNECT session");
-				SESS_LOCK;
-				TAILQ_REMOVE(&Sessions, sess, sess_node);
-				SESS_UNLOCK;
-				*/
-
 				finiSession(sess);
 				locKill ^= locKill;
 				continue;
+			case MQTT_TYPE_SUBSCRIBE:
+			case MQTT_TYPE_PINGREQ:
+				break;
 			case MQTT_TYPE_PUBLISH:
 				ioDEBUG(5, "Exec PUBLISH topic QoS=%d", hdr->mqtt_msg.qos);
 				/*
@@ -209,16 +188,8 @@ thrSession(struct tagSession *sess)
 				break;
 			case MQTT_TYPE_PUBREL:
 				break;
-			case MQTT_TYPE_SUBSCRIBE:
-				break;
 			case MQTT_TYPE_UNSUBSCRIBE:
 				break;
-			case MQTT_TYPE_PINGREQ:
-				ioDEBUG(5, "Exec PINGREQ session");
-				break;
-			case MQTT_TYPE_PINGRESP:
-				ioDEBUG(5, "Exec PINGRESP session");
-				break;
 			default:
 				ioDEBUG(5, "Error:: Session %s, wrong command %d - DISCARDED", 
 						sess->sess_cid, hdr->mqtt_msg.type);
@@ -248,8 +219,8 @@ startSession(sched_task_t *task)
 	if (!TASK_DATA(task)) {
 		/* flow from accept new clients */
 		sess = initSession(TASK_FD(task), TASK_ARG(task));
+		io_freeVar(TASK_ARG(task));
 		if (!sess) {
-			io_freeVar(TASK_ARG(task));
 			close(TASK_FD(task));
 			return NULL;
 		}
@@ -375,6 +346,7 @@ acceptClient(sched_task_t *task)
 	} else {
 		memset(str, 0, sizeof str);
 		snprintf(str, sizeof str, "%s:%hu", io_n2addr(&sa, v), io_n2port(&sa));
+		AIT_FREE_VAL(v);
 		AIT_SET_STR(v, str);
 	}
 	ioDEBUG(1, "Connected client with socket=%d from %s", cli, AIT_GET_STR(v));