--- libaitmqtt/src/aitmqtt.c 2012/04/07 21:02:48 1.1.1.1.2.4 +++ libaitmqtt/src/aitmqtt.c 2022/09/15 15:04:44 1.3.4.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitmqtt.c,v 1.1.1.1.2.4 2012/04/07 21:02:48 misho Exp $ +* $Id: aitmqtt.c,v 1.3.4.5 2022/09/15 15:04:44 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 - 2022 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -54,21 +54,21 @@ char mqtt_Error[STRSIZ]; #pragma GCC visibility pop // mqtt_GetErrno() Get error code of last operation -inline int +int mqtt_GetErrno() { return mqtt_Errno; } // mqtt_GetError() Get error text of last operation -inline const char * +const char * mqtt_GetError() { return mqtt_Error; } // mqtt_SetErr() Set error to variables for internal use!!! -inline void +void mqtt_SetErr(int eno, char *estr, ...) { va_list lst; @@ -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 */ -inline 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 */ -inline void -mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all) +void +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; @@ -132,12 +110,12 @@ mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all) * @len = >0 Allocate buffer with length * return: NULL error or Message, after use must call mqtt_msgFree() with all!=0 */ -inline mqtt_msg_t * -mqtt_msgAlloc(u_short len) +mqtt_msg_t * +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); @@ -165,8 +143,8 @@ mqtt_msgAlloc(u_short len) * @len = new length * return: -1 error or >-1 old buffer length */ -inline int -mqtt_msgRealloc(mqtt_msg_t * __restrict msg, u_short len) +int +mqtt_msgRealloc(mqtt_msg_t * __restrict msg, u_int len) { void *p = NULL; int ret = 0; @@ -174,10 +152,10 @@ mqtt_msgRealloc(mqtt_msg_t * __restrict msg, u_short l if (!msg) return -1; - if (len == msg->msg_len) + 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; @@ -191,18 +169,50 @@ mqtt_msgRealloc(mqtt_msg_t * __restrict msg, u_short l } /* + * mqtt_msgDup() - Duplicate message buffer + * + * @msg = Message + * return: NULL error or !=NULL duplicated message, after use must call mqtt_msgFree() with all!=0 + */ +mqtt_msg_t * +mqtt_msgDup(mqtt_msg_t * __restrict msg) +{ + mqtt_msg_t *m = NULL; + + m = e_malloc(sizeof(mqtt_msg_t)); + if (!m) { + LOGERR; + return NULL; + } else + memset(m, 0, sizeof(mqtt_msg_t)); + + if (msg->msg_len) { + m->msg_len = msg->msg_len; + m->msg_base = e_malloc(m->msg_len); + if (!m->msg_base) { + LOGERR; + e_free(m); + return NULL; + } else + memcpy(m->msg_base, msg->msg_base, m->msg_len); + } + + return m; +} + +/* * mqtt_encodeLen() Encode number to MQTT length field * * @num = number for encode * return: -1 error or >-1 length */ -inline u_int +u_int 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++) { @@ -224,7 +234,7 @@ mqtt_encodeLen(u_int num) * @n = sizeof bytes, if !=NULL * return: -1 error, >-1 length of message */ -inline u_int +u_int mqtt_decodeLen(void * __restrict len, int * __restrict n) { register u_int i, dig, mul; @@ -244,6 +254,7 @@ mqtt_decodeLen(void * __restrict len, int * __restrict if (n) *n = (char) (i & 0x7f) + 1; + return ret; } @@ -253,7 +264,7 @@ mqtt_decodeLen(void * __restrict len, int * __restrict * @len = length * return: -1 error, >-1 sizeof len in bytes */ -inline char +char mqtt_sizeLen(u_int len) { register char i; @@ -270,16 +281,36 @@ mqtt_sizeLen(u_int len) } /* - * mqtt_str2sub Create MQTT subscribe variable from string(s) + * mqtt_pktLen() - Get total packet length * - * @csStr = strings - * @strnum = number of strings elements + * @hdr = MQTT packet header + * return: packet length + */ +u_int +mqtt_pktLen(struct mqtthdr * __restrict hdr) +{ + int siz, n = 0; + + if (!hdr) + return 0; + + siz = mqtt_decodeLen(hdr->mqtt_len, &n); + siz += sizeof(struct mqtthdr) + n - 1; + + return siz; +} + +/* + * mqtt_str2subs Create MQTT subscribe variable from string(s) + * + * @csStr = null terminated string array + * @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() */ -inline mqtt_subscr_t * -mqtt_str2sub(const char **csStr, u_short strnum, u_char *qoses) +mqtt_subscr_t * +mqtt_strs2subs(const char **csStr, u_short strnum, u_char *qoses) { mqtt_subscr_t *v; register int i, items; @@ -287,13 +318,12 @@ mqtt_str2sub(const char **csStr, u_short strnum, u_cha if (!csStr) return NULL; - for (items = 0, strs = csStr; *strs; items++, strs++) - if (strnum && items >= strnum) { - items = strnum; - break; - } - if (!(v = malloc((items + 1) * sizeof(mqtt_subscr_t)))) { + for (items = 0, strs = csStr; + (!strnum || (strnum && items < strnum)) && *strs; + items++, strs++); + + if (!(v = e_malloc((items + 1) * sizeof(mqtt_subscr_t)))) { LOGERR; return NULL; } else @@ -301,9 +331,9 @@ mqtt_str2sub(const char **csStr, u_short strnum, u_cha 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]; + v[i].sub_qos = qoses[i]; } return v; @@ -315,7 +345,7 @@ mqtt_str2sub(const char **csStr, u_short strnum, u_cha * @subs = Subscribe variables * return: none */ -inline void +void mqtt_subFree(mqtt_subscr_t ** __restrict subs) { mqtt_subscr_t *v; @@ -324,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; } @@ -345,12 +375,12 @@ mqtt_subFree(mqtt_subscr_t ** __restrict subs) * @num = Number of elements * return: NULL error or subscribe array, after use must call mqtt_subFree() */ -inline mqtt_subscr_t * +mqtt_subscr_t * 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; @@ -367,19 +397,86 @@ mqtt_subAlloc(u_short num) * @num = Number of elements * return: NULL error or subscribe array, after use must call mqtt_subFree() */ -inline mqtt_subscr_t * -mqtt_subRealloc(mqtt_subscr_t * __restrict subs, 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; - s = realloc(subs, (num + 1) * sizeof(mqtt_subscr_t)); + if (!subs) + return NULL; + + 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; + } else { + memset(s + num, 0, sizeof(mqtt_subscr_t)); + *subs = s; } - return s; + return *subs; } + +/* + * mqtt_subCopy() - Copy subscription structure to another one + * + * @dst = destination subscription + * @src = source subscription + * return: =NULL error or !=NULL successful copied a structure + */ +mqtt_subscr_t * +mqtt_subCopy(mqtt_subscr_t * __restrict dst, mqtt_subscr_t * __restrict src) +{ + if (!dst || !src) + return NULL; + + if (src->sub_topic.msg_base) { + 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)); + return NULL; + } else { + dst->sub_topic.msg_len = src->sub_topic.msg_len; + ((char*) dst->sub_topic.msg_base)[dst->sub_topic.msg_len] = 0; + memcpy(dst->sub_topic.msg_base, src->sub_topic.msg_base, + dst->sub_topic.msg_len); + } + } else { + dst->sub_topic.msg_base = NULL; + dst->sub_topic.msg_len = 0; + } + + if (src->sub_value.msg_base) { + 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) + e_free(dst->sub_topic.msg_base); + memset(dst, 0, sizeof(mqtt_subscr_t)); + return NULL; + } else { + dst->sub_value.msg_len = src->sub_value.msg_len; + ((char*) dst->sub_value.msg_base)[dst->sub_value.msg_len] = 0; + memcpy(dst->sub_value.msg_base, src->sub_value.msg_base, + dst->sub_value.msg_len); + } + } else { + dst->sub_value.msg_base = NULL; + dst->sub_value.msg_len = 0; + } + + dst->sub_qos = src->sub_qos; + return dst; +} + /* * mqtt_expandTopic() - Expanding topic to regular expression