--- mqtt/src/daemon.c	2011/12/01 14:41:11	1.1.2.6
+++ mqtt/src/daemon.c	2011/12/05 10:37:17	1.1.2.8
@@ -1,31 +1,55 @@
 #include "global.h"
 
 
+extern char cliCmd[], *cliStr[];
+
+
 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 };
-	int ret = 0;
+	struct mqtthdr *hdr;
+	int len, ret = 0;
 
 	FTRACE(4);
 
+	/*
 	buf = mqtt_msgAlloc(USHRT_MAX);
 	if (!buf) {
 		syslog(LOG_ERR, "Error:: allocate message buf (%d) #%d - %s", (int) TASK_FD(task), 
 				mqtt_GetErrno(), mqtt_GetError());
 		goto end;
 	}
+	*/
 
-	if (recv(TASK_FD(task), buf->msg_base, buf->msg_len, 0) == -1) {
-		syslog(LOG_ERR, "Error:: recv(%d) #%d - %s", (int) TASK_FD(task), 
+	if (recv(TASK_FD(task), basebuf, sizeof basebuf, 0) == -1) {
+		VERB(3) syslog(LOG_ERR, "Error:: recv(%d) #%d - %s", (int) TASK_FD(task), 
 				errno, strerror(errno));
-		mqtt_msgFree(&buf, 42);
 		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);
+		goto end;
+	} else
+		len = mqtt_decodeLen(hdr->mqtt_len, &ret);
 
-	ret = mqttDispatcher(cbs, buf);
+		/*
+		for (ret = i = 0; cliCmd[i] && !(ret = (hdr->mqtt_msg.type == cliCmd[i])); i++);
+		if (!ret) {
+			VERB(2) syslog(LOG_ERR, "Error:: wrong command type #%d %s", 
+					hdr->mqtt_msg.type, cliStr[i]);
+			goto end;
+		}
+		*/
 
+	/* check online table for user */
+//	ChkSessPUB(&cfg, );
+
+	ret = mqttDispatcher(cbs, buf);
 	mqtt_msgFree(&buf, 42);
 
 	switch (ret) {