--- mqtt/src/daemon.c 2013/01/18 09:43:27 1.5 +++ mqtt/src/daemon.c 2017/10/08 22:49:24 1.6 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: daemon.c,v 1.5 2013/01/18 09:43:27 misho Exp $ +* $Id: daemon.c,v 1.6 2017/10/08 22:49:24 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ 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 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -56,14 +56,14 @@ initSession(int sock, ait_val_t * __restrict v) struct tagSession *sess = NULL; const char *str; - ioTRACE(5); + ETRACE(); if (!v) return NULL; - sess = io_malloc(sizeof(struct tagSession)); + sess = e_malloc(sizeof(struct tagSession)); if (!sess) { - ioSYSERR(0); + ELIBERR(elwix); return NULL; } else memset(sess, 0, sizeof(struct tagSession)); @@ -78,17 +78,17 @@ initSession(int sock, ait_val_t * __restrict v) sess->sess_buf = mqtt_msgAlloc(USHRT_MAX); if (!sess->sess_buf) { - ioLIBERR(mqtt); - io_free(sess); + ELIBERR(mqtt); + e_free(sess); return NULL; } /* init server actor */ 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()); + EVERBOSE(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError()); mqtt_msgFree(&sess->sess_buf, 42); - io_free(sess); + e_free(sess); return NULL; } else { mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_CONNECT, cmdCONNECT); @@ -110,7 +110,7 @@ finiSession(struct tagSession *sess) { struct tagStore *store; - ioTRACE(5); + ETRACE(); if (!sess) return; @@ -134,7 +134,7 @@ finiSession(struct tagSession *sess) if (store->st_subscr.sub_value.msg_base) free(store->st_subscr.sub_value.msg_base); - io_free(store); + e_free(store); } if (sess->sess_will.flag) @@ -151,7 +151,7 @@ finiSession(struct tagSession *sess) mqtt_srv_cliFini(&sess->sess_srv); mqtt_msgFree(&sess->sess_buf, 42); - io_free(sess); + e_free(sess); } static void * @@ -160,7 +160,7 @@ leaveClient(sched_task_t *task) struct tagSession *sess; int ret; - ioTRACE(4); + ETRACE(); assert(task); @@ -172,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=%ld", (long) TASK_FD(task)); + EVERBOSE(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); @@ -186,7 +186,7 @@ dispatchSession(sched_task_t *task) int ret, len = 0; struct tagSession *sess; - ioTRACE(2); + ETRACE(); assert(task); @@ -195,12 +195,12 @@ dispatchSession(sched_task_t *task) /* receive & decode packet */ if ((ret = recv(TASK_FD(task), sess->sess_buf->msg_base, sess->sess_buf->msg_len, 0)) == -1) { - ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno)); + EVERBOSE(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno)); TAILQ_REMOVE(&Sessions, sess, sess_node); finiSession(sess); return NULL; } else if (!ret) { - ioDEBUG(4, "Session %s EOF received.", sess->sess_cid); + EVERBOSE(4, "Session %s EOF received.", sess->sess_cid); TAILQ_REMOVE(&Sessions, sess, sess_node); finiSession(sess); return NULL; @@ -210,7 +210,7 @@ dispatchSession(sched_task_t *task) /* dispatch message type */ if ((len = mqtt_srv_cliDispatch(sess->sess_srv, ret, sess)) < 0) { if (len == -1) { - ioLIBERR(mqtt); + ELIBERR(mqtt); finiSession(sess); } else if (len == -2) { TAILQ_REMOVE(&Sessions, sess, sess_node); @@ -222,7 +222,7 @@ dispatchSession(sched_task_t *task) } while (len > 0 && ret > 0); if (len >= 0 && !schedRead(root, dispatchSession, TASK_ARG(task), TASK_FD(task), NULL, 0)) { - ioLIBERR(sched); + ELIBERR(sched); TAILQ_REMOVE(&Sessions, sess, sess_node); finiSession(sess); } @@ -239,9 +239,9 @@ loadSubscribes(struct tagSession * __restrict sess, mq return -1; for (i = 0; subs[i].sub_topic.msg_base; i++) { - store = io_malloc(sizeof(struct tagStore)); + store = e_malloc(sizeof(struct tagStore)); if (!store) { - ioSYSERR(0); + ELIBERR(elwix); continue; } else { store->st_msgid = 0; @@ -269,7 +269,7 @@ startSession(sched_task_t *task) struct timespec ts = { RETAIN_TIMEOUT, 0 }; intptr_t sock; - ioTRACE(4); + ETRACE(); assert(task); @@ -277,7 +277,7 @@ startSession(sched_task_t *task) v = TASK_ARG(task); /* flow from accept new clients */ sess = initSession(TASK_FD(task), v); - io_freeVar(&v); + ait_freeVar(&v); if (!sess) { close(TASK_FD(task)); return NULL; @@ -285,7 +285,7 @@ startSession(sched_task_t *task) /* receive & decode packet */ if (recv(sess->sess_sock, buf.msg_base, buf.msg_len, 0) == -1) { - ioDEBUG(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno)); + EVERBOSE(3, "Error:: recv(%d) #%d - %s", sess->sess_sock, errno, strerror(errno)); finiSession(sess); return NULL; } @@ -303,7 +303,7 @@ startSession(sched_task_t *task) ret = cack.retcode; flg.flags = cack.reserved; if (flg.reserved) { - ioDEBUG(3, "Error:: in MQTT protocol #%d - %s", mqtt_GetErrno(), mqtt_GetError()); + EVERBOSE(3, "Error:: in MQTT protocol #%d - %s", mqtt_GetErrno(), mqtt_GetError()); goto end; } else { sess->sess_clean = flg.clean_sess; @@ -316,18 +316,18 @@ startSession(sched_task_t *task) /* check online table for user */ if (call.LoginACC(&cfg, acc, sess->sess_user, sess->sess_pass) < 1) { - ioDEBUG(0, "Login:: DENIED for username %s and password %s", + EVERBOSE(0, "Login:: DENIED for username %s and password %s", sess->sess_user, sess->sess_pass); ret = MQTT_RETCODE_DENIED; goto end; } else { - ioDEBUG(1, "Login:: ALLOWED for username %s ...", sess->sess_user); + EVERBOSE(1, "Login:: ALLOWED for username %s ...", sess->sess_user); ret = MQTT_RETCODE_ACCEPTED; } /* db management */ if (call.FiniSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, "%") > 0) { - ioDEBUG(2, "Old session %s should be disconnect!", sess->sess_cid); + EVERBOSE(2, "Old session %s should be disconnect!", sess->sess_cid); TAILQ_FOREACH(s, &Sessions, sess_node) if (!strcmp(s->sess_cid, sess->sess_cid)) { /* found stale session & disconnect it! */ @@ -340,11 +340,11 @@ startSession(sched_task_t *task) if (call.InitSessPUB(&cfg, pub, sess->sess_cid, sess->sess_user, sess->sess_addr, sess->sess_will.flag, sess->sess_will.topic, sess->sess_will.msg, sess->sess_will.qos, sess->sess_will.retain) == -1) { - ioDEBUG(0, "Session %s DENIED for username %s", sess->sess_cid, sess->sess_user); + EVERBOSE(0, "Session %s DENIED for username %s", sess->sess_cid, sess->sess_user); ret = MQTT_RETCODE_DENIED; goto end; } else { - ioDEBUG(0, "Session %s from %s and username %s is started", + EVERBOSE(0, "Session %s from %s and username %s is started", sess->sess_cid, sess->sess_addr, sess->sess_user); ret = MQTT_RETCODE_ACCEPTED; } @@ -367,7 +367,7 @@ startSession(sched_task_t *task) /* Start session task OK ... */ if (!schedRead(root, dispatchSession, sess, TASK_FD(task), NULL, 0)) { - ioLIBERR(sched); + ELIBERR(sched); ret = MQTT_RETCODE_DENIED; } else TAILQ_INSERT_TAIL(&Sessions, sess, sess_node); @@ -377,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(%ld) #%d - %s", (long) TASK_FD(task), errno, strerror(errno)); + EVERBOSE(3, "Error:: send(%ld) #%d - %s", (long) TASK_FD(task), errno, strerror(errno)); } else - ioDEBUG(5, "Sended %d bytes", wlen); + EVERBOSE(5, "Sended %d bytes", wlen); if (ret != MQTT_RETCODE_ACCEPTED) { - ioDEBUG(1, "Close client %s with socket=%ld", sess->sess_addr, (long) TASK_FD(task)); + EVERBOSE(1, "Close client %s with socket=%ld", sess->sess_addr, (long) TASK_FD(task)); finiSession(sess); } return NULL; @@ -392,12 +392,12 @@ static void * acceptClient(sched_task_t *task) { int cli; - io_sockaddr_t sa; + sockaddr_t sa; socklen_t sslen = sizeof sa.ss; ait_val_t *v; char str[STRSIZ]; - ioTRACE(4); + ETRACE(); assert(task); @@ -406,27 +406,27 @@ acceptClient(sched_task_t *task) else fcntl(cli, F_SETFL, fcntl(cli, F_GETFL) | O_NONBLOCK); - v = io_allocVar(); + v = ait_allocVar(); if (!v) { - ioLIBERR(io); + ELIBERR(elwix); close(cli); goto end; } else { memset(str, 0, sizeof str); - snprintf(str, sizeof str, "%s:%hu", io_n2addr(&sa, v), io_n2port(&sa)); + snprintf(str, sizeof str, "%s:%hu", e_n2addr(&sa, v), e_n2port(&sa)); AIT_FREE_VAL(v); AIT_SET_STR(v, str); } - ioDEBUG(1, "Connected client with socket=%d from %s", cli, AIT_GET_STR(v)); + EVERBOSE(1, "Connected client with socket=%d from %s", cli, AIT_GET_STR(v)); if (!schedRead(root, startSession, v, cli, NULL, 0)) { - io_freeVar(&v); + ait_freeVar(&v); close(cli); - ioDEBUG(1, "Terminated client with socket=%d", cli); + EVERBOSE(1, "Terminated client with socket=%d", cli); } end: if (!schedRead(root, acceptClient, NULL, TASK_FD(task), NULL, 0)) - ioLIBERR(sched); + ELIBERR(sched); return NULL; } @@ -438,16 +438,16 @@ Run(int sock) struct tagSession *sess; struct timespec pl = { 0, 100000000 }; - ioTRACE(1); + ETRACE(); if (mqtt_srv_Listen(sock, 0, 1) == -1) { - ioLIBERR(mqtt); + ELIBERR(mqtt); return -1; } /* state machine - accept new connections */ if (!schedRead(root, acceptClient, NULL, sock, NULL, 0)) { - ioLIBERR(sched); + ELIBERR(sched); return -1; }