--- mqtt/src/daemon.c	2011/12/09 11:46:48	1.1.2.13
+++ mqtt/src/daemon.c	2011/12/09 13:43:55	1.1.2.14
@@ -5,6 +5,75 @@
 extern char cliCmd[], *cliStr[];
 
 
+static inline struct tagSession *
+initSession(int sock, char * __restrict addr)
+{
+	struct tagSession *sess = NULL;
+	const char *str;
+
+	if (!addr)
+		return NULL;
+
+	sess = malloc(sizeof(struct tagSession));
+	if (!sess) {
+		VERB(3) syslog(LOG_ERR, "Error:: in malloc #%d - %s", errno, strerror(errno));
+		free(addr);
+		return NULL;
+	} else
+		memset(sess, 0, sizeof(struct tagSession));
+
+	str = cfg_GetAttribute(&cfg, CFG("mqttd"), CFG("retry"));
+	if (!str)
+		sess->sess_retry = DEFAULT_RETRY;
+	else
+		sess->sess_retry = strtol(str, NULL, 0);
+
+	sess->sess_sock = sock;
+	strlcpy(sess->sess_addr, addr, sizeof sess->sess_addr);
+	free(addr);
+
+	sess->sess_buf = mqtt_msgAlloc(0);
+	if (!sess->sess_buf) {
+		VERB(3) syslog(LOG_ERR, "Error:: in msgAlloc #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+		free(sess);
+		return NULL;
+	}
+
+	return sess;
+}
+
+static void
+finiSession(struct tagSession *sess)
+{
+	register int i;
+	struct tagStore *store;
+
+	if (!sess)
+		return;
+
+	for (i = 0; i < MQTT_QOS_RESERVED; i++)
+		while ((store = SLIST_FIRST(&sess->sess_store[i]))) {
+			SLIST_REMOVE_HEAD(&sess->sess_store[i], st_node);
+			free(store);
+		}
+
+	if (sess->sess_will.msg)
+		free(sess->sess_will.msg);
+	if (sess->sess_will.topic)
+		free(sess->sess_will.topic);
+
+	if (sess->sess_sock > STDERR_FILENO) {
+		shutdown(sess->sess_sock, SHUT_RDWR);
+		close(sess->sess_sock);
+	}
+
+	mqtt_msgFree(&sess->sess_buf, 42);
+
+	if (sess->sess_tid)
+		pthread_cancel(sess->sess_tid);
+	free(sess);
+}
+
 static void *
 startSession(sched_task_t *task)
 {
@@ -15,28 +84,30 @@ startSession(sched_task_t *task)
 	mqtthdr_connack_t cack;
 	int ret = 0;
 	struct timeval tv = { 0 };
-	u_short ka;
 	struct tagSession *sess = NULL;
 
 	FTRACE(4);
 
-	sess = malloc(sizeof(struct tagSession));
-	if (!sess) {
-		VERB(3) syslog(LOG_ERR, "Error:: in malloc #%d - %s", errno, strerror(errno));
-		goto end;
-	}
+	sess = initSession(TASK_FD(task), TASK_ARG(task));
+	if (!sess)
+		return NULL;
 
-	if (recv(TASK_FD(task), buf.msg_base, buf.msg_len, 0) == -1) {
-		VERB(3) syslog(LOG_ERR, "Error:: recv(%d) #%d - %s", (int) TASK_FD(task), 
-				errno, strerror(errno));
+	if (recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0) == -1) {
+		VERB(3) syslog(LOG_ERR, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno));
 		goto end;
 	}
-	cack = mqtt_readCONNECT(&buf, &ka, sess->sess_cid, sizeof sess->sess_cid, 
+	cack = mqtt_readCONNECT(&buf, &sess->sess_ka, sess->sess_cid, sizeof sess->sess_cid, 
 			sess->sess_user, sizeof sess->sess_user, sess->sess_pass, sizeof sess->sess_pass, 
 			&sess->sess_will.topic, &sess->sess_will.msg);
-	if (cack.reserved) {
+	flg.flags = cack.reserved;
+	if (flg.reserved) {
 		VERB(3) syslog(LOG_ERR, "Error:: in MQTT protocol #%d - %s", mqtt_GetErrno(), mqtt_GetError());
 		goto end;
+	} else {
+		sess->sess_clean = flg.clean_sess;
+		sess->sess_will.qos = flg.will_qos;
+		sess->sess_will.retain = flg.will_retain;
+		sess->sess_will.flag = flg.will_flg;
 	}
 
 	/* check online table for user */