--- mqtt/inc/Attic/aitmqtt.h	2011/12/06 09:04:55	1.1.1.1.2.28
+++ mqtt/inc/Attic/aitmqtt.h	2011/12/09 09:53:54	1.1.1.1.2.31
@@ -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 ***/
@@ -375,15 +383,13 @@ int mqtt_msgUNSUBACK(mqtt_msg_t * __restrict buf, unsi
  * @psPass = Password for Username, only if csUser is set
  * @passLen = Password length
  * @psWillTopic = Will Topic if !=NULL Will Flags set into message
- * @topicLen = Will Topic length
  * @psWillMessage = Will Message, may be NULL
- * @msgLen = Will Message length
  * return: .reserved == 1 is error or == 0 connection flags & msg ok
  */
 mqtthdr_connflgs_t mqtt_readCONNECT(mqtt_msg_t * __restrict buf, unsigned short *kasec, 
 		char * __restrict psConnID, int connLen, 
 		char * __restrict psUser, int userLen, char * __restrict psPass, int passLen,  
-		char * __restrict psWillTopic, int topicLen, char * __restrict psWillMessage, int msgLen);
+		char ** __restrict psWillTopic, char ** __restrict psWillMessage);
 /*
  * mqtt_readCONNACK() Read CONNACK message
  *
@@ -455,6 +461,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
  *