--- mqtt/src/Attic/pub.c	2011/11/21 15:27:26	1.1.2.5
+++ mqtt/src/Attic/pub.c	2011/12/05 22:17:39	1.1.2.7
@@ -45,7 +45,6 @@ mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const cha
 	}
 
 	/* variable header */
-
 	topic = (mqtthdr_var_t*) (buf->msg_base + siz);
 	topic->var_sb.val = htons(strlen(csTopic));
 	memcpy(topic->var_data, csTopic, ntohs(topic->var_sb.val));
@@ -56,7 +55,6 @@ mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const cha
 	siz += sizeof(mqtt_v_t);
 
 	/* load with data */
-
 	if (pData && datlen) {
 		data = buf->msg_base + siz;
 		memcpy(data, pData, datlen);
@@ -64,7 +62,7 @@ mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const cha
 	}
 
 	/* fixed header */
-
+	MQTTHDR_MSGINIT(hdr);
 	hdr->mqtt_msg.type = MQTT_TYPE_PUBLISH;
 	hdr->mqtt_msg.qos = QOS;
 	hdr->mqtt_msg.dup = Dup ? 1 : 0;
@@ -95,6 +93,7 @@ _mqtt_msgPUB_(mqtt_msg_t * __restrict buf, u_char cmd,
 	}
 
 	/* fixed header */
+	MQTTHDR_MSGINIT(hdr);
 	hdr->mqtt_msg.type = cmd;
 	*hdr->mqtt_len = sizeof(mqtt_v_t);
 
@@ -154,4 +153,119 @@ inline int
 mqtt_msgPUBCOMP(mqtt_msg_t * __restrict buf, u_short msgID)
 {
 	return _mqtt_msgPUB_(buf, MQTT_TYPE_PUBCOMP, msgID);
+}
+
+
+/* ============= decode ============ */
+
+/*
+ * mqtt_readPUBACK() Read PUBACK message
+ *
+ * @buf = Message buffer
+ * return: -1 error or MessageID
+ */
+u_short
+mqtt_readPUBACK(mqtt_msg_t * __restrict buf)
+{
+	int len, ret;
+	struct mqtthdr *hdr;
+	mqtt_v_t *v;
+	caddr_t pos;
+
+	hdr = _mqtt_readHEADER(buf, MQTT_TYPE_PUBACK, &ret, &len);
+	if (!hdr)
+		return (u_short) -1;
+	if (len < sizeof(mqtt_v_t)) {
+		mqtt_SetErr(EINVAL, "Error:: short message length %d", len);
+		return (u_short) -1;
+	} else {
+		pos = buf->msg_base + ret + 1;
+		v = (mqtt_v_t*) pos;
+	}
+
+	return ntohs(v->val);
+}
+
+/*
+ * mqtt_readPUBREC() Read PUBREC message
+ *
+ * @buf = Message buffer
+ * return: -1 error or MessageID
+ */
+u_short
+mqtt_readPUBREC(mqtt_msg_t * __restrict buf)
+{
+	int len, ret;
+	struct mqtthdr *hdr;
+	mqtt_v_t *v;
+	caddr_t pos;
+
+	hdr = _mqtt_readHEADER(buf, MQTT_TYPE_PUBREC, &ret, &len);
+	if (!hdr)
+		return (u_short) -1;
+	if (len < sizeof(mqtt_v_t)) {
+		mqtt_SetErr(EINVAL, "Error:: short message length %d", len);
+		return (u_short) -1;
+	} else {
+		pos = buf->msg_base + ret + 1;
+		v = (mqtt_v_t*) pos;
+	}
+
+	return ntohs(v->val);
+}
+
+/*
+ * mqtt_readPUBREL() Read PUBREL message
+ *
+ * @buf = Message buffer
+ * return: -1 error or MessageID
+ */
+u_short
+mqtt_readPUBREL(mqtt_msg_t * __restrict buf)
+{
+	int len, ret;
+	struct mqtthdr *hdr;
+	mqtt_v_t *v;
+	caddr_t pos;
+
+	hdr = _mqtt_readHEADER(buf, MQTT_TYPE_PUBREL, &ret, &len);
+	if (!hdr)
+		return (u_short) -1;
+	if (len < sizeof(mqtt_v_t)) {
+		mqtt_SetErr(EINVAL, "Error:: short message length %d", len);
+		return (u_short) -1;
+	} else {
+		pos = buf->msg_base + ret + 1;
+		v = (mqtt_v_t*) pos;
+	}
+
+	return ntohs(v->val);
+}
+
+/*
+ * mqtt_readPUBCOMP() Read PUBCOMP message
+ *
+ * @buf = Message buffer
+ * return: -1 error or MessageID
+ */
+u_short
+mqtt_readPUBCOMP(mqtt_msg_t * __restrict buf)
+{
+	int len, ret;
+	struct mqtthdr *hdr;
+	mqtt_v_t *v;
+	caddr_t pos;
+
+	hdr = _mqtt_readHEADER(buf, MQTT_TYPE_PUBCOMP, &ret, &len);
+	if (!hdr)
+		return (u_short) -1;
+	if (len < sizeof(mqtt_v_t)) {
+		mqtt_SetErr(EINVAL, "Error:: short message length %d", len);
+		return (u_short) -1;
+	} else {
+		pos = buf->msg_base + ret + 1;
+		v = (mqtt_v_t*) pos;
+	}
+
+	return ntohs(v->val);
 }