--- libaitmqtt/inc/aitmqtt.h 2012/04/27 16:02:16 1.1.1.1.2.14 +++ libaitmqtt/inc/aitmqtt.h 2013/05/26 20:27:58 1.2.10.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitmqtt.h,v 1.1.1.1.2.14 2012/04/27 16:02:16 misho Exp $ +* $Id: aitmqtt.h,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 @@ -71,6 +71,7 @@ struct mqtthdr { unsigned char mqtt_len[1]; /* may be grow to 4 bytes */ } __packed; #define MQTTHDR_MSGINIT(x) (assert((x)), (x)->mqtt_msg.val ^= (x)->mqtt_msg.val) +#define MQTTHDR_DATA_SIZEOF(x) (assert((x)), mqtt_decodeLen((x)->mqtt_len, NULL)) #define MQTT_TYPE_UNKNOWN 0 /* reserved */ #define MQTT_TYPE_CONNECT 1 /* client request to connect to server */ @@ -195,9 +196,9 @@ typedef struct { // ------------------------------------------------------- // mqtt_GetErrno() Get error code of last operation -inline int mqtt_GetErrno(); +int mqtt_GetErrno(); // mqtt_GetError() Get error text of last operation -inline const char *mqtt_GetError(); +const char *mqtt_GetError(); // ------------------------------------------------------- @@ -207,7 +208,7 @@ inline const char *mqtt_GetError(); * @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(unsigned short len); +mqtt_msg_t *mqtt_msgAlloc(unsigned short len); /* * mqtt_msgFree() Free MQTT message * @@ -215,7 +216,7 @@ inline mqtt_msg_t *mqtt_msgAlloc(unsigned short len); * @all = !=0 Destroy entire message, if MQTT Message allocated with mqtt_msgAlloc() * return: none */ -inline void mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all); +void mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all); /* * mqtt_msgRealloc() Reallocate MQTT message buffer * @@ -223,7 +224,14 @@ inline void mqtt_msgFree(mqtt_msg_t ** __restrict msg, * @len = new length * return: -1 error or >-1 old buffer length */ -inline int mqtt_msgRealloc(mqtt_msg_t * __restrict msg, unsigned short len); +int mqtt_msgRealloc(mqtt_msg_t * __restrict msg, unsigned short len); +/* + * 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_expandTopic() - Expanding topic to regular expression @@ -253,7 +261,7 @@ int mqtt_sqlTopic(const char *csInput, char * __restri * @num = number for encode * return: -1 error or >-1 length */ -inline unsigned int mqtt_encodeLen(unsigned int num); +unsigned int mqtt_encodeLen(unsigned int num); /* * mqtt_decodeLen() Decode length from MQTT packet * @@ -261,15 +269,22 @@ inline unsigned int mqtt_encodeLen(unsigned int num); * @n = sizeof bytes, if !=NULL * return: -1 error, >-1 length of message */ -inline unsigned int mqtt_decodeLen(void * __restrict len, int * __restrict n); +unsigned int mqtt_decodeLen(void * __restrict len, int * __restrict n); /* * mqtt_sizeLen Return sizeof len field * * @len = length * return: -1 error, >-1 sizeof len in bytes */ -inline char mqtt_sizeLen(unsigned int len); +char mqtt_sizeLen(unsigned int len); /* + * mqtt_pktLen() - Get total packet length + * + * @hdr = MQTT packet header + * return: packet length + */ +unsigned int mqtt_pktLen(struct mqtthdr * __restrict hdr); +/* * mqtt_str2subs Create MQTT subscribe variable from string(s) * * @csStr = null terminated string array @@ -278,7 +293,7 @@ inline char mqtt_sizeLen(unsigned 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_str2subs(const char **csStr, unsigned short strnum, +mqtt_subscr_t *mqtt_str2subs(const char **csStr, unsigned short strnum, unsigned char *qoses); /* * mqtt_subFree() Free array from subscribe variables @@ -286,14 +301,14 @@ inline mqtt_subscr_t *mqtt_str2subs(const char **csStr * @subs = Subscribe variables * return: none */ -inline void mqtt_subFree(mqtt_subscr_t ** __restrict subs); +void mqtt_subFree(mqtt_subscr_t ** __restrict subs); /* * mqtt_subAlloc() Create array from subscribe variables * * @num = Number of elements * return: NULL error or subscribe array, after use must call mqtt_subFree() */ -inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num); +mqtt_subscr_t *mqtt_subAlloc(unsigned short num); /* * mqtt_subRealloc() Reallocate array from subscribe variables * @@ -301,7 +316,7 @@ inline mqtt_subscr_t *mqtt_subAlloc(unsigned 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, unsigned short num); +mqtt_subscr_t *mqtt_subRealloc(mqtt_subscr_t ** __restrict subs, unsigned short num); /* * mqtt_subCopy() - Copy subscription structure to another one * @@ -309,7 +324,7 @@ inline mqtt_subscr_t *mqtt_subRealloc(mqtt_subscr_t ** * @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); +mqtt_subscr_t *mqtt_subCopy(mqtt_subscr_t * __restrict dst, mqtt_subscr_t * __restrict src); /*** SENDER FUNCTIONS ***/ @@ -319,7 +334,7 @@ inline mqtt_subscr_t *mqtt_subCopy(mqtt_subscr_t * __r * * @buf = Message buffer * @csConnID = ConnectID - * @kasec = Keep alive timeout + * @kasec = Keep alive timeout, if =0 default timeout for MQTT * @csUser = Username if !=NULL * @csPass = Password for Username, only if csUser is set * @csWillTopic = Will Topic if !=NULL Will Flags set into message @@ -386,7 +401,7 @@ int mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const * @msgID = MessageID * return: -1 error or >-1 message size for send */ -inline int mqtt_msgPUBACK(mqtt_msg_t * __restrict buf, unsigned short msgID); +int mqtt_msgPUBACK(mqtt_msg_t * __restrict buf, unsigned short msgID); /* * mqtt_msgPUBREC() Create PUBREC message * @@ -394,7 +409,7 @@ inline int mqtt_msgPUBACK(mqtt_msg_t * __restrict buf, * @msgID = MessageID * return: -1 error or >-1 message size for send */ -inline int mqtt_msgPUBREC(mqtt_msg_t * __restrict buf, unsigned short msgID); +int mqtt_msgPUBREC(mqtt_msg_t * __restrict buf, unsigned short msgID); /* * mqtt_msgPUBREL() Create PUBREL message * @@ -402,7 +417,7 @@ inline int mqtt_msgPUBREC(mqtt_msg_t * __restrict buf, * @msgID = MessageID * return: -1 error or >-1 message size for send */ -inline int mqtt_msgPUBREL(mqtt_msg_t * __restrict buf, unsigned short msgID); +int mqtt_msgPUBREL(mqtt_msg_t * __restrict buf, unsigned short msgID); /* * mqtt_msgPUBCOMP() Create PUBCOMP message * @@ -410,7 +425,7 @@ inline int mqtt_msgPUBREL(mqtt_msg_t * __restrict buf, * @msgID = MessageID * return: -1 error or >-1 message size for send */ -inline int mqtt_msgPUBCOMP(mqtt_msg_t * __restrict buf, unsigned short msgID); +int mqtt_msgPUBCOMP(mqtt_msg_t * __restrict buf, unsigned short msgID); /* * mqtt_msgSUBSCRIBE() Create SUBSCRIBE message @@ -515,7 +530,7 @@ int mqtt_readPINGRESP(mqtt_msg_t * __restrict buf); * @psTopic = Topic * @topicLen = Topic length * @msgID = MessageID - * @pData = Data buffer + * @pData = Data buffer, may be NULL * return: -1 error or !=-1 allocated data buffer length */ int mqtt_readPUBLISH(mqtt_msg_t * __restrict buf, char * __restrict psTopic,