--- mqtt/src/mqtt_pub.c 2011/12/20 15:03:42 1.1.2.1 +++ mqtt/src/mqtt_pub.c 2017/10/08 22:49:25 1.5 @@ -1,14 +1,55 @@ +/************************************************************************* +* (C) 2011 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: mqtt_pub.c,v 1.5 2017/10/08 22:49:25 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; - -sl_config cfg; extern char compiled[], compiledby[], compilehost[]; -static char szCfgName[MAXPATHLEN]; struct tagArgs *args; @@ -30,7 +71,6 @@ Usage(void) "\t-P \t\tPassword\n" "\t-W \t\tWill Topic\n" "\t-M \t\tWill Message\n" - "\t-c \t\tService config\n" "\t-v\t\t\tVerbose (more -vvv, more verbose)\n" "\t-h\t\t\tHelp! This screen\n\n", compiledby, compilehost, compiled); @@ -52,7 +92,26 @@ cleanArgs(struct tagArgs * __restrict args) static int Publish(int sock) { - return 0; + int siz = 0; + u_short mid = 0; + +#ifdef __NetBSD__ + srandom(getpid() ^ time(NULL)); +#else + srandomdev(); +#endif + mid = random() % USHRT_MAX; + + printf(" > Execute PUBLISH request #%d ... ", mid); + siz = mqtt_cli_Publish(args->cli, mid, args->Dup, args->QoS, args->Retain, + AIT_GET_STR(&args->Publish), AIT_ADDR(&args->Value), AIT_LEN(&args->Value)); + if (siz == -1) { + printf("Error:: Publish #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); + return -1; + } else + printf("Sended %d bytes \n", siz); + + return siz; } @@ -62,9 +121,9 @@ main(int argc, char **argv) char ch; ait_val_t val; u_short port = atoi(MQTT_PORT); - int sock, ret = 0; + int ret = 0; - if (!(args = malloc(sizeof(struct tagArgs)))) { + if (!(args = e_malloc(sizeof(struct tagArgs)))) { printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno)); return 1; } else @@ -74,7 +133,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); - free(args); + e_free(args); return 1; } @@ -83,8 +142,7 @@ main(int argc, char **argv) AIT_SET_STR(&args->Pass, ""); args->ka = MQTT_KEEPALIVE; - strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName); - while ((ch = getopt(argc, argv, "T:U:P:p:q:drCc:W:M:fvh")) != -1) + while ((ch = getopt(argc, argv, "T:U:P:p:q:drCW:M:fvh")) != -1) switch (ch) { case 'T': args->ka = (u_short) strtol(optarg, NULL, 0); @@ -113,7 +171,7 @@ main(int argc, char **argv) if (args->QoS > MQTT_QOS_EXACTLY) { printf("Error:: invalid QoS level %d\n", args->QoS); args->free(args); - free(args); + e_free(args); return 1; } break; @@ -129,16 +187,13 @@ main(int argc, char **argv) case 'f': args->isFile++; break; - case 'c': - strlcpy(szCfgName, optarg, sizeof szCfgName); - break; case 'v': - io_incDebug; + e_incVerbose; break; case 'h': default: args->free(args); - free(args); + e_free(args); Usage(); return 1; } @@ -147,7 +202,7 @@ main(int argc, char **argv) if (argc < 4) { printf("Error:: host for connect not found, connection id, topic or value not supplied!\n\n"); args->free(args); - free(args); + e_free(args); Usage(); return 1; } else { @@ -158,23 +213,30 @@ main(int argc, char **argv) AIT_FREE_VAL(&args->Value); AIT_SET_STR(&args->Value, argv[3]); } - 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); - free(args); + e_free(args); Usage(); return 1; } - ioVERBOSE(1) printf("Connecting to %s:%d ...\n", 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); - if ((sock = InitClient()) == -1) { + if (!(args->cli = mqtt_cli_Open(&args->addr.sa, args->ka))) { args->free(args); - free(args); + e_free(args); return 2; } - printf("Connected ... "); - switch ((ret = try2Connect(sock))) { + if (args->isFile && !OpenFile()) { + mqtt_cli_Close(&args->cli); + args->free(args); + e_free(args); + return 3; + } + + switch ((ret = ConnectClient(args->cli->sock))) { case -1: printf(">> FAILED!\n"); break; @@ -199,13 +261,14 @@ main(int argc, char **argv) } if (ret == MQTT_RETCODE_ACCEPTED) { - ret = Publish(sock); - shutdown(sock, SHUT_RDWR); + ret = (Publish(args->cli->sock) == -1); } else - ret = 3; + ret = 4; - close(sock); + mqtt_cli_Close(&args->cli); + + CloseFile(); args->free(args); - free(args); + e_free(args); return ret; }