--- libaitmqtt/src/cliside.c 2012/06/20 15:02:24 1.2 +++ libaitmqtt/src/cliside.c 2016/09/14 15:52:36 1.3.12.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cliside.c,v 1.2 2012/06/20 15:02:24 misho Exp $ +* $Id: cliside.c,v 1.3.12.1 2016/09/14 15:52:36 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ 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 +Copyright 2004 - 2016 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -75,7 +75,13 @@ mqtt_cli_Open(struct sockaddr *addr, u_short timeout) free(cli); return NULL; } +#ifndef __linux__ if (connect(cli->sock, addr, addr->sa_len) == -1) { +#else + if (connect(cli->sock, addr, addr->sa_family == AF_INET6 ? + sizeof(struct sockaddr_in6) : + sizeof(struct sockaddr_in)) == -1) { +#endif LOGERR; close(cli->sock); free(cli); @@ -152,7 +158,8 @@ mqtt_cli_Subscribe(mqtt_cli_t * __restrict cli, mqtt_s if (siz == -1) { LOGERR; return NULL; - } + } else + memset(cli->buf->msg_base, 0, cli->buf->msg_len); if ((siz = mqtt_wait4data(cli->sock, cli->timeout, POLLIN | POLLPRI)) == -1) { return NULL; @@ -204,7 +211,8 @@ mqtt_cli_Unsubscribe(mqtt_cli_t * __restrict cli, mqtt if (siz == -1) { LOGERR; return -1; - } + } else + memset(cli->buf->msg_base, 0, cli->buf->msg_len); if ((siz = mqtt_wait4data(cli->sock, cli->timeout, POLLIN | POLLPRI)) == -1) { return -1; @@ -258,8 +266,10 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short if (siz == -1) { LOGERR; return -1; - } else + } else { wlen = siz; + memset(cli->buf->msg_base, 0, cli->buf->msg_len); + } if (QoS == MQTT_QOS_ONCE) /* no reply */ goto end; @@ -304,7 +314,8 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short if (siz == -1) { LOGERR; return -1; - } + } else + memset(cli->buf->msg_base, 0, cli->buf->msg_len); if ((siz = mqtt_wait4data(cli->sock, cli->timeout, POLLIN | POLLPRI)) == -1) { return -1; @@ -316,6 +327,12 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short } /* receive PUBCOMP */ + siz = recv(cli->sock, cli->buf->msg_base, cli->buf->msg_len, 0); + if (siz == -1) { + LOGERR; + return -1; + } + siz = mqtt_readPUBCOMP(cli->buf); if (siz == -1) return -1;