--- libaitmqtt/inc/aitmqtt.h	2012/06/11 08:37:41	1.1.1.1.2.15
+++ 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.15 2012/06/11 08:37:41 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 */
@@ -277,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
@@ -326,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