--- mqtt/src/daemon.c 2011/12/01 00:10:18 1.1.2.3 +++ mqtt/src/daemon.c 2011/12/01 08:45:01 1.1.2.5 @@ -1,14 +1,88 @@ #include "global.h" +static void * +startSession(sched_task_t *task) +{ + 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 0; +} + +/* ----------------------------------------------------------------------- */ + +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 *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 - %s\n", errno, strerror(errno)); + syslog(LOG_ERR, "Error:: listen(%d) #%d - %s\n", sock, errno, strerror(errno)); + pthread_cancel(tid); return -1; + } + + while (!Kill) { + if ((cli = accept(sock, &sa.sa, &sslen)) == -1) { + syslog(LOG_ERR, "Error:: accept() #%d - %s", errno, strerror(errno)); + continue; + } else + VERB(1) { + switch (sa.sa.sa_family) { + case AF_INET: + inet_ntop(AF_INET, &sa.sin.sin_addr, szAddr, sslen); + snprintf(szAddr, sizeof szAddr, "%s:%d", + szAddr, ntohs(sa.sin.sin_port)); + break; + case AF_INET6: + inet_ntop(AF_INET6, &sa.sin6.sin6_addr, szAddr, sslen); + snprintf(szAddr, sizeof szAddr, "%s:%d", + szAddr, ntohs(sa.sin6.sin6_port)); + break; + case AF_LOCAL: + strlcpy(szAddr, sa.sun.sun_path, sizeof szAddr); + break; + default: + close(cli); + syslog(LOG_ERR, "Error:: unsupported address type %d", + sa.sa.sa_family); + continue; + } + str = strdup(szAddr); + syslog(LOG_DEBUG, "Connected client with socket=%d from %s", cli, str); + } + + if (!schedRead(root, startSession, str, cli)) { + close(cli); + VERB(1) syslog(LOG_DEBUG, "Terminated client with socket=%d", cli); + if (str) + free(str); + } } return 0;