--- libaitmqtt/src/aitmqtt.c 2013/05/30 09:18:33 1.3 +++ libaitmqtt/src/aitmqtt.c 2022/09/14 14:32:48 1.3.4.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitmqtt.c,v 1.3 2013/05/30 09:18:33 misho Exp $ +* $Id: aitmqtt.c,v 1.3.4.4 2022/09/14 14:32:48 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, 2013 +Copyright 2004 - 2022 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -80,46 +80,24 @@ mqtt_SetErr(int eno, char *estr, ...) va_end(lst); } -#pragma GCC visibility push(hidden) -/* _mqtt_readHEADER() read fixed header from MQTT message */ -struct mqtthdr * -_mqtt_readHEADER(mqtt_msg_t * __restrict buf, u_char cmd, int *bytes, int *len) -{ - struct mqtthdr *hdr; - if (!buf || !buf->msg_base || !buf->msg_len) - return NULL; - - hdr = (struct mqtthdr*) buf->msg_base; - if (hdr->mqtt_msg.type != cmd) { - mqtt_SetErr(EINVAL, "Error:: wrong command #%d should be %d", - hdr->mqtt_msg.type, cmd); - return NULL; - } - - *len = mqtt_decodeLen(hdr->mqtt_len, bytes); - return hdr; -} -#pragma GCC visibility pop - - /* * mqtt_msgFree() Free MQTT message * * @msg = Message buffer - * @all = !=0 Destroy entire message, if MQTT Message allocated with mqtt_msgAlloc() + * @keepmsg = !=0 just free message content * return: none */ void -mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all) +mqtt_msgFree(mqtt_msg_t ** __restrict msg, int keepmsg) { if (msg && *msg) { if ((*msg)->msg_base) { - free((*msg)->msg_base); + e_free((*msg)->msg_base); (*msg)->msg_base = NULL; } - if (all) { - free(*msg); + if (!keepmsg) { + e_free(*msg); *msg = NULL; } else (*msg)->msg_len ^= (*msg)->msg_len; @@ -133,11 +111,11 @@ mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all) * return: NULL error or Message, after use must call mqtt_msgFree() with all!=0 */ mqtt_msg_t * -mqtt_msgAlloc(u_short len) +mqtt_msgAlloc(u_int len) { mqtt_msg_t *m = NULL; - m = malloc(sizeof(mqtt_msg_t)); + m = e_malloc(sizeof(mqtt_msg_t)); if (!m) { LOGERR; return NULL; @@ -146,10 +124,10 @@ mqtt_msgAlloc(u_short len) if (len) { m->msg_len = len; - m->msg_base = malloc(m->msg_len); + m->msg_base = e_malloc(m->msg_len); if (!m->msg_base) { LOGERR; - free(m); + e_free(m); return NULL; } else memset(m->msg_base, 0, m->msg_len); @@ -166,7 +144,7 @@ mqtt_msgAlloc(u_short len) * return: -1 error or >-1 old buffer length */ int -mqtt_msgRealloc(mqtt_msg_t * __restrict msg, u_short len) +mqtt_msgRealloc(mqtt_msg_t * __restrict msg, u_int len) { void *p = NULL; int ret = 0; @@ -177,7 +155,7 @@ mqtt_msgRealloc(mqtt_msg_t * __restrict msg, u_short l if (len <= msg->msg_len) return len; - p = realloc(msg->msg_base, len); + p = e_realloc(msg->msg_base, len); if (!p) { LOGERR; return -1; @@ -201,7 +179,7 @@ mqtt_msgDup(mqtt_msg_t * __restrict msg) { mqtt_msg_t *m = NULL; - m = malloc(sizeof(mqtt_msg_t)); + m = e_malloc(sizeof(mqtt_msg_t)); if (!m) { LOGERR; return NULL; @@ -210,10 +188,10 @@ mqtt_msgDup(mqtt_msg_t * __restrict msg) if (msg->msg_len) { m->msg_len = msg->msg_len; - m->msg_base = malloc(m->msg_len); + m->msg_base = e_malloc(m->msg_len); if (!m->msg_base) { LOGERR; - free(m); + e_free(m); return NULL; } else memcpy(m->msg_base, msg->msg_base, m->msg_len); @@ -234,7 +212,7 @@ mqtt_encodeLen(u_int num) register u_int dig, i; u_int ret = 0; - if (num > 268435455) + if (num > MQTT_DATA_MAX) return (u_int) -1; for (i = 0; i < sizeof ret && num > 0; i++) { @@ -276,6 +254,7 @@ mqtt_decodeLen(void * __restrict len, int * __restrict if (n) *n = (char) (i & 0x7f) + 1; + return ret; } @@ -325,13 +304,13 @@ mqtt_pktLen(struct mqtthdr * __restrict hdr) * mqtt_str2subs Create MQTT subscribe variable from string(s) * * @csStr = null terminated string array - * @strnum = copy at most number of strings elements + * @strnum = copy at most number of strings elements, ==0 till NULL element * @qoses = QoS elements applied to subscribe variable, * count of elements must be equal with csStr elements * return: NULL error or != subscribe variables array, must be free after use with mqtt_freeSub() */ mqtt_subscr_t * -mqtt_str2subs(const char **csStr, u_short strnum, u_char *qoses) +mqtt_strs2subs(const char **csStr, u_short strnum, u_char *qoses) { mqtt_subscr_t *v; register int i, items; @@ -344,7 +323,7 @@ mqtt_str2subs(const char **csStr, u_short strnum, u_ch (!strnum || (strnum && items < strnum)) && *strs; items++, strs++); - if (!(v = malloc((items + 1) * sizeof(mqtt_subscr_t)))) { + if (!(v = e_malloc((items + 1) * sizeof(mqtt_subscr_t)))) { LOGERR; return NULL; } else @@ -352,7 +331,7 @@ mqtt_str2subs(const char **csStr, u_short strnum, u_ch for (i = 0; i < items; i++) { v[i].sub_topic.msg_len = strlen(csStr[i]); - v[i].sub_topic.msg_base = (u_char*) strdup(csStr[i]); + v[i].sub_topic.msg_base = (u_char*) e_strdup(csStr[i]); if (qoses && qoses[i] < MQTT_QOS_RESERVED) v[i].sub_ret = qoses[i]; } @@ -375,18 +354,18 @@ mqtt_subFree(mqtt_subscr_t ** __restrict subs) return; for (v = *subs; v->sub_topic.msg_base; v++) { - free(v->sub_topic.msg_base); + e_free(v->sub_topic.msg_base); v->sub_topic.msg_base = NULL; v->sub_topic.msg_len = 0; if (v->sub_value.msg_base) { - free(v->sub_value.msg_base); + e_free(v->sub_value.msg_base); v->sub_value.msg_base = NULL; v->sub_value.msg_len = 0; } } - free(*subs); + e_free(*subs); *subs = NULL; } @@ -401,7 +380,7 @@ mqtt_subAlloc(u_short num) { mqtt_subscr_t *s = NULL; - s = malloc((num + 1) * sizeof(mqtt_subscr_t)); + s = e_malloc((num + 1) * sizeof(mqtt_subscr_t)); if (!s) { LOGERR; return NULL; @@ -421,12 +400,19 @@ mqtt_subAlloc(u_short num) mqtt_subscr_t * mqtt_subRealloc(mqtt_subscr_t ** __restrict subs, u_short num) { - mqtt_subscr_t *s = NULL; + mqtt_subscr_t *ss, *s = NULL; + register int i; if (!subs) return NULL; - s = realloc(*subs, (num + 1) * sizeof(mqtt_subscr_t)); + for (i = 0, ss = *subs; ss; i++, ss++); + if (i < num) + return NULL; + if (i == num) + return *subs; + + s = e_realloc(*subs, (num + 1) * sizeof(mqtt_subscr_t)); if (!s) { LOGERR; return NULL; @@ -452,7 +438,7 @@ mqtt_subCopy(mqtt_subscr_t * __restrict dst, mqtt_subs return NULL; if (src->sub_topic.msg_base) { - dst->sub_topic.msg_base = malloc(src->sub_topic.msg_len + 1); + dst->sub_topic.msg_base = e_malloc(src->sub_topic.msg_len + 1); if (!dst->sub_topic.msg_base) { LOGERR; memset(dst, 0, sizeof(mqtt_subscr_t)); @@ -464,19 +450,16 @@ mqtt_subCopy(mqtt_subscr_t * __restrict dst, mqtt_subs dst->sub_topic.msg_len); } } else { - /* - if (dst->sub_topic.msg_base) - free(dst->sub_topic.msg_base); - */ dst->sub_topic.msg_base = NULL; dst->sub_topic.msg_len = 0; } + if (src->sub_value.msg_base) { - dst->sub_value.msg_base = malloc(src->sub_value.msg_len + 1); + dst->sub_value.msg_base = e_malloc(src->sub_value.msg_len + 1); if (!dst->sub_value.msg_base) { LOGERR; if (dst->sub_topic.msg_base) - free(dst->sub_topic.msg_base); + e_free(dst->sub_topic.msg_base); memset(dst, 0, sizeof(mqtt_subscr_t)); return NULL; } else { @@ -486,10 +469,6 @@ mqtt_subCopy(mqtt_subscr_t * __restrict dst, mqtt_subs dst->sub_value.msg_len); } } else { - /* - if (dst->sub_value.msg_base) - free(dst->sub_value.msg_base); - */ dst->sub_value.msg_base = NULL; dst->sub_value.msg_len = 0; }