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

Diff for /libaitmqtt/src/cmds.c between versions 1.2.6.1 and 1.4.2.3

version 1.2.6.1, 2012/06/29 15:23:10 version 1.4.2.3, 2022/09/15 15:48:41
Line 1 Line 1
   /*************************************************************************
   * (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
   *  by Michael Pounov <misho@elwix.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 - 2022
           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"
   
   
 #pragma GCC visibility push(hidden)  #pragma GCC visibility push(hidden)
   
inline intint
 mqtt_wait4data(int sock, u_short ka, short events)  mqtt_wait4data(int sock, u_short ka, short events)
 {  {
         int ret = 0;          int ret = 0;
Line 39  int Line 84  int
 mqtt_KeepAlive(int sock, u_short ka, u_char tries)  mqtt_KeepAlive(int sock, u_short ka, u_char tries)
 {  {
         int ret = 0;          int ret = 0;
        mqtt_msg_t msg = { NULL, 0 };        mqtt_msg_t *msg = NULL;
   
         if (sock < 3)          if (sock < 3)
                 return -1;      /* error */                  return -1;      /* error */
Line 47  mqtt_KeepAlive(int sock, u_short ka, u_char tries) Line 92  mqtt_KeepAlive(int sock, u_short ka, u_char tries)
         if ((ret = mqtt_wait4data(sock, ka, POLLOUT)))          if ((ret = mqtt_wait4data(sock, ka, POLLOUT)))
                 return ret;                  return ret;
         /* ping request */          /* ping request */
        if ((ret = mqtt_msgPINGREQ(&msg)) == -1)        if (!(msg = mqtt_msgPINGREQ()))
                 return -1;      /* error */                  return -1;      /* error */
        if ((ret = send(sock, msg.msg_base, ret, MSG_NOSIGNAL)) == -1) {        if ((ret = send(sock, msg->msg_base, msg->msg_len, MSG_NOSIGNAL)) == -1) {
                 LOGERR;                  LOGERR;
                 goto end;                  goto end;
        }        } else
                 mqtt_msgFree(&msg, 0);
   
         while (tries--) {          while (tries--) {
                 if ((ret = mqtt_wait4data(sock, ka, POLLIN | POLLPRI))) {                  if ((ret = mqtt_wait4data(sock, ka, POLLIN | POLLPRI))) {
Line 62  mqtt_KeepAlive(int sock, u_short ka, u_char tries) Line 108  mqtt_KeepAlive(int sock, u_short ka, u_char tries)
                                 continue;                                  continue;
                 }                  }
                 /* receive & decode packet */                  /* receive & decode packet */
                if ((ret = recv(sock, msg.msg_base, msg.msg_len, 0)) == -1) {                msg = mqtt_msgAlloc(BUFSIZ);
                 if (!msg) {
                         ret = -1;
                         break;
                 }
                 if ((ret = recv(sock, msg->msg_base, msg->msg_len, 0)) == -1) {
                         LOGERR;                          LOGERR;
                         break;                          break;
                 }                  }
                if (!mqtt_readPINGRESP(&msg)) {                if (!mqtt_readPINGRESP(msg)) {
                         ret = 0;        /* Host is alive */                          ret = 0;        /* Host is alive */
                         break;                          break;
                 } else                  } else
                         ret = 2;        /* Session is broken ... must be disconnect! */                          ret = 2;        /* Session is broken ... must be disconnect! */
                   mqtt_msgFree(&msg, 0);
         }          }
 end:  end:
        free(msg.msg_base);        mqtt_msgFree(&msg, 0);
         return ret;          return ret;
 }  }
   
Line 90  int Line 142  int
 mqtt_WillMessage(int sock, u_short ka, const char *topic, const char *data)  mqtt_WillMessage(int sock, u_short ka, const char *topic, const char *data)
 {  {
         int ret = 0;          int ret = 0;
        mqtt_msg_t msg = { NULL, 0 };        mqtt_msg_t *msg = NULL;
   
         if (!topic)          if (!topic)
                 return -1;      /* error */                  return -1;      /* error */
Line 98  mqtt_WillMessage(int sock, u_short ka, const char *top Line 150  mqtt_WillMessage(int sock, u_short ka, const char *top
         /* will message */          /* will message */
         if ((ret = mqtt_wait4data(sock, ka, POLLOUT)))          if ((ret = mqtt_wait4data(sock, ka, POLLOUT)))
                 return ret;                  return ret;
        ret = mqtt_msgPUBLISH(&msg, topic, 0xDEAD, 0, 1, 0, data, data ? strlen(data) : 0);        msg = mqtt_msgPUBLISH(topic, 0xDEAD, 0, 1, 0, data, data ? strlen(data) : 0);
        if (ret == -1)        if (!msg)
                 return -1;      /* error */                  return -1;      /* error */
        if ((ret = send(sock, msg.msg_base, ret, MSG_NOSIGNAL)) == -1) {        if ((ret = send(sock, msg->msg_base, msg->msg_len, MSG_NOSIGNAL)) == -1) {
                 LOGERR;                  LOGERR;
                free(msg.msg_base);                mqtt_msgFree(&msg, 0);
                 return -1;      /* error */                  return -1;      /* error */
         } else          } else
                memset(msg.msg_base, 0, msg.msg_len);                mqtt_msgFree(&msg, 0);
   
         /* will ack */          /* will ack */
        if ((ret = mqtt_wait4data(sock, ka, POLLIN | POLLPRI))) {        if ((ret = mqtt_wait4data(sock, ka, POLLIN | POLLPRI)))
                free(msg.msg_base); 
                 return ret;                  return ret;
         }  
         /* receive & decode packet */          /* receive & decode packet */
        if ((ret = recv(sock, msg.msg_base, msg.msg_len, 0)) == -1) {        msg = mqtt_msgAlloc(BUFSIZ);
         if (!msg)
                 return -1;
         if ((ret = recv(sock, msg->msg_base, msg->msg_len, 0)) == -1) {
                 LOGERR;                  LOGERR;
                free(msg.msg_base);                mqtt_msgFree(&msg, 0);
                 return -1;      /* error */                  return -1;      /* error */
         }          }
        if (mqtt_readPUBACK(&msg))        if (mqtt_readPUBACK(msg))
                 ret = 0;        /* ok */                  ret = 0;        /* ok */
         else          else
                 ret = 2;        /* semi-error */                  ret = 2;        /* semi-error */
           mqtt_msgFree(&msg, 0);
   
         free(msg.msg_base);  
         return ret;          return ret;
 }  }
Removed from v.1.2.6.1  
changed lines
  Added in v.1.4.2.3

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