--- mqtt/inc/Attic/aitmqtt.h	2011/11/07 16:55:46	1.1.1.1.2.4
+++ mqtt/inc/Attic/aitmqtt.h	2011/11/21 15:27:26	1.1.1.1.2.11
@@ -93,12 +93,13 @@ typedef union {
 				l:8;
 	} sb;
 	unsigned short	val;
-} mqtthdr_val_t;
+} mqtt_v_t;
 
 typedef struct {
-	mqtthdr_val_t	var_sb;
+	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;
@@ -113,7 +114,20 @@ typedef struct {
 			username:1;
 } __packed mqtthdr_connflgs_t;
 
+typedef struct {
+	unsigned char	reserved;
+	unsigned char	retcode;
+} __packed mqtthdr_connack_t;
 
+
+/* MQTT Message buffer */
+
+typedef struct {
+	void		*msg_base;
+	unsigned short	msg_len;
+} mqtt_msg_t;
+
+
 // -------------------------------------------------------
 // mqtt_GetErrno() Get error code of last operation
 inline int mqtt_GetErrno();
@@ -123,6 +137,27 @@ 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
+ */
+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
+ */
+inline int mqtt_msgRealloc(mqtt_msg_t * __restrict msg, unsigned short len);
+
+/*
  * mqtt_encodeLen() Encode number to MQTT length field
  * @num = number for encode
  * return: -1 error or >-1 length
@@ -148,6 +183,81 @@ inline char mqtt_sizeLen(unsigned int len);
  * return: NULL error or != ok variable, must be free after use!
  */
 inline mqtthdr_var_t *mqtt_str2var(const unsigned char *csStr, unsigned short strLen);
+
+/*
+ * mqtt_msgCONNECT() Create CONNECT message
+ *
+ * @buf = Message buffer
+ * @csConnID = ConnectID
+ * @csUser = Username if !=NULL
+ * @csPass = Password for Username, only if csUser is set
+ * @csWillTopic = Will Topic if !=NULL Will Flags set into message
+ * @csWillMessage = Will Message, may be NULL
+ * @ClrSess = Clear Session subscriptions after disconnect
+ * @WillQOS = Will QOS if csWillTopic is set
+ * @WillRetain = Will Retain Will Message if csWillTopic is set
+ * return: -1 error or >-1 message size for send
+ */
+int mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const char *csConnID, 
+		const char *csUser, const char *csPass, 
+		const char *csWillTopic, const char *csWillMessage, 
+		unsigned char ClrSess, unsigned char WillQOS, unsigned char WillRetain);
+/*
+ * mqtt_msgCONNACK() Create CONNACK message
+ *
+ * @buf = Message buffer
+ * @retcode = Return code
+ * 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
+ *
+ * @buf = Message buffer
+ * @csTopic = Publish topic
+ * @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, unsigned char Retain, 
+		const void *pData, unsigned short datlen);
+/*
+ * mqtt_msgPUBACK() Create PUBACK message
+ *
+ * @buf = Message buffer
+ * @msgID = MessageID
+ * return: -1 error or >-1 message size for send
+ */
+inline int mqtt_msgPUBACK(mqtt_msg_t * __restrict buf, unsigned short msgID);
+/*
+ * mqtt_msgPUBREC() Create PUBREC message
+ *
+ * @buf = Message buffer
+ * @msgID = MessageID
+ * return: -1 error or >-1 message size for send
+ */
+inline int mqtt_msgPUBREC(mqtt_msg_t * __restrict buf, unsigned short msgID);
+/*
+ * mqtt_msgPUBREL() Create PUBREL message
+ *
+ * @buf = Message buffer
+ * @msgID = MessageID
+ * return: -1 error or >-1 message size for send
+ */
+inline int mqtt_msgPUBREL(mqtt_msg_t * __restrict buf, unsigned short msgID);
+/*
+ * mqtt_msgPUBCOMP() Create PUBCOMP message
+ *
+ * @buf = Message buffer
+ * @msgID = MessageID
+ * return: -1 error or >-1 message size for send
+ */
+inline int mqtt_msgPUBCOMP(mqtt_msg_t * __restrict buf, unsigned short msgID);
 
 
 #endif