--- mqtt/src/daemon.c 2011/12/01 08:15:25 1.1.2.4 +++ mqtt/src/daemon.c 2011/12/09 09:53:54 1.1.2.12 @@ -1,26 +1,89 @@ #include "global.h" +#include "mqttd.h" -static int -startSession(int s, const char *csAddr) +extern char cliCmd[], *cliStr[]; + + +static void * +startSession(sched_task_t *task) { - return 0; + u_char basebuf[USHRT_MAX]; + mqtt_cb_t cbs[MQTT_TYPE_MAX + 1] = { 0 }; + mqtt_msg_t buf = { basebuf, sizeof basebuf }; + mqtthdr_connflgs_t flg; + 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; + } + + 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)); + goto end; + } + flg = mqtt_readCONNECT(&buf, &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 (flg.reserved) { + VERB(3) syslog(LOG_ERR, "Error:: in MQTT protocol #%d - %s", + mqtt_GetErrno(), mqtt_GetError()); + goto end; + } + + /* check online table for user */ + +end: /* close client connection */ + if (sess) + free(sess); + close(TASK_FD(task)); + VERB(1) syslog(LOG_DEBUG, "Close client %s with socket=%d", + (char*) TASK_ARG(task), (int) TASK_FD(task)); + if (TASK_ARG(task)) + free(TASK_ARG(task)); + return NULL; } /* ----------------------------------------------------------------------- */ +static void * +thrSched(void *arg __unused) +{ + FTRACE(1); + + schedRun(root, (intptr_t*) &Kill); + pthread_exit(NULL); +} + int Run(int sock) { io_sockaddr_t sa; socklen_t sslen = sizeof sa.ss; int cli; - char szAddr[STRSIZ] = { 0 }; + char *str = NULL, szAddr[STRSIZ] = { 0 }; + pthread_t tid; FTRACE(1); + if (pthread_create(&tid, NULL, thrSched, NULL)) { + syslog(LOG_ERR, "Error:: thread scheduler #%d - %s", errno, strerror(errno)); + return -1; + } else + pthread_detach(tid); + VERB(2) syslog(LOG_DEBUG, "Run scheduler management thread"); + if (listen(sock, SOMAXCONN) == -1) { syslog(LOG_ERR, "Error:: listen(%d) #%d - %s\n", sock, errno, strerror(errno)); + pthread_cancel(tid); return -1; } @@ -50,13 +113,15 @@ Run(int sock) sa.sa.sa_family); continue; } - syslog(LOG_DEBUG, "Connected client with socket=%d from %s", cli, szAddr); + str = strdup(szAddr); + syslog(LOG_DEBUG, "Connected client with socket=%d from %s", cli, str); } - if (startSession(cli, szAddr)) { + if (!schedRead(root, startSession, str, cli)) { close(cli); VERB(1) syslog(LOG_DEBUG, "Terminated client with socket=%d", cli); - continue; + if (str) + free(str); } }