--- libaitmqtt/src/aitmqtt.c 2012/01/26 13:07:33 1.1 +++ libaitmqtt/src/aitmqtt.c 2012/06/20 15:02:24 1.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitmqtt.c,v 1.1 2012/01/26 13:07:33 misho Exp $ +* $Id: aitmqtt.c,v 1.2 2012/06/20 15:02:24 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 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -53,10 +53,6 @@ char mqtt_Error[STRSIZ]; #pragma GCC visibility pop -// -// Error maintenance functions ... -// - // mqtt_GetErrno() Get error code of last operation inline int mqtt_GetErrno() @@ -85,7 +81,7 @@ mqtt_SetErr(int eno, char *estr, ...) } #pragma GCC visibility push(hidden) -// _mqtt_readHEADER() read fixed header from MQTT message +/* _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) { @@ -106,7 +102,6 @@ _mqtt_readHEADER(mqtt_msg_t * __restrict buf, u_char c } #pragma GCC visibility pop -// ---------------------------------------------------------- /* * mqtt_msgFree() Free MQTT message @@ -179,7 +174,7 @@ 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); @@ -196,6 +191,38 @@ 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 + */ +inline mqtt_msg_t * +mqtt_msgDup(mqtt_msg_t * __restrict msg) +{ + mqtt_msg_t *m = NULL; + + m = 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 = malloc(m->msg_len); + if (!m->msg_base) { + LOGERR; + 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 @@ -275,16 +302,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 + */ +inline 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 * @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_str2subs(const char **csStr, u_short strnum, u_char *qoses) { mqtt_subscr_t *v; register int i, items; @@ -292,12 +339,11 @@ 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; - } + for (items = 0, strs = csStr; + (!strnum || (strnum && items < strnum)) && *strs; + items++, strs++); + if (!(v = malloc((items + 1) * sizeof(mqtt_subscr_t)))) { LOGERR; return NULL; @@ -373,15 +419,242 @@ mqtt_subAlloc(u_short num) * 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_subRealloc(mqtt_subscr_t ** __restrict subs, u_short num) { mqtt_subscr_t *s = NULL; - s = realloc(subs, (num + 1) * sizeof(mqtt_subscr_t)); + if (!subs) + return NULL; + + s = 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 + */ +inline 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 = 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 { + /* + 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); + if (!dst->sub_value.msg_base) { + LOGERR; + if (dst->sub_topic.msg_base) + 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 { + /* + if (dst->sub_value.msg_base) + free(dst->sub_value.msg_base); + */ + dst->sub_value.msg_base = NULL; + dst->sub_value.msg_len = 0; + } + + dst->sub_ret = src->sub_ret; + return dst; +} + + +/* + * mqtt_expandTopic() - Expanding topic to regular expression + * + * @csInput = Input topic + * @psRegEx = Output to regular expression + * @regexLen = Length of psRegEx + * @BOL = Begin of Line, if =0 not added + * @EOL = End of Line, if =0 not appended + * return: -1 error, 0 nothing expanded or >0 expanded bytes + */ +int +mqtt_expandTopic(const char *csInput, char * __restrict psRegEx, int regexLen, u_char BOL, u_char EOL) +{ + int ret = 0; + register int i; + char *pos, *s; + const char reROM[] = "[](){}^$\\-|?.+*"; + + if (!csInput || !psRegEx || regexLen < 1) + return -1; + else + memset(psRegEx, 0, regexLen); + + /* check # */ + for (i = 0, pos = (char*) csInput; *pos && i < 2; pos++) + if (*pos == '#') + i++; + if (i == 2) { + mqtt_SetErr(EINVAL, "Syntax error, multiple occurrences of #..#"); + return -1; + } + if (i == 1 && (pos = strrchr(csInput, '#'))) + if ((pos != csInput && *(pos - 1) != '/') || *(pos + 1)) { + mqtt_SetErr(EINVAL, "Syntax error, bad format of #"); + return -1; + } + /* check + */ + for (pos = (char*) csInput; *pos && (pos = strchr(pos, '+')); pos++) + if ((pos != csInput && *(pos - 1) != '/') || (*(pos + 1) && *(pos + 1) != '/')) { + mqtt_SetErr(EINVAL, "Syntax error, bad format of +"); + return -1; + } + + /* BUILD REGEX */ + s = psRegEx; + if (BOL) { + *s++ = '^'; + ret++; + } + for (pos = (char*) csInput; s < psRegEx + regexLen && *pos; s++, pos++) { + if (*pos == '#') { + strlcat(s, ".*", regexLen - (s - psRegEx)); + s++; + ret++; + break; + } + if (*pos == '+') { + if (*(pos + 1)) { + strlcat(s, ".*", regexLen - (s - psRegEx)); + s++; + ret++; + continue; + } else { + strlcat(s, ".*/", regexLen - (s - psRegEx)); + ret += 2; + break; + } + } + for (i = 0; i < sizeof reROM - 1; i++) + if (*pos == reROM[i] && regexLen - (s - psRegEx) - 1 > 0) { + *s++ = '\\'; + ret++; + break; + } + + *s = *pos; + } + if (EOL) { + strlcat(psRegEx, "$", regexLen); + ret++; + } + + return ret; +} + +/* + * mqtt_sqlTopic() - Expanding topic to SQL search string + * + * @csInput = Input topic + * @psSQL = Output to SQL search string + * @sqlLen = Length of psSQL + * return: -1 error, 0 changed bytes + */ +int +mqtt_sqlTopic(const char *csInput, char * __restrict psSQL, int sqlLen) +{ + int ret = 0; + register int i; + char *pos, *s; + + if (!csInput || !psSQL || sqlLen < 1) + return -1; + else + memset(psSQL, 0, sqlLen); + + /* check # */ + for (i = 0, pos = (char*) csInput; *pos && i < 2; pos++) + if (*pos == '#') + i++; + if (i == 2) { + mqtt_SetErr(EINVAL, "Syntax error, multiple occurrences of #..#"); + return -1; + } + if (i == 1 && (pos = strrchr(csInput, '#'))) + if ((pos != csInput && *(pos - 1) != '/') || *(pos + 1)) { + mqtt_SetErr(EINVAL, "Syntax error, bad format of #"); + return -1; + } + /* check + */ + for (pos = (char*) csInput; *pos && (pos = strchr(pos, '+')); pos++) + if ((pos != csInput && *(pos - 1) != '/') || (*(pos + 1) && *(pos + 1) != '/')) { + mqtt_SetErr(EINVAL, "Syntax error, bad format of +"); + return -1; + } + + /* BUILD SEARCH STRING */ + s = psSQL; + for (pos = (char*) csInput; s < psSQL + sqlLen && *pos; s++, pos++) { + if (*pos == '#') { + *s = '%'; + s++; + ret++; + break; + } + if (*pos == '+') { + if (*(pos + 1)) { + *s = '%'; + ret++; + continue; + } else { + strlcat(s, "%/", sqlLen - (s - psSQL)); + ret += 2; + break; + } + } + /* + for (i = 0; i < sizeof reROM - 1; i++) + if (*pos == reROM[i] && regexLen - (s - psRegEx) - 1 > 0) { + *s++ = '\\'; + ret++; + break; + } + */ + + *s = *pos; + } + + return ret; }