--- mqtt/src/daemon.c 2011/12/05 08:15:50 1.1.2.7 +++ mqtt/src/daemon.c 2011/12/08 14:52:47 1.1.2.10 @@ -7,41 +7,54 @@ extern char cliCmd[], *cliStr[]; static void * startSession(sched_task_t *task) { - mqtt_msg_t *buf; + static u_char basebuf[USHRT_MAX]; mqtt_cb_t cbs[MQTT_TYPE_MAX + 1] = { 0 }; - struct mqtthdr *hdr; + mqtt_msg_t *buf = { basebuf, sizeof basebuf }; + mqtthdr_connflgs_t flg; int ret = 0; - register int i; + struct timeval tv = { 0 }; + u_short ka; 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*) buf->msg_base; + } + + 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; + } + + /* for (ret = i = 0; cliCmd[i] && !(ret = (hdr->mqtt_msg.type == cliCmd[i])); i++); if (!ret) { - syslog(LOG_ERR, "Error:: wrong command type #%d %s", + VERB(2) syslog(LOG_ERR, "Error:: wrong command type #%d %s", hdr->mqtt_msg.type, cliStr[i]); - mqtt_msgFree(&buf, 42); goto end; } - } + */ - ret = mqttDispatcher(cbs, buf); + /* check online table for user */ +// ChkSessPUB(&cfg, ); - 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()); @@ -49,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",