--- mqtt/src/mqtt_ping.c 2012/01/30 22:58:24 1.1.2.2 +++ mqtt/src/mqtt_ping.c 2013/01/18 10:17:22 1.3.4.1 @@ -1,10 +1,53 @@ +/************************************************************************* +* (C) 2011 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: mqtt_ping.c,v 1.3.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 "mqtt.h" #include "client.h" -io_enableDEBUG; - extern char compiled[], compiledby[], compilehost[]; struct tagArgs *args; @@ -16,6 +59,7 @@ Usage(void) printf( " -= MQTT PING =- MQTT Ping from ELWIX\n" "=== %s@%s === Compiled: %s ===\n\n" " Syntax: mqtt_ping [options] \n\n" + "\t-c \t\tNumber of ping requests (default: 1)\n" "\t-p \t\tDifferent port for connect (default: 1883)\n" "\t-T \t\tKeep alive timeout in seconds (default: 10sec)\n" "\t-U \t\tUsername\n" @@ -35,50 +79,23 @@ cleanArgs(struct tagArgs * __restrict args) } static int -Ping(int sock) +Ping(int sock, int num, struct timeval * __restrict accu) { - int siz = 0; - struct timeval before, after; + struct timeval before, after, calc; ait_val_t val; - struct mqtthdr *hdr; gettimeofday(&before, NULL); - siz = mqtt_msgPINGREQ(args->msg); - if (siz == -1) { - printf("Error:: msgPINGREQ #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); + if (mqtt_KeepAlive(args->cli->sock, args->ka, 1) == -1) return -1; - } - if (SendTo(sock, siz) == -1) - return -1; - do { - if ((siz = RecvFrom(sock)) == -1 || !siz) - return -1; - else - hdr = (struct mqtthdr*) args->msg->msg_base; - if (hdr->mqtt_msg.type == MQTT_TYPE_PINGREQ) { - siz = mqtt_msgPINGRESP(args->msg); - if (siz == -1) { - printf("Error:: msgPINGRESP #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); - return -1; - } - if (SendTo(sock, siz) == -1) - return -1; - } else { - siz = mqtt_readPINGRESP(args->msg); - if (siz == -1) { - printf("Error:: readPINGRESP #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); - return -1; - } else - break; - } - } while (42); - gettimeofday(&after, NULL); - printf(" + Ping MQTT broker %s ... %f sec.\n", io_n2addr(&args->addr, &val), - ((after.tv_sec - before.tv_sec) + (after.tv_usec - before.tv_usec) / 1.e6)); + timersub(&after, &before, &calc); + timeradd(accu, &calc, accu); + + printf(" + Ping %d MQTT broker %s ... %f sec.\n", num, e_n2addr(&args->addr, &val), + calc.tv_sec + calc.tv_usec / 1.e6); AIT_FREE_VAL(&val); return 0; @@ -91,9 +108,11 @@ main(int argc, char **argv) char ch; ait_val_t val; u_short port = atoi(MQTT_PORT); - int sock, ret = 0; + int num = 1, ret = 0, lost = 0; + register int i; + struct timeval accu; - 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 @@ -103,7 +122,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; } @@ -112,8 +131,11 @@ main(int argc, char **argv) AIT_SET_STR(&args->Pass, ""); args->ka = MQTT_KEEPALIVE; - while ((ch = getopt(argc, argv, "T:U:P:p:vh")) != -1) + while ((ch = getopt(argc, argv, "T:U:P:p:c:vh")) != -1) switch (ch) { + case 'c': + num = (int) strtol(optarg, NULL, 0); + break; case 'T': args->ka = (u_short) strtol(optarg, NULL, 0); break; @@ -129,12 +151,12 @@ main(int argc, char **argv) port = (u_short) strtol(optarg, NULL, 0); break; case 'v': - io_incDebug; + e_incVerbose; break; case 'h': default: args->free(args); - free(args); + e_free(args); Usage(); return 1; } @@ -143,30 +165,30 @@ main(int argc, char **argv) if (argc < 2) { printf("Error:: host for connect not found or connection id!\n\n"); args->free(args); - free(args); + e_free(args); Usage(); return 1; } else { AIT_FREE_VAL(&args->ConnID); AIT_SET_STR(&args->ConnID, argv[1]); } - 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; } - 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); - 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; } - switch ((ret = ConnectClient(sock))) { + switch ((ret = ConnectClient(args->cli->sock))) { case -1: printf(">> FAILED!\n"); break; @@ -190,15 +212,21 @@ main(int argc, char **argv) break; } + timerclear(&accu); if (ret == MQTT_RETCODE_ACCEPTED) { - ret = Ping(sock) ? 3 : 0; - CloseClient(sock); - } else { - close(sock); + for (i = 0; i < num; i++) + if ((ret = Ping(args->cli->sock, i, &accu))) { + ret = 3; + lost++; + } + printf("\nMQTT ping sended %d requests with %d lost responses and avarage %f sec.\n", + num, lost, (accu.tv_sec + accu.tv_usec / 1.e6) / (num - lost)); + } else ret = 4; - } + mqtt_cli_Close(&args->cli); + args->free(args); - free(args); + e_free(args); return ret; }