--- mqtt/inc/Attic/aitmqtt.h	2011/12/05 22:17:39	1.1.1.1.2.27
+++ mqtt/inc/Attic/aitmqtt.h	2011/12/06 12:36:45	1.1.1.1.2.30
@@ -214,6 +214,14 @@ inline void mqtt_subFree(mqtt_subscr_t ** __restrict s
  * return: NULL error or subscribe array, after use must call mqtt_subFree()
  */
 inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num);
+/*
+ * mqtt_subRealloc() Reallocate array from subscribe variables
+ *
+ * @subs = Subscribe array
+ * @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);
 
 
 /*** SENDER FUNCTIONS ***/
@@ -279,9 +287,9 @@ int mqtt_msgPINGRESP(mqtt_msg_t * __restrict buf);
  * @datlen = Publish data length
  * return: -1 error or >-1 message size for send
  */
-int mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const char *csTopic, unsigned short msgID, 
-		unsigned char Dup, unsigned char QOS, unsigned char Retain, 
-		const void *pData, unsigned short datlen);
+int mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const char *csTopic, 
+		unsigned short msgID, unsigned char Dup, unsigned char QOS, 
+		unsigned char Retain, const void *pData, int datlen);
 /*
  * mqtt_msgPUBACK() Create PUBACK message
  *
@@ -414,6 +422,19 @@ int mqtt_readPINGREQ(mqtt_msg_t * __restrict buf);
 int mqtt_readPINGRESP(mqtt_msg_t * __restrict buf);
 
 /*
+ * mqtt_readPUBLISH() Read PUBLISH message
+ *
+ * @buf = Message buffer
+ * @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 fixed header
+ */
+struct mqtthdr *mqtt_readPUBLISH(mqtt_msg_t * __restrict buf, char * __restrict psTopic, 
+		int topicLen, unsigned short *msgID, void * __restrict pData, int *datLen);
+/*
  * mqtt_readPUBACK() Read PUBACK message
  *
  * @buf = Message buffer
@@ -442,6 +463,35 @@ u_short mqtt_readPUBREL(mqtt_msg_t * __restrict buf);
  */
 u_short mqtt_readPUBCOMP(mqtt_msg_t * __restrict buf);
 
+/*
+ * mqtt_readSUBSCRIBE() Read SUBSCRIBE message
+ *
+ * @buf = Message buffer
+ * @msgID = MessageID
+ * @subscr = Subscriptions, must be free after use with mqtt_subFree()
+ * return: NULL error or !=NULL MQTT fixed header
+ */
+struct mqtthdr *mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, unsigned short *msgID, 
+		mqtt_subscr_t **subscr);
+/*
+ * mqtt_readSUBACK() Read SUBACK message
+ *
+ * @buf = Message buffer
+ * @msgID = MessageID
+ * @subqos = Subscribes QoS, must be free after use with free()
+ * return: -1 error or >-1 readed subscribes QoS elements
+ */
+int mqtt_readSUBACK(mqtt_msg_t * __restrict buf, u_short *msgID, unsigned char **subqos);
+/*
+ * mqtt_readUNSUBSCRIBE() Read UNSUBSCRIBE message
+ *
+ * @buf = Message buffer
+ * @msgID = MessageID
+ * @subscr = Subscriptions, must be free after use with mqtt_subFree()
+ * return: NULL error or !=NULL MQTT fixed header
+ */
+struct mqtthdr *mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, unsigned short *msgID, 
+		mqtt_subscr_t **subscr);
 /*
  * mqtt_readUNSUBACK() Read UNSUBACK message
  *