--- mqtt/inc/Attic/aitmqtt.h	2011/11/21 14:40:56	1.1.1.1.2.8
+++ mqtt/inc/Attic/aitmqtt.h	2011/11/22 12:02:17	1.1.1.1.2.14
@@ -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,
@@ -177,12 +182,22 @@ inline unsigned int mqtt_decodeLen(unsigned int len, c
  */
 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_freeSub() Free array from subscribe variables
+ *
+ * @subs = Subscribe variables
+ * @freeall = if !=0 free and subs pointer
+ * return: none
+ */
+inline void mqtt_freeSub(mqtt_subscr_t ** __restrict subs, int freeeall);
 
 /*
  * mqtt_msgCONNECT() Create CONNECT message
@@ -210,6 +225,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
  *
@@ -219,10 +235,13 @@ int mqtt_msgCONNACK(mqtt_msg_t * __restrict buf, unsig
  * @Dup = Duplicate message
  * @QOS = QoS
  * @Retain = Retain message
+ * @pData = Publish data into topic
+ * @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);
+		unsigned char Dup, unsigned char QOS, unsigned char Retain, 
+		const void *pData, unsigned short datlen);
 /*
  * mqtt_msgPUBACK() Create PUBACK message
  *
@@ -255,6 +274,20 @@ 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);
 
 
 #endif