[BACK]Return to daemon.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/daemon.c between versions 1.2.2.38 and 1.3.2.1

version 1.2.2.38, 2012/06/26 08:05:58 version 1.3.2.1, 2012/07/03 12:22:56
Line 1 Line 1
   /*************************************************************************
   * (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
   *  by Michael Pounov <misho@openbsd-bg.org>
   *
   * $Author$
   * $Id$
   *
   **************************************************************************
   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 <info@elwix.org>
   
   Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
           by Michael Pounov <misho@elwix.org>.  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 <misho@elwix.org>
   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 "global.h"
 #include "rtlm.h"  #include "rtlm.h"
 #include "utils.h"  
 #include "mqttd.h"  #include "mqttd.h"
 #include "mqttd_calls.h"  #include "mqttd_calls.h"
   #include "utils.h"
   
   
 static inline struct tagSession *  static inline struct tagSession *
Line 39  initSession(int sock, ait_val_t * __restrict v) Line 84  initSession(int sock, ait_val_t * __restrict v)
         }          }
   
         /* init server actor */          /* 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) {          if (!sess->sess_srv) {
                 ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError());                  ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError());
                 mqtt_msgFree(&sess->sess_buf, 42);                  mqtt_msgFree(&sess->sess_buf, 42);
Line 70  finiSession(struct tagSession *sess) Line 115  finiSession(struct tagSession *sess)
         if (!sess)          if (!sess)
                 return;                  return;
   
           schedCancelby(root, taskTIMER, CRITERIA_CALL, sendRetain, NULL);
   
         if (sess->sess_clean) {          if (sess->sess_clean) {
                 if (call.FiniSessPUB)                  if (call.FiniSessPUB)
                         call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");                          call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%");
                 if (call.DeletePUB_subscribe)                  if (call.DeletePUB_subscribe)
                         call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%");                          call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%");
                if (call.WipePUB_topic)                if (call.WipePUB_topic) /* only dynamic messages */
                        call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1);                        call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, 0);
         }          }
   
         while ((store = SLIST_FIRST(&sess->sess_subscr))) {          while ((store = SLIST_FIRST(&sess->sess_subscr))) {
Line 90  finiSession(struct tagSession *sess) Line 137  finiSession(struct tagSession *sess)
                 io_free(store);                  io_free(store);
         }          }
   
        if (sess->sess_will.msg)        if (sess->sess_will.flag)
                free(sess->sess_will.msg);                pubWill(sess);
 
         if (sess->sess_will.topic)          if (sess->sess_will.topic)
                 free(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)          if (sess->sess_sock > STDERR_FILENO)
                 srv_Close(sess->sess_sock);                  srv_Close(sess->sess_sock);
   
        mqtt_srv_Fini(&sess->sess_srv);        mqtt_srv_cliFini(&sess->sess_srv);
         mqtt_msgFree(&sess->sess_buf, 42);          mqtt_msgFree(&sess->sess_buf, 42);
   
         io_free(sess);          io_free(sess);
