--- mqtt/src/daemon.c	2011/12/05 10:37:17	1.1.2.8
+++ mqtt/src/daemon.c	2011/12/08 14:52:47	1.1.2.10
@@ -8,10 +8,12 @@ static void *
 startSession(sched_task_t *task)
 {
 	static u_char basebuf[USHRT_MAX];
-	mqtt_msg_t *buf;
 	mqtt_cb_t cbs[MQTT_TYPE_MAX + 1] = { 0 };
-	struct mqtthdr *hdr;
-	int len, ret = 0;
+	mqtt_msg_t *buf = { basebuf, sizeof basebuf };
+	mqtthdr_connflgs_t flg;
+	int ret = 0;
+	struct timeval tv = { 0 };
+	u_short ka;
 
 	FTRACE(4);
 
@@ -28,14 +30,14 @@ startSession(sched_task_t *task)
 		VERB(3) syslog(LOG_ERR, "Error:: recv(%d) #%d - %s", (int) TASK_FD(task), 
 				errno, strerror(errno));
 		goto end;
-	} else
-		hdr = (struct mqtthdr*) basebuf;
-	if (hdr->mqtt_msg.type != MQTT_TYPE_CONNECT) {
-		VERB(2) syslog(LOG_ERR, "Error:: wrong command type for 1st command #%d", 
-				hdr->mqtt_msg.type);
+	}
+
+	flg = mqtt_readCONNECT(buf, &ka, );
+	if (flg.reserved) {
+		VERB(3) syslog(LOG_ERR, "Error:: in MQTT protocol #%d - %s", 
+				mqtt_GetErrno(), mqtt_GetError());
 		goto end;
-	} else
-		len = mqtt_decodeLen(hdr->mqtt_len, &ret);
+	}
 
 		/*
 		for (ret = i = 0; cliCmd[i] && !(ret = (hdr->mqtt_msg.type == cliCmd[i])); i++);
@@ -49,9 +51,10 @@ startSession(sched_task_t *task)
 	/* check online table for user */
 //	ChkSessPUB(&cfg, );
 
-	ret = mqttDispatcher(cbs, buf);
-	mqtt_msgFree(&buf, 42);
+//	ret = mqttDispatcher(cbs, buf);
+//	mqtt_msgFree(&buf, 42);
 
+	/*
 	switch (ret) {
 		case -1:
 			syslog(LOG_ERR, "Error:: in MQTT protocol #%d - %s", mqtt_GetErrno(), mqtt_GetError());
@@ -59,6 +62,7 @@ startSession(sched_task_t *task)
 		default:
 			return NULL;
 	}
+	*/
 end:	/* close client connection */
 	close(TASK_FD(task));
 	VERB(1) syslog(LOG_DEBUG, "Close client %s with socket=%d",