--- mqtt/src/mqtt_subs.c 2012/07/03 08:07:15 1.2.2.19 +++ mqtt/src/mqtt_subs.c 2013/01/18 10:17:22 1.4.4.1 @@ -1,11 +1,54 @@ +/************************************************************************* +* (C) 2011 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: mqtt_subs.c,v 1.4.4.1 2013/01/18 10:17:22 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, 2013 + 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 "mqtt.h" #include "client.h" -io_enableDEBUG; - extern char compiled[], compiledby[], compilehost[]; volatile intptr_t Kill; sched_root_task_t *root; @@ -128,11 +171,11 @@ execProc(sched_task_t *task) snprintf(szLine, sizeof szLine, "%s '%s' %hu %u", AIT_GET_STR(&args->Value), (char*) TASK_ARG(task), (u_short) TASK_VAL(task), (u_int) TASK_DATLEN(task)); if (TASK_ARG(task)) - io_free(TASK_ARG(task)); + e_free(TASK_ARG(task)); f = popen(szLine, "w"); if (!f) { - ioSYSERR(0); + ESYSERR(0); return NULL; } else fputs(TASK_DATA(task), f); @@ -169,8 +212,7 @@ pubRX(sched_task_t *task) else { siz = mqtt_pktLen(hdr); rlen -= siz; - ioVERBOSE(4) printf("Remains %d bytes, packet %d bytes\n", - rlen, siz); + EVERBS(4) printf("Remains %d bytes, packet %d bytes\n", rlen, siz); } /* send to output */ @@ -190,7 +232,7 @@ pubRX(sched_task_t *task) /* if exists exec script */ if (!AIT_ISEMPTY(&args->Value)) - schedEvent(root, execProc, io_strdup(szTopic), mid, data, siz); + schedEvent(root, execProc, e_strdup(szTopic), mid, data, siz); memmove(args->msg->msg_base, args->msg->msg_base + siz, rlen); break; @@ -208,7 +250,7 @@ pubRX(sched_task_t *task) memmove(args->msg->msg_base, args->msg->msg_base + siz, rlen); break; default: - ioVERBOSE(1) printf("Unwanted message type #%d ...\n", hdr->mqtt_msg.type); + EVERBS(1) printf("Unwanted message type #%d ...\n", hdr->mqtt_msg.type); goto end; } } @@ -230,14 +272,14 @@ main(int argc, char **argv) FILE *lf; struct sigaction sa; - if (!(args = io_malloc(sizeof(struct tagArgs)))) { + if (!(args = e_malloc(sizeof(struct tagArgs)))) { printf("Error:: in arguments #%d - %s\n", errno, strerror(errno)); return 1; } else memset(args, 0, sizeof(struct tagArgs)); if (!(args->subscr = mqtt_subAlloc(idx))) { printf("Error:: in subscribes array #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); - io_free(args); + e_free(args); return 1; } else args->free = cleanArgs; @@ -245,7 +287,7 @@ main(int argc, char **argv) if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) { printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); args->free(args); - io_free(args); + e_free(args); return 1; } @@ -283,7 +325,7 @@ main(int argc, char **argv) if (!sub) { printf("Error:: #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); args->free(args); - io_free(args); + e_free(args); return 1; } else sub += idx++; @@ -306,7 +348,7 @@ main(int argc, char **argv) if (args->QoS > MQTT_QOS_EXACTLY) { printf("Error:: invalid QoS level %d\n", args->QoS); args->free(args); - io_free(args); + e_free(args); return 1; } break; @@ -323,7 +365,7 @@ main(int argc, char **argv) batch = 0; break; case 'v': - io_incDebug; + e_incVerbose; break; case 'u': un = 1; @@ -331,7 +373,7 @@ main(int argc, char **argv) case 'h': default: args->free(args); - io_free(args); + e_free(args); Usage(); return 1; } @@ -340,7 +382,7 @@ main(int argc, char **argv) if (argc < 2) { printf("Error:: host for connect not found, connection id or topic not supplied!\n\n"); args->free(args); - io_free(args); + e_free(args); Usage(); return 1; } else { @@ -351,14 +393,14 @@ main(int argc, char **argv) AIT_FREE_VAL(&args->Value); AIT_SET_STR(&args->Value, argv[2]); } - if (!io_gethostbyname(*argv, port, &args->addr)) { - printf("Error:: host not valid #%d - %s\n", io_GetErrno(), io_GetError()); + if (!e_gethostbyname(*argv, port, &args->addr)) { + printf("Error:: host not valid #%d - %s\n", elwix_GetErrno(), elwix_GetError()); args->free(args); - io_free(args); + e_free(args); Usage(); return 1; } - printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_n2port(&args->addr)); + printf("Connecting to %s:%d ... ", e_n2addr(&args->addr, &val), e_n2port(&args->addr)); AIT_FREE_VAL(&val); sa.sa_handler = sigz; @@ -445,6 +487,6 @@ main(int argc, char **argv) mqtt_cli_Close(&args->cli); end: args->free(args); - io_free(args); + e_free(args); return ret; }