--- mqtt/inc/Attic/aitmqtt.h	2011/11/21 14:51:23	1.1.1.1.2.9
+++ mqtt/inc/Attic/aitmqtt.h	2011/11/22 14:19:48	1.1.1.1.2.19
@@ -2,40 +2,22 @@
 #define __AITMQTT_H
 
 
-#define MQTT_DATA_MAX		268435455
-#define MQTT_CONN_STR		"MQIsdp"
-#define MQTT_PROTO_VER		3
-#define MQTT_KEEPALIVE		10
-
 /* FIXED HEADER */
 
 struct mqtthdr {
-	struct {
-		unsigned char	retain:1, 
-				qos:2,
-				dup:1,
-				type:4;
+	union {
+		struct {
+			unsigned char	retain:1, 
+					qos:2,
+					dup:1,
+					type:4;
+		};
+		unsigned char		val;
 	} mqtt_msg;
-	unsigned char		mqtt_len[1];	/* may be grow to 4 bytes */
+	unsigned char			mqtt_len[1];	/* may be grow to 4 bytes */
 } __packed;
+#define MQTTHDR_MSGINIT(x)	(assert((x)), (x)->mqtt_msg.val ^= (x)->mqtt_msg.val)
 
-#define MQTT_TYPE_UNKNOWN	0	/* reserved */
-#define MQTT_TYPE_CONNECT	1	/* client request to connect to server */
-#define MQTT_TYPE_CONNACK	2	/* connect acknowledgment */
-#define MQTT_TYPE_PUBLISH	3	/* publish message */
-#define MQTT_TYPE_PUBACK	4	/* publish acknowledgment */
-#define MQTT_TYPE_PUBREC	5	/* publish received (assured delivery part 1) */
-#define MQTT_TYPE_PUBREL	6	/* publish release (assured delivery part 2) */
-#define MQTT_TYPE_PUBCOMP	7	/* publish complete (assured delivery part 3) */
-#define MQTT_TYPE_SUBSCRIBE	8	/* client subscribe request */
-#define MQTT_TYPE_SUBACK	9	/* subscribe acknowledgment */
-#define MQTT_TYPE_UNSUBSCRIBE	10	/* client unsubscribe request */
-#define MQTT_TYPE_UNSUBACK	11	/* unsubscribe acknowledgment */
-#define MQTT_TYPE_PINGREQ	12	/* PING request */
-#define MQTT_TYPE_PINGRESP	13	/* PING response */
-#define MQTT_TYPE_DISCONNECT	14	/* client is disconnecting */
-#define MQTT_TYPE_RESERVED	15	/* reserved */
-
 #define MQTT_FLAG_DUP		1	/* This flag is set when the client or server attempts to re-deliver 
 					   a PUBLISH, PUBREL, SUBSCRIBE or UNSUBSCRIBE message. 
 					   This applies to messages where the value of QoS is greater than 
@@ -96,13 +78,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 +125,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 +140,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 +149,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 +164,35 @@ 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
+ * return: none
+ */
+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
@@ -211,6 +221,28 @@ int mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const
  */
 int mqtt_msgCONNACK(mqtt_msg_t * __restrict buf, unsigned char retcode);
 /*
+ * mqtt_msgDISCONNECT() Create DISCONNECT message
+ *
+ * @buf = Message buffer
+ * return: -1 error or >-1 message size for send
+ */
+int mqtt_msgDISCONNECT(mqtt_msg_t * __restrict buf);
+/*
+ * mqtt_msgPINGREQ() Create PINGREQ message
+ *
+ * @buf = Message buffer
+ * return: -1 error or >-1 message size for send
+ */
+int mqtt_msgPINGREQ(mqtt_msg_t * __restrict buf);
+/*
+ * mqtt_msgPINGRESP() Create PINGRESP message
+ *
+ * @buf = Message buffer
+ * return: -1 error or >-1 message size for send
+ */
+int mqtt_msgPINGRESP(mqtt_msg_t * __restrict buf);
+
+/*
  * mqtt_msgPUBLISH() Create PUBLISH message
  *
  * @buf = Message buffer
@@ -218,10 +250,14 @@ int mqtt_msgCONNACK(mqtt_msg_t * __restrict buf, unsig
  * @msgID = MessageID >0, if QOS != MQTT_QOS_ONCE
  * @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);
+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);
 /*
  * mqtt_msgPUBACK() Create PUBACK message
  *
@@ -254,6 +290,51 @@ 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);
+/*
+ * mqtt_msgUNSUBSCRIBE() Create UNSUBSCRIBE 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_msgUNSUBSCRIBE(mqtt_msg_t * __restrict buf, mqtt_subscr_t * __restrict Topics, 
+		unsigned short msgID, unsigned char Dup, unsigned char QOS);
+/*
+ * mqtt_msgUNSUBACK() Create UNSUBACK message
+ *
+ * @buf = Message buffer
+ * @msgID = MessageID
+ * return: -1 error or >-1 message size for send
+ */
+int mqtt_msgUNSUBACK(mqtt_msg_t * __restrict buf, unsigned short msgID);
 
 
 #endif