--- mqtt/src/Attic/aitmqtt.c	2011/11/07 13:58:27	1.1.1.1.2.2
+++ mqtt/src/Attic/aitmqtt.c	2011/11/21 16:42:43	1.1.1.1.2.7
@@ -1,10 +1,13 @@
 #include "global.h"
 
 
-static int mqtt_Errno;
-static char mqtt_Error[STRSIZ];
+#pragma GCC visibility push(hidden)
 
+int mqtt_Errno;
+char mqtt_Error[STRSIZ];
 
+#pragma GCC visibility pop
+
 //
 // Error maintenance functions ...
 //
@@ -39,6 +42,90 @@ mqtt_SetErr(int eno, char *estr, ...)
 // ----------------------------------------------------------
 
 /*
+ * 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)
+{
+	if (msg && *msg) {
+		if ((*msg)->msg_base) {
+			free((*msg)->msg_base);
+			(*msg)->msg_base = NULL;
+		}
+		if (all) {
+			free(*msg);
+			*msg = NULL;
+		} else
+			(*msg)->msg_len ^= (*msg)->msg_len;
+	}
+}
+
+/*
+ * 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(u_short len)
+{
+	mqtt_msg_t *m = NULL;
+
+	m = malloc(sizeof(mqtt_msg_t));
+	if (!m) {
+		LOGERR;
+		return NULL;
+	} else
+		memset(m, 0, sizeof(mqtt_msg_t));
+
+	if (len) {
+		m->msg_len = len;
+		m->msg_base = malloc(m->msg_len);
+		if (!m->msg_base) {
+			LOGERR;
+			free(m);
+			return NULL;
+		} else
+			memset(m->msg_base, 0, m->msg_len);
+	}
+
+	return m;
+}
+
+/*
+ * 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, u_short len)
+{
+	void *p = NULL;
+	int ret = 0;
+
+	if (!msg)
+		return -1;
+
+	if (len == msg->msg_len)
+		return len;
+
+	p = realloc(msg->msg_base, len);
+	if (!p) {
+		LOGERR;
+		return -1;
+	}
+
+	ret = msg->msg_len;
+	msg->msg_len = len;
+	msg->msg_base = p;
+
+	return ret;
+}
+
+/*
  * mqtt_encodeLen() Encode number to MQTT length field
  * @num = number for encode
  * return: -1 error or >-1 length
@@ -112,4 +199,63 @@ mqtt_sizeLen(u_int len)
 			break;
 
 	return ++i;
+}
+
+/*
+ * mqtt_str2sub Create MQTT subscribe variable from string(s)
+ * @csStr = strings
+ * @strnum = number of strings elements
+ * @qoses = QoS elements applied to subscribe variable, 
+ * 		count of elements must be equal with csStr elements
+ * return: NULL error or != subscribe variables array, must be free after use with mqtt_freeSub()
+ */
+inline mqtt_subscr_t *
+mqtt_str2sub(const char **csStr, u_short strnum, u_char *qoses)
+{
+	mqtt_subscr_t *v;
+	register int i, items;
+	const char **strs;
+
+	if (!csStr)
+		return NULL;
+	for (items = 0, strs = csStr; *strs; items++, strs++)
+		if (strnum && items >= strnum) {
+			items = strnum;
+			break;
+		}
+
+	if (!(v = malloc((items + 1) * sizeof(mqtt_subscr_t)))) {
+		LOGERR;
+		return NULL;
+	} else
+		memset(v, 0, (items + 1) * sizeof(mqtt_subscr_t));
+
+	for (i = 0; i < items; i++) {
+		v[i].sub_sb.val = htons(strlen(csStr[i]));
+		v[i].sub_data = strdup(csStr[i]);
+		if (qoses && qoses[i] < MQTT_QOS_RESERVED)
+			v[i].sub_qos = qoses[i];
+	}
+
+	return v;
+}
+
+/*
+ * mqtt_freeSub() Free array from subscribe variables
+ *
+ * @subs = Subscribe variables
+ * return: none
+ */
+inline void
+mqtt_freeSub(mqtt_subscr_t ** __restrict subs)
+{
+	mqtt_subscr_t *v;
+
+	if (!subs)
+		return;
+
+	for (v = *subs; v->sub_data; v++)
+		free(v->sub_data);
+	free(*subs);
+	*subs = NULL;
 }