--- mqtt/inc/Attic/aitmqtt.h	2011/11/22 13:00:33	1.1.1.1.2.15
+++ mqtt/inc/Attic/aitmqtt.h	2011/11/22 14:00:09	1.1.1.1.2.17
@@ -10,14 +10,18 @@
 /* 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 */
 } __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 */
@@ -201,15 +205,14 @@ inline mqtt_subscr_t *mqtt_str2sub(const char **csStr,
  * 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);
+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() with all!=0
+ * return: NULL error or subscribe array, after use must call mqtt_subFree()
  */
 inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num);
 
@@ -312,6 +315,27 @@ mqtt_msgSUBSCRIBE(mqtt_msg_t * __restrict buf, mqtt_su
  */
 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