--- mqtt/src/daemon.c 2012/05/14 13:04:14 1.2.2.31 +++ mqtt/src/daemon.c 2012/08/29 14:40:08 1.4.2.1 @@ -1,8 +1,53 @@ +/************************************************************************* +* (C) 2011 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: daemon.c,v 1.4.2.1 2012/08/29 14:40:08 misho Exp $ +* +************************************************************************** +The ELWIX and AITNET software is distributed under the following +terms: + +All of the documentation and software included in the ELWIX and AITNET +Releases is copyrighted by ELWIX - Sofia/Bulgaria + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #include "global.h" #include "rtlm.h" -#include "utils.h" #include "mqttd.h" #include "mqttd_calls.h" +#include "utils.h" static inline struct tagSession * @@ -16,7 +61,7 @@ initSession(int sock, ait_val_t * __restrict v) if (!v) return NULL; - sess = malloc(sizeof(struct tagSession)); + sess = io_malloc(sizeof(struct tagSession)); if (!sess) { ioSYSERR(0); return NULL; @@ -34,16 +79,16 @@ initSession(int sock, ait_val_t * __restrict v) sess->sess_buf = mqtt_msgAlloc(USHRT_MAX); if (!sess->sess_buf) { ioLIBERR(mqtt); - free(sess); + io_free(sess); return NULL; } /* init server actor */ - sess->sess_srv = mqtt_srv_Init(sock, sess->sess_buf, sess->sess_ka); + sess->sess_srv = mqtt_srv_cliInit(sock, sess->sess_buf, sess->sess_ka, 1); if (!sess->sess_srv) { ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError()); mqtt_msgFree(&sess->sess_buf, 42); - free(sess); + io_free(sess); return NULL; } else { mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_CONNECT, cmdCONNECT); @@ -70,13 +115,15 @@ finiSession(struct tagSession *sess) if (!sess) return; + schedCancelby(root, taskTIMER, CRITERIA_CALL, sendRetain, NULL); + if (sess->sess_clean) { if (call.FiniSessPUB) call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%"); if (call.DeletePUB_subscribe) call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%"); - if (call.WipePUB_topic) - call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1); + if (call.WipePUB_topic) /* only dynamic messages */ + call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, 0); } while ((store = SLIST_FIRST(&sess->sess_subscr))) { @@ -87,21 +134,24 @@ finiSession(struct tagSession *sess) if (store->st_subscr.sub_value.msg_base) free(store->st_subscr.sub_value.msg_base); - free(store); + io_free(store); } - if (sess->sess_will.msg) - free(sess->sess_will.msg); + if (sess->sess_will.flag) + pubWill(sess); + if (sess->sess_will.topic) free(sess->sess_will.topic); + if (sess->sess_will.msg) + free(sess->sess_will.msg); if (sess->sess_sock > STDERR_FILENO) srv_Close(sess->sess_sock); - mqtt_srv_Fini(&sess->sess_srv); + mqtt_srv_cliFini(&sess->sess_srv); mqtt_msgFree(&sess->sess_buf, 42); - free(sess); + io_free(sess); } static void * @@ -122,7 +172,7 @@ leaveClient(sched_task_t *task) ret = mqtt_msgDISCONNECT(sess->sess_buf); send(TASK_FD(task), sess->sess_buf->msg_base, ret, MSG_NOSIGNAL); - ioDEBUG(1, "Close socket=%d", TASK_FD(task)); + ioDEBUG(1, "Close socket=%ld", (long) TASK_FD(task)); call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, sess->sess_addr, sess->sess_user); @@ -158,7 +208,7 @@ dispatchSession(sched_task_t *task) do { /* dispatch message type */ - if ((len = mqtt_srv_Dispatch(sess->sess_srv, ret, sess)) < 0) { + if ((len = mqtt_srv_cliDispatch(sess->sess_srv, ret, sess)) < 0) { if (len == -1) { ioLIBERR(mqtt); finiSession(sess); @@ -179,6 +229,32 @@ dispatchSession(sched_task_t *task) return NULL; } +static int +loadSubscribes(struct tagSession * __restrict sess, mqtt_subscr_t * __restrict subs) +{ + register int i; + struct tagStore *store; + + if (!subs) + return -1; + + for (i = 0; subs[i].sub_topic.msg_base; i++) { + store = io_malloc(sizeof(struct tagStore)); + if (!store) { + ioSYSERR(0); + continue; + } else { + store->st_msgid = 0; + mqtt_subCopy(&store->st_subscr, &subs[i]); + } + + /* add to cache */ + SLIST_INSERT_HEAD(&sess->sess_subscr, store, st_node); + } + + return 0; +} + void * startSession(sched_task_t *task) { @@ -189,6 +265,9 @@ startSession(sched_task_t *task) ait_val_t *v; struct tagSession *s, *sess = NULL; int ret, wlen; + mqtt_subscr_t *subs; + struct timespec ts = { RETAIN_TIMEOUT, 0 }; + intptr_t sock; ioTRACE(4); @@ -252,7 +331,9 @@ startSession(sched_task_t *task) TAILQ_FOREACH(s, &Sessions, sess_node) if (!strcmp(s->sess_cid, sess->sess_cid)) { /* found stale session & disconnect it! */ - schedWrite(root, leaveClient, sess, TASK_FD(task), NULL, 0); + sock = s->sess_sock; + schedCancelby(root, taskMAX, CRITERIA_FD, (void*) sock, NULL); + schedWrite(root, leaveClient, s, s->sess_sock, NULL, 0); break; } } @@ -271,12 +352,19 @@ startSession(sched_task_t *task) if (sess->sess_clean) { if (call.DeletePUB_subscribe) call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%"); - if (call.WipePUB_topic) + if (call.WipePUB_topic) /* delete ALL messages */ call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1); - } else { - // todo: read_sql subs and prepare publish + } else if (call.ReadPUB_subscribe) { + /* load subscribes */ + subs = call.ReadPUB_subscribe(&cfg, pub, sess->sess_cid, "%"); + loadSubscribes(sess, subs); + mqtt_subFree(&subs); } + /* timer event for retain messages */ + if (call.ReadPUB_topic) + schedTimer(root, sendRetain, sess, ts, NULL, 0); + /* Start session task OK ... */ if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0)) { ioLIBERR(sched); @@ -289,12 +377,12 @@ startSession(sched_task_t *task) end: /* close client connection */ wlen = mqtt_msgCONNACK(sess->sess_buf, ret); if ((wlen = send(TASK_FD(task), sess->sess_buf->msg_base, wlen, 0)) == -1) { - ioDEBUG(3, "Error:: send(%d) #%d - %s", TASK_FD(task), errno, strerror(errno)); + ioDEBUG(3, "Error:: send(%ld) #%d - %s", (long) TASK_FD(task), errno, strerror(errno)); } else ioDEBUG(5, "Sended %d bytes", wlen); if (ret != MQTT_RETCODE_ACCEPTED) { - ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, TASK_FD(task)); + ioDEBUG(1, "Close client %s with socket=%ld", sess->sess_addr, (long) TASK_FD(task)); finiSession(sess); } return NULL; @@ -316,7 +404,7 @@ acceptClient(sched_task_t *task) if ((cli = accept(TASK_FD(task), &sa.sa, &sslen)) == -1) goto end; else - fcntl(cli, F_SETFL, fcntl(cli, F_GETFL, 0) | O_NONBLOCK); + fcntl(cli, F_SETFL, fcntl(cli, F_GETFL) | O_NONBLOCK); v = io_allocVar(); if (!v) { @@ -347,17 +435,15 @@ end: int Run(int sock) { - struct tagPub *pub; struct tagSession *sess; struct timespec pl = { 0, 100000000 }; ioTRACE(1); - if (listen(sock, SOMAXCONN) == -1) { - ioSYSERR(0); + if (mqtt_srv_Listen(sock, 0, 1) == -1) { + ioLIBERR(mqtt); return -1; - } else - fcntl(sock, F_SETFL, fcntl(sock, F_GETFL, 0) | O_NONBLOCK); + } /* state machine - accept new connections */ if (!schedRead(root, acceptClient, NULL, sock, NULL, 0)) { @@ -368,14 +454,9 @@ Run(int sock) schedPolling(root, &pl, NULL); schedRun(root, &Kill); - /* free all undeleted elements into lists */ - TAILQ_FOREACH(pub, &Pubs, pub_node) { - TAILQ_REMOVE(&Pubs, pub, pub_node); + schedCancelby(root, taskTIMER, CRITERIA_CALL, sendRetain, NULL); - AIT_FREE_VAL(&pub->pub_name); - if (pub->pub_packet.msg_base) - free(pub->pub_packet.msg_base); - } + /* free all undeleted elements into lists */ TAILQ_FOREACH(sess, &Sessions, sess_node) { TAILQ_REMOVE(&Sessions, sess, sess_node);