--- libaitmqtt/src/aitmqtt.c 2012/04/25 16:25:52 1.1.1.1.2.6 +++ libaitmqtt/src/aitmqtt.c 2012/06/11 08:37:41 1.1.1.1.2.15 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitmqtt.c,v 1.1.1.1.2.6 2012/04/25 16:25:52 misho Exp $ +* $Id: aitmqtt.c,v 1.1.1.1.2.15 2012/06/11 08:37:41 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -191,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 @@ -270,16 +302,16 @@ mqtt_sizeLen(u_int len) } /* - * mqtt_str2sub Create MQTT subscribe variable from string(s) + * mqtt_str2subs Create MQTT subscribe variable from string(s) * - * @csStr = strings - * @strnum = number of strings elements + * @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; @@ -287,12 +319,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; @@ -368,20 +399,87 @@ 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 @@ -538,66 +636,5 @@ mqtt_sqlTopic(const char *csInput, char * __restrict p *s = *pos; } - return ret; -} - - -/* - * mqtt_KeepAlive() - Keep Alive check routine - * - * @sock = connected socket - * @ka = keep alive timeout - * @tries = tries for receive correct ping response, usually ==1 - * return: -1 error, 0 host is alive, 1 timeout session or 2 broken session - */ -int -mqtt_KeepAlive(int sock, u_short ka, u_char tries) -{ - int ret = 0; - struct pollfd pfd; - mqtt_msg_t msg = { NULL, 0 }; - - if (sock < 3) - return -1; /* error */ - - pfd.fd = sock; - pfd.events = POLLOUT; - if ((ret = poll(&pfd, 1, ka * 1000)) == -1 || - pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { - LOGERR; - return -1; /* error */ - } else if (!ret) - return 1; /* session is abandoned ... must be disconnect! */ - /* ping request */ - if ((ret = mqtt_msgPINGREQ(&msg)) == -1) - return -1; /* error */ - if ((ret = send(sock, msg.msg_base, ret, MSG_NOSIGNAL)) == -1) { - LOGERR; - goto end; - } - - pfd.events = POLLIN | POLLPRI; - while (tries--) { - if ((ret = poll(&pfd, 1, ka * 1000)) == -1 || - pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { - LOGERR; - break; - } else if (!ret) { - ret = 1; /* session is abandoned ... must be disconnect! */ - continue; - } - /* receive & decode packet */ - if ((ret = recv(sock, msg.msg_base, msg.msg_len, 0)) == -1) { - LOGERR; - break; - } - if (!mqtt_readPINGRESP(&msg)) { - ret = 0; /* Host is alive */ - break; - } else - ret = 2; /* Session is broken ... must be disconnect! */ - } -end: - free(msg.msg_base); return ret; }