--- libaitmqtt/inc/aitmqtt.h	2012/04/27 16:02:16	1.1.1.1.2.14
+++ libaitmqtt/inc/aitmqtt.h	2012/06/20 08:15:12	1.1.1.1.2.16
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $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.1.1.1.2.16 2012/06/20 08:15:12 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -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 */
@@ -224,6 +225,13 @@ inline void mqtt_msgFree(mqtt_msg_t ** __restrict msg,
  * return: -1 error or >-1 old buffer length
  */
 inline 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
+ */
+inline mqtt_msg_t *mqtt_msgDup(mqtt_msg_t * __restrict msg);
 
 /*
  * mqtt_expandTopic() - Expanding topic to regular expression
@@ -270,6 +278,13 @@ inline unsigned int mqtt_decodeLen(void * __restrict l
  */
 inline char mqtt_sizeLen(unsigned int len);
 /*
+ * mqtt_pktLen() - Get total packet length
+ *
+ * @hdr = MQTT packet header
+ * return: packet length
+ */
+inline unsigned int mqtt_pktLen(struct mqtthdr * __restrict hdr);
+/*
  * mqtt_str2subs Create MQTT subscribe variable from string(s)
  *
  * @csStr = null terminated string array
@@ -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,