--- mqtt/inc/Attic/aitmqtt.h	2011/11/21 16:28:05	1.1.1.1.2.12
+++ mqtt/inc/Attic/aitmqtt.h	2011/11/22 13:03:25	1.1.1.1.2.16
@@ -143,12 +143,14 @@ inline const char *mqtt_GetError();
 
 /*
  * mqtt_msgAlloc() Allocate memory for MQTT Message
+ *
  * @len = >0 Allocate buffer with length
  * return: NULL error or Message, after use must call mqtt_msgFree() with all!=0
  */
 inline mqtt_msg_t *mqtt_msgAlloc(unsigned short len);
 /*
  * mqtt_msgFree() Free MQTT message
+ *
  * @msg = Message buffer
  * @all = !=0 Destroy entire message, if MQTT Message allocated with mqtt_msgAlloc()
  * return: none
@@ -156,6 +158,7 @@ inline mqtt_msg_t *mqtt_msgAlloc(unsigned short len);
 inline void mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all);
 /*
  * mqtt_msgRealloc() Reallocate MQTT message buffer
+ *
  * @msg = MQTT message
  * @len = new length
  * return: -1 error or >-1 old buffer length
@@ -164,12 +167,14 @@ inline int mqtt_msgRealloc(mqtt_msg_t * __restrict msg
 
 /*
  * mqtt_encodeLen() Encode number to MQTT length field
+ *
  * @num = number for encode
  * return: -1 error or >-1 length
  */
 inline unsigned int mqtt_encodeLen(unsigned int num);
 /*
  * mqtt_decodeLen() Decode length from MQTT packet
+ *
  * @len = length
  * @n = sizeof bytes, if !=NULL
  * return: -1 error, >-1 length of message
@@ -177,12 +182,14 @@ inline unsigned int mqtt_encodeLen(unsigned int num);
 inline unsigned int mqtt_decodeLen(unsigned int len, char *n);
 /*
  * mqtt_sizeLen Return sizeof len field
+ *
  * @len = length
  * return: -1 error, >-1 sizeof len in bytes
  */
 inline char mqtt_sizeLen(unsigned int len);
 /*
  * mqtt_str2sub Create MQTT subscribe variable from string(s)
+ *
  * @csStr = strings
  * @strnum = number of strings elements
  * @qoses = QoS elements applied to subscribe variable, 
@@ -191,12 +198,19 @@ inline char mqtt_sizeLen(unsigned int len);
  */
 inline mqtt_subscr_t *mqtt_str2sub(const char **csStr, unsigned short strnum, unsigned char *qoses);
 /*
- * mqtt_freeSub() Free array from subscribe variables
+ * mqtt_subFree() Free array from subscribe variables
  *
  * @subs = Subscribe variables
  * return: none
  */
-inline void mqtt_freeSub(mqtt_subscr_t ** __restrict subs);
+inline void mqtt_subFree(mqtt_subscr_t ** __restrict subs);
+/*
+ * mqtt_subAlloc() Create array from subscribe variables
+ *
+ * @num = Number of elements
+ * return: NULL error or subscribe array, after use must call mqtt_subFree()
+ */
+inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num);
 
 /*
  * mqtt_msgCONNECT() Create CONNECT message
@@ -224,6 +238,7 @@ int mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const
  * return: -1 error or >-1 message size for send
  */
 int mqtt_msgCONNACK(mqtt_msg_t * __restrict buf, unsigned char retcode);
+
 /*
  * mqtt_msgPUBLISH() Create PUBLISH message
  *
@@ -272,6 +287,30 @@ inline int mqtt_msgPUBREL(mqtt_msg_t * __restrict buf,
  * return: -1 error or >-1 message size for send
  */
 inline int mqtt_msgPUBCOMP(mqtt_msg_t * __restrict buf, unsigned short msgID);
+
+/*
+ * mqtt_msgSUBSCRIBE() Create SUBSCRIBE message
+ *
+ * @buf = Message buffer
+ * @Topics = MQTT subscription topics
+ * @msgID = MessageID
+ * @Dup = Duplicate message
+ * @QOS = QoS
+ * return: -1 error or >-1 message size for send
+ */
+int
+mqtt_msgSUBSCRIBE(mqtt_msg_t * __restrict buf, mqtt_subscr_t * __restrict Topics, 
+		unsigned short msgID, unsigned char Dup, unsigned char QOS);
+/*
+ * mqtt_msgSUBACK() Create SUBACK message
+ *
+ * @buf = Message buffer
+ * @Topics = MQTT subscription topics
+ * @msgID = MessageID
+ * return: -1 error or >-1 message size for send
+ */
+int mqtt_msgSUBACK(mqtt_msg_t * __restrict buf, mqtt_subscr_t * __restrict Topics, 
+		unsigned short msgID);
 
 
 #endif