--- mqtt/src/client.c 2012/01/05 10:01:20 1.1.2.11 +++ mqtt/src/client.c 2012/07/03 12:46:00 1.4 @@ -1,25 +1,53 @@ -#include "global.h" -#include "mqtt.h" +/************************************************************************* +* (C) 2011 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov +* +* $Author: misho $ +* $Id: client.c,v 1.4 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 -int -InitClient(void) -{ - int sock; +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + by Michael Pounov . All rights reserved. - sock = socket(args->addr.sa.sa_family, SOCK_STREAM, IPPROTO_TCP); - if (sock == -1) { - printf("Error:: socket() #%d - %s\n", errno, strerror(errno)); - return -1; - } - if (connect(sock, &args->addr.sa, args->addr.sa.sa_len) == -1) { - printf("Error:: connect() #%d - %s\n", errno, strerror(errno)); - return -1; - } +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. - return sock; -} +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" + int ConnectClient(int sock) { @@ -55,6 +83,7 @@ ConnectClient(int sock) if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) return -1; + memset(args->msg->msg_base, 0, args->msg->msg_len); siz = recv(sock, args->msg->msg_base, args->msg->msg_len, 0); if (siz == -1) { printf("Error:: recv() #%d - %s\n", errno, strerror(errno)); @@ -65,71 +94,6 @@ ConnectClient(int sock) return (u_char) mqtt_readCONNACK(args->msg); } -int -CloseClient(int sock) -{ - int siz = 0; - - siz = mqtt_msgDISCONNECT(args->msg); - if (siz == -1) { - printf("Error:: msgDISCONNECT #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); - return -1; - } - - siz = send(sock, args->msg->msg_base, siz, 0); - if (siz == -1) { - printf("Error:: send() #%d - %s\n", errno, strerror(errno)); - return -1; - } else - ioVERBOSE(3) printf("Sended DISCONNECT %d bytes\n", siz); - - shutdown(sock, SHUT_RDWR); - close(sock); - return siz; -} - -int -KAClient(int sock) -{ - int siz = 0; - struct pollfd pfd; - - siz = mqtt_msgPINGREQ(args->msg); - if (siz == -1) { - printf("Error:: msgPINGREQ #%d - %s\n", mqtt_GetErrno(), mqtt_GetError()); - return -1; - } - - siz = send(sock, args->msg->msg_base, siz, 0); - if (siz == -1) { - printf("Error:: send() #%d - %s\n", errno, strerror(errno)); - return -1; - } else - ioVERBOSE(3) printf("Sended PINGREQ %d bytes\n", siz); - - pfd.fd = sock; - pfd.events = POLLIN | POLLPRI; - switch (poll(&pfd, 1, args->ka * 1000)) { - case -1: - printf("Error:: poll() #%d - %s\n", errno, strerror(errno)); - return -1; - case 0: - ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000); - return -1; - } - if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) - return -1; - - siz = recv(sock, args->msg->msg_base, args->msg->msg_len, 0); - if (siz == -1) { - printf("Error:: recv() #%d - %s\n", errno, strerror(errno)); - return -1; - } else - ioVERBOSE(3) printf("Received %d bytes\n", siz); - - return (u_char) mqtt_readPINGRESP(args->msg); -} - void * OpenFile(void) { @@ -163,4 +127,52 @@ CloseFile(void) munmap(AIT_GET_PTR(&args->Value), AIT_LEN(&args->Value)); AIT_FREE_VAL(&args->Value); } +} + +inline int +SendTo(int sock, int siz) +{ + siz = send(sock, args->msg->msg_base, siz, MSG_NOSIGNAL); + if (siz == -1) { + printf("Error:: send() #%d - %s\n", errno, strerror(errno)); + return -1; + } else + ioVERBOSE(3) printf("Sended %d bytes\n", siz); + + return siz; +} + +inline int +RecvFrom(int sock) +{ + struct pollfd pfd; + int siz = 0; + + memset(args->msg->msg_base, 0, args->msg->msg_len); + + pfd.fd = sock; + pfd.events = POLLIN | POLLPRI; + do { + switch (poll(&pfd, 1, args->ka * 1000)) { + case -1: + printf("Error:: poll() #%d - %s\n", errno, strerror(errno)); + return -1; + case 0: + ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000); + if (mqtt_KeepAlive(sock, args->ka, 1) == -1) + return -1; + continue; + } + if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) + return -1; + } while (0); + + siz = recv(sock, args->msg->msg_base, args->msg->msg_len, 0); + if (siz == -1) { + printf("Error:: recv() #%d - %s\n", errno, strerror(errno)); + return -1; + } else + ioVERBOSE(3) printf("Received %d bytes\n", siz); + + return siz; }