--- mqtt/inc/Attic/aitmqtt.h	2011/11/21 15:27:26	1.1.1.1.2.11
+++ mqtt/inc/Attic/aitmqtt.h	2011/11/22 13:00:33	1.1.1.1.2.15
@@ -96,13 +96,18 @@ typedef union {
 } mqtt_v_t;
 
 typedef struct {
+	mqtt_v_t	sub_sb;
+	char		*sub_data;
+	unsigned char	sub_qos;
+} mqtt_subscr_t;
+
+typedef struct {
 	mqtt_v_t	var_sb;
 	unsigned char	var_data[0];
 } __packed mqtthdr_var_t;
 #define MQTTHDR_VAR_SIZEOF(x)		(assert((x)), sizeof(mqtt_v_t) + ntohs((x)->var_sb.val))
 
 typedef unsigned char mqtthdr_protover_t;
-typedef unsigned char mqtthdr_retcode_t;
 
 typedef struct {
 	unsigned char	reserved:1,
@@ -138,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
@@ -151,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
@@ -159,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
@@ -172,17 +182,36 @@ 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_str2var Create MQTT variable from string
- * @csStr = string
- * @strLen = string length
- * return: NULL error or != ok variable, must be free after use!
+ * mqtt_str2sub Create MQTT subscribe variable from string(s)
+ *
+ * @csStr = strings
+ * @strnum = number of strings elements
+ * @qoses = QoS elements applied to subscribe variable, 
+ * 		count of elements must be equal with csStr elements
+ * return: NULL error or != subscribe variables array, must be free after use with mqtt_freeSub()
  */
-inline mqtthdr_var_t *mqtt_str2var(const unsigned char *csStr, unsigned short strLen);
+inline mqtt_subscr_t *mqtt_str2sub(const char **csStr, unsigned short strnum, unsigned char *qoses);
+/*
+ * mqtt_subFree() Free array from subscribe variables
+ *
+ * @subs = Subscribe variables
+ * @all = if !=0 free and subs pointer
+ * return: none
+ */
+inline void mqtt_subFree(mqtt_subscr_t ** __restrict subs, int all);
+/*
+ * mqtt_subAlloc() Create array from subscribe variables
+ *
+ * @num = Number of elements
+ * return: NULL error or subscribe array, after use must call mqtt_subFree() with all!=0
+ */
+inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num);
 
 /*
  * mqtt_msgCONNECT() Create CONNECT message
@@ -210,6 +239,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
  *
@@ -258,6 +288,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