--- mqtt/src/Attic/aitmqtt.c	2011/11/28 13:19:39	1.1.1.1.2.12
+++ mqtt/src/Attic/aitmqtt.c	2011/12/06 10:33:37	1.1.1.1.2.15
@@ -39,6 +39,28 @@ mqtt_SetErr(int eno, char *estr, ...)
 	va_end(lst);
 }
 
+#pragma GCC visibility push(hidden)
+// _mqtt_readHEADER() read fixed header from MQTT message
+inline struct mqtthdr *
+_mqtt_readHEADER(mqtt_msg_t * __restrict buf, u_char cmd, int *bytes, int *len)
+{
+	struct mqtthdr *hdr;
+
+	if (!buf || !buf->msg_base || !buf->msg_len)
+		return NULL;
+
+	hdr = (struct mqtthdr*) buf->msg_base;
+	if (hdr->mqtt_msg.type != cmd) {
+		mqtt_SetErr(EINVAL, "Error:: wrong command #%d should be %d", 
+				hdr->mqtt_msg.type, cmd);
+		return NULL;
+	}
+
+	*len = mqtt_decodeLen(hdr->mqtt_len, bytes);
+	return hdr;
+}
+#pragma GCC visibility pop
+
 // ----------------------------------------------------------
 
 /*
@@ -158,18 +180,18 @@ mqtt_encodeLen(u_int num)
 /*
  * mqtt_decodeLen() Decode length from MQTT packet
  *
- * @len = length
+ * @len = length from MQTT header
  * @n = sizeof bytes, if !=NULL
  * return: -1 error, >-1 length of message
  */
 inline u_int
-mqtt_decodeLen(u_int len, char *n)
+mqtt_decodeLen(void * __restrict len, int * __restrict n)
 {
 	register u_int i, dig, mul;
 	u_int ret = 0;
-	u_char *p = (u_char*) &len;
+	u_char *p = (u_char*) len;
 
-	if (len > 0xffffff7f)
+	if (!len)
 		return (u_int) -1;
 
 	for (mul = 1, i = 0; i < sizeof ret; i++, mul *= 0x80) {
@@ -294,6 +316,27 @@ mqtt_subAlloc(u_short num)
 		return NULL;
 	} else
 		memset(s, 0, (num + 1) * sizeof(mqtt_subscr_t));
+
+	return s;
+}
+
+/*
+ * mqtt_subRealloc() Reallocate array from subscribe variables
+ *
+ * @subs = Subscribe array
+ * @num = Number of elements
+ * return: NULL error or subscribe array, after use must call mqtt_subFree()
+ */
+inline mqtt_subscr_t *
+mqtt_subRealloc(mqtt_subscr_t * __restrict subs, u_short num)
+{
+	mqtt_subscr_t *s = NULL;
+
+	s = realloc(subs, (num + 1) * sizeof(mqtt_subscr_t));
+	if (!s) {
+		LOGERR;
+		return NULL;
+	}
 
 	return s;
 }