Line 155  dispatchSession(sched_task_t *task) Line 205  dispatchSession(sched_task_t *task)
                 finiSession(sess);                  finiSession(sess);
                 return NULL;                  return NULL;
         }          }
         ioDEBUG(0, "++++++ret=%d\n", ret);  
   
         do {          do {
                 /* dispatch message type */                  /* 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) {                          if (len == -1) {
                                 ioLIBERR(mqtt);                                  ioLIBERR(mqtt);
                                 finiSession(sess);                                  finiSession(sess);
Line 180  dispatchSession(sched_task_t *task) Line 229  dispatchSession(sched_task_t *task)
         return NULL;          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 *  void *
 startSession(sched_task_t *task)  startSession(sched_task_t *task)
 {  {
Line 190  startSession(sched_task_t *task) Line 265  startSession(sched_task_t *task)
         ait_val_t *v;          ait_val_t *v;
         struct tagSession *s, *sess = NULL;          struct tagSession *s, *sess = NULL;
         int ret, wlen;          int ret, wlen;
           mqtt_subscr_t *subs;
           struct timespec ts = { RETAIN_TIMEOUT, 0 };
           intptr_t sock;
   
         ioTRACE(4);          ioTRACE(4);
   
Line 253  startSession(sched_task_t *task) Line 331  startSession(sched_task_t *task)
                 TAILQ_FOREACH(s, &Sessions, sess_node)                  TAILQ_FOREACH(s, &Sessions, sess_node)
                         if (!strcmp(s->sess_cid, sess->sess_cid)) {                          if (!strcmp(s->sess_cid, sess->sess_cid)) {
                                 /* found stale session & disconnect it! */                                  /* found stale session & disconnect it! */
                                schedCancelby(root, taskMAX, CRITERIA_FD, (void*) s->sess_sock, NULL);                                sock = s->sess_sock;
                                 schedCancelby(root, taskMAX, CRITERIA_FD, (void*) sock, NULL);
                                 schedWrite(root, leaveClient, s, s->sess_sock, NULL, 0);                                  schedWrite(root, leaveClient, s, s->sess_sock, NULL, 0);
                                 break;                                  break;
                         }                          }
Line 273  startSession(sched_task_t *task) Line 352  startSession(sched_task_t *task)
         if (sess->sess_clean) {          if (sess->sess_clean) {
                 if (call.DeletePUB_subscribe)                  if (call.DeletePUB_subscribe)
                         call.DeletePUB_subscribe(&cfg, pub, sess->sess_cid, "%", sess->sess_user, "%");                          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);                          call.WipePUB_topic(&cfg, pub, sess->sess_cid, sess->sess_user, -1);
        } else {        } else if (call.ReadPUB_subscribe) {
                // TODO: read_sql subs and prepare publish                /* 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 ... */          /* Start session task OK ... */
         if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0)) {          if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0)) {
                 ioLIBERR(sched);                  ioLIBERR(sched);
Line 317  acceptClient(sched_task_t *task) Line 403  acceptClient(sched_task_t *task)
   
         if ((cli = accept(TASK_FD(task), &sa.sa, &sslen)) == -1)          if ((cli = accept(TASK_FD(task), &sa.sa, &sslen)) == -1)
                 goto end;                  goto end;
         else  
                 fcntl(cli, F_SETFL, fcntl(cli, F_GETFL, 0) | O_NONBLOCK);  
   
         v = io_allocVar();          v = io_allocVar();
         if (!v) {          if (!v) {
Line 354  Run(int sock) Line 438  Run(int sock)
   
         ioTRACE(1);          ioTRACE(1);
   
        if (listen(sock, SOMAXCONN) == -1) {        if (mqtt_srv_Listen(sock, 0, 1) == -1) {
                ioSYSERR(0);                ioLIBERR(mqtt);
                 return -1;                  return -1;
        } else        }
                fcntl(sock, F_SETFL, fcntl(sock, F_GETFL, 0) | O_NONBLOCK); 
   
         /* state machine - accept new connections */          /* state machine - accept new connections */
         if (!schedRead(root, acceptClient, NULL, sock, NULL, 0)) {          if (!schedRead(root, acceptClient, NULL, sock, NULL, 0)) {
Line 368  Run(int sock) Line 451  Run(int sock)
   
         schedPolling(root, &pl, NULL);          schedPolling(root, &pl, NULL);
         schedRun(root, &Kill);          schedRun(root, &Kill);
   
           schedCancelby(root, taskTIMER, CRITERIA_CALL, sendRetain, NULL);
   
         /* free all undeleted elements into lists */          /* free all undeleted elements into lists */
         TAILQ_FOREACH(sess, &Sessions, sess_node) {          TAILQ_FOREACH(sess, &Sessions, sess_node) {
Removed from v.1.2.2.38  
changed lines
  Added in v.1.3.2.1

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>