--- mqtt/inc/Attic/aitmqtt.h	2011/11/22 13:03:25	1.1.1.1.2.16
+++ mqtt/inc/Attic/aitmqtt.h	2011/11/22 14:48:25	1.1.1.1.2.20
@@ -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 
@@ -132,7 +114,11 @@ typedef struct {
 	unsigned short	msg_len;
 } mqtt_msg_t;
 
+/* MQTT dispatcher callbacks */
 
+typedef int (*mqtt_cb_t)(void *);
+
+
 // -------------------------------------------------------
 // mqtt_GetErrno() Get error code of last operation
 inline int mqtt_GetErrno();
@@ -212,6 +198,9 @@ inline void mqtt_subFree(mqtt_subscr_t ** __restrict s
  */
 inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num);
 
+
+/*** SENDER FUNCTIONS ***/
+
 /*
  * mqtt_msgCONNECT() Create CONNECT message
  *
@@ -238,6 +227,27 @@ 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_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
@@ -311,6 +321,44 @@ 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);
+
+
+/*** RECEIVER FUNCTIONS ***/
+
+/*
+ * mqttInitCallbacks() Init callback array for dispatcher
+ *
+ * return: NULL error or !=NULL allocated callback array, after use free with mqttFiniCallbacks()
+ */
+mqtt_cb_t *mqttInitCallbacks(void);
+/*
+ * mqttFiniCallbacks() Free callback array
+ *
+ * @cb = Callback array
+ * return: none
+ */
+void mqttFiniCallbacks(mqtt_cb_t ** __restrict cb);
 
 
 #endif