--- mqtt/src/mqtt_ping.c 2012/04/26 09:15:26 1.1.2.3 +++ mqtt/src/mqtt_ping.c 2012/07/03 12:46:00 1.3 @@ -1,3 +1,48 @@ +/************************************************************************* +* (C) 2011 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: mqtt_ping.c,v 1.3 2012/07/03 12:46:00 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 + 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" @@ -36,50 +81,23 @@ cleanArgs(struct tagArgs * __restrict args) } static int -Ping(int sock, int num) +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; -reply: - 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; - - goto reply; - } else { - siz = mqtt_readPINGRESP(args->msg); - if (siz == -1) { - printf("Error:: readPINGRESP #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); - return -1; - } - } - gettimeofday(&after, NULL); + timersub(&after, &before, &calc); + timeradd(accu, &calc, accu); + printf(" + Ping %d MQTT broker %s ... %f sec.\n", num, io_n2addr(&args->addr, &val), - ((after.tv_sec - before.tv_sec) + (after.tv_usec - before.tv_usec) / 1.e6)); + calc.tv_sec + calc.tv_usec / 1.e6); AIT_FREE_VAL(&val); return 0; @@ -92,10 +110,11 @@ main(int argc, char **argv) char ch; ait_val_t val; u_short port = atoi(MQTT_PORT); - int sock, num = 1, ret = 0, lost = 0; + int num = 1, ret = 0, lost = 0; register int i; + struct timeval accu; - if (!(args = malloc(sizeof(struct tagArgs)))) { + if (!(args = io_malloc(sizeof(struct tagArgs)))) { printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno)); return 1; } else @@ -105,7 +124,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); + io_free(args); return 1; } @@ -118,6 +137,7 @@ main(int argc, char **argv) switch (ch) { case 'c': num = (int) strtol(optarg, NULL, 0); + break; case 'T': args->ka = (u_short) strtol(optarg, NULL, 0); break; @@ -138,7 +158,7 @@ main(int argc, char **argv) case 'h': default: args->free(args); - free(args); + io_free(args); Usage(); return 1; } @@ -147,7 +167,7 @@ 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); + io_free(args); Usage(); return 1; } else { @@ -157,20 +177,20 @@ main(int argc, char **argv) if (!io_gethostbyname(*argv, port, &args->addr)) { printf("Error:: host not valid #%d - %s\n", io_GetErrno(), io_GetError()); args->free(args); - free(args); + io_free(args); Usage(); return 1; } printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_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); + io_free(args); return 2; } - switch ((ret = ConnectClient(sock))) { + switch ((ret = ConnectClient(args->cli->sock))) { case -1: printf(">> FAILED!\n"); break; @@ -194,21 +214,21 @@ main(int argc, char **argv) break; } + timerclear(&accu); if (ret == MQTT_RETCODE_ACCEPTED) { for (i = 0; i < num; i++) - if ((ret = Ping(sock, i))) { + if ((ret = Ping(args->cli->sock, i, &accu))) { ret = 3; lost++; } - CloseClient(sock); - - printf("\nMQTT ping sended %d requests with %d lost responses\n", num, lost); - } else { - close(sock); + 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); + io_free(args); return ret; }