--- libaitmqtt/inc/aitmqtt.h	2012/04/27 15:15:12	1.1.1.1.2.12
+++ libaitmqtt/inc/aitmqtt.h	2012/06/20 15:02:23	1.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitmqtt.h,v 1.1.1.1.2.12 2012/04/27 15:15:12 misho Exp $
+* $Id: aitmqtt.h,v 1.2 2012/06/20 15:02:23 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
@@ -302,6 +317,14 @@ inline mqtt_subscr_t *mqtt_subAlloc(unsigned 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, unsigned short num);
+/*
+ * 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);
 
 
 /*** SENDER FUNCTIONS ***/
@@ -311,7 +334,7 @@ inline mqtt_subscr_t *mqtt_subRealloc(mqtt_subscr_t **
  *
  * @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
@@ -507,12 +530,11 @@ int mqtt_readPINGRESP(mqtt_msg_t * __restrict buf);
  * @psTopic = Topic
  * @topicLen = Topic length
  * @msgID = MessageID
- * @pData = Data buffer
- * @datLen = Data buffer length, if *datLen == 0 allocate memory for pData
- * return: NULL error or !=NULL MQTT data buffer
+ * @pData = Data buffer, may be NULL
+ * return: -1 error or !=-1 allocated data buffer length
  */
-void *mqtt_readPUBLISH(mqtt_msg_t * __restrict buf, char * __restrict psTopic, 
-		int topicLen, unsigned short *msgID, void * __restrict pData, int *datLen);
+int mqtt_readPUBLISH(mqtt_msg_t * __restrict buf, char * __restrict psTopic, 
+		int topicLen, unsigned short *msgID, void ** __restrict pData);
 /*
  * mqtt_readPUBACK() Read PUBACK message
  *