--- libaitmqtt/src/aitmqtt.c 2012/04/26 15:38:32 1.1.1.1.2.8 +++ libaitmqtt/src/aitmqtt.c 2013/05/26 20:27:58 1.2.10.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitmqtt.c,v 1.1.1.1.2.8 2012/04/26 15:38:32 misho Exp $ +* $Id: aitmqtt.c,v 1.2.10.1 2013/05/26 20:27:58 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 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; @@ -82,7 +82,7 @@ mqtt_SetErr(int eno, char *estr, ...) #pragma GCC visibility push(hidden) /* _mqtt_readHEADER() read fixed header from MQTT message */ -inline struct mqtthdr * +struct mqtthdr * _mqtt_readHEADER(mqtt_msg_t * __restrict buf, u_char cmd, int *bytes, int *len) { struct mqtthdr *hdr; @@ -110,7 +110,7 @@ _mqtt_readHEADER(mqtt_msg_t * __restrict buf, u_char c * @all = !=0 Destroy entire message, if MQTT Message allocated with mqtt_msgAlloc() * return: none */ -inline void +void mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all) { if (msg && *msg) { @@ -132,7 +132,7 @@ 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_msg_t * mqtt_msgAlloc(u_short len) { mqtt_msg_t *m = NULL; @@ -165,7 +165,7 @@ mqtt_msgAlloc(u_short len) * @len = new length * return: -1 error or >-1 old buffer length */ -inline int +int mqtt_msgRealloc(mqtt_msg_t * __restrict msg, u_short len) { void *p = NULL; @@ -191,12 +191,44 @@ 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 = 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 * return: -1 error or >-1 length */ -inline u_int +u_int mqtt_encodeLen(u_int num) { register u_int dig, i; @@ -224,7 +256,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; @@ -253,7 +285,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,6 +302,26 @@ mqtt_sizeLen(u_int len) } /* + * mqtt_pktLen() - Get total packet length + * + * @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 @@ -278,7 +330,7 @@ mqtt_sizeLen(u_int len) * 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_subscr_t * mqtt_str2subs(const char **csStr, u_short strnum, u_char *qoses) { mqtt_subscr_t *v; @@ -314,7 +366,7 @@ mqtt_str2subs(const char **csStr, u_short strnum, u_ch * @subs = Subscribe variables * return: none */ -inline void +void mqtt_subFree(mqtt_subscr_t ** __restrict subs) { mqtt_subscr_t *v; @@ -344,7 +396,7 @@ 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; @@ -366,21 +418,88 @@ 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; - 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 + */ +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 @@ -537,66 +656,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; }