[BACK]Return to client.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/client.c between versions 1.1.2.12 and 1.4

version 1.1.2.12, 2012/01/05 10:26:02 version 1.4, 2012/07/03 12:46:00
Line 1 Line 1
   /*************************************************************************
   * (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
   *  by Michael Pounov <misho@openbsd-bg.org>
   *
   * $Author$
   * $Id$
   *
   **************************************************************************
   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 <info@elwix.org>
   
   Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
           by Michael Pounov <misho@elwix.org>.  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 <misho@elwix.org>
   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 "global.h"
 #include "mqtt.h"  #include "mqtt.h"
 #include "client.h"  #include "client.h"
   
   
 int  int
 InitClient(void)  
 {  
         int sock;  
   
         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;  
         }  
   
         return sock;  
 }  
   
 int  
 ConnectClient(int sock)  ConnectClient(int sock)
 {  {
         int siz = 0;          int siz = 0;
Line 56  ConnectClient(int sock) Line 83  ConnectClient(int sock)
         if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL))          if (pfd.revents & (POLLERR | POLLHUP | POLLNVAL))
                 return -1;                  return -1;
   
           memset(args->msg->msg_base, 0, args->msg->msg_len);
         siz = recv(sock, args->msg->msg_base, args->msg->msg_len, 0);          siz = recv(sock, args->msg->msg_base, args->msg->msg_len, 0);
         if (siz == -1) {          if (siz == -1) {
                 printf("Error:: recv() #%d - %s\n", errno, strerror(errno));                  printf("Error:: recv() #%d - %s\n", errno, strerror(errno));
Line 66  ConnectClient(int sock) Line 94  ConnectClient(int sock)
         return (u_char) mqtt_readCONNACK(args->msg);          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;  
         }  
         if (SendTo(sock, siz) == -1)  
                 return -1;  
   
         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 mqtt_readPINGRESP(args->msg);  
 }  
   
 void *  void *
 OpenFile(void)  OpenFile(void)
 {  {
Line 164  CloseFile(void) Line 132  CloseFile(void)
 inline int  inline int
 SendTo(int sock, int siz)  SendTo(int sock, int siz)
 {  {
        siz = send(sock, args->msg->msg_base, siz, 0);        siz = send(sock, args->msg->msg_base, siz, MSG_NOSIGNAL);
         if (siz == -1) {          if (siz == -1) {
                 printf("Error:: send() #%d - %s\n", errno, strerror(errno));                  printf("Error:: send() #%d - %s\n", errno, strerror(errno));
                 return -1;                  return -1;
         } else          } else
                ioVERBOSE(3) printf("Sended PUBLISH %d bytes\n", siz);                ioVERBOSE(3) printf("Sended %d bytes\n", siz);
   
         return siz;          return siz;
 }  }
Line 180  RecvFrom(int sock) Line 148  RecvFrom(int sock)
         struct pollfd pfd;          struct pollfd pfd;
         int siz = 0;          int siz = 0;
   
           memset(args->msg->msg_base, 0, args->msg->msg_len);
   
         pfd.fd = sock;          pfd.fd = sock;
         pfd.events = POLLIN | POLLPRI;          pfd.events = POLLIN | POLLPRI;
         do {          do {
Line 189  RecvFrom(int sock) Line 159  RecvFrom(int sock)
                                 return -1;                                  return -1;
                         case 0:                          case 0:
                                 ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);                                  ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);
                                if (KAClient(sock) == -1)                                if (mqtt_KeepAlive(sock, args->ka, 1) == -1)
                                         return -1;                                          return -1;
                                 continue;                                  continue;
                 }                  }
Removed from v.1.1.2.12  
changed lines
  Added in v.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>