--- libaitmqtt/src/aitmqtt.c	2012/01/26 13:07:33	1.1
+++ libaitmqtt/src/aitmqtt.c	2012/04/25 13:49:15	1.1.1.1.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitmqtt.c,v 1.1 2012/01/26 13:07:33 misho Exp $
+* $Id: aitmqtt.c,v 1.1.1.1.2.5 2012/04/25 13:49:15 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -53,10 +53,6 @@ char mqtt_Error[STRSIZ];
 
 #pragma GCC visibility pop
 
-//
-// Error maintenance functions ...
-//
-
 // mqtt_GetErrno() Get error code of last operation
 inline int
 mqtt_GetErrno()
@@ -85,7 +81,7 @@ mqtt_SetErr(int eno, char *estr, ...)
 }
 
 #pragma GCC visibility push(hidden)
-// _mqtt_readHEADER() read fixed header from MQTT message
+/* _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)
 {
@@ -106,7 +102,6 @@ _mqtt_readHEADER(mqtt_msg_t * __restrict buf, u_char c
 }
 #pragma GCC visibility pop
 
-// ----------------------------------------------------------
 
 /*
  * mqtt_msgFree() Free MQTT message
@@ -179,7 +174,7 @@ mqtt_msgRealloc(mqtt_msg_t * __restrict msg, u_short l
 	if (!msg)
 		return -1;
 
-	if (len == msg->msg_len)
+	if (len <= msg->msg_len)
 		return len;
 
 	p = realloc(msg->msg_base, len);
@@ -384,4 +379,164 @@ mqtt_subRealloc(mqtt_subscr_t * __restrict subs, u_sho
 	}
 
 	return s;
+}
+
+/*
+ * mqtt_expandTopic() - Expanding topic to regular expression
+ *
+ * @csInput = Input topic
+ * @psRegEx = Output to regular expression
+ * @regexLen = Length of psRegEx
+ * @BOL = Begin of Line, if =0 not added
+ * @EOL = End of Line, if =0 not appended
+ * return: -1 error, 0 nothing expanded or >0 expanded bytes
+ */
+int
+mqtt_expandTopic(const char *csInput, char * __restrict psRegEx, int regexLen, u_char BOL, u_char EOL)
+{
+	int ret = 0;
+	register int i;
+	char *pos, *s;
+	const char reROM[] = "[](){}^$\\-|?.+*";
+
+	if (!csInput || !psRegEx || regexLen < 1)
+		return -1;
+	else
+		memset(psRegEx, 0, regexLen);
+
+	/* check # */
+	for (i = 0, pos = (char*) csInput; *pos && i < 2; pos++)
+		if (*pos == '#')
+			i++;
+	if (i == 2) {
+		mqtt_SetErr(EINVAL, "Syntax error, multiple occurrences of #..#");
+		return -1;
+	}
+	if (i == 1 && (pos = strrchr(csInput, '#')))
+		if ((pos != csInput && *(pos - 1) != '/') || *(pos + 1)) {
+			mqtt_SetErr(EINVAL, "Syntax error, bad format of #");
+			return -1;
+		}
+	/* check + */
+	for (pos = (char*) csInput; *pos && (pos = strchr(pos, '+')); pos++)
+		if ((pos != csInput && *(pos - 1) != '/') || (*(pos + 1) && *(pos + 1) != '/')) {
+			mqtt_SetErr(EINVAL, "Syntax error, bad format of +");
+			return -1;
+		}
+
+	/* BUILD REGEX */
+	s = psRegEx;
+	if (BOL) {
+		*s++ = '^';
+		ret++;
+	}
+	for (pos = (char*) csInput; s < psRegEx + regexLen && *pos; s++, pos++) {
+		if (*pos == '#') {
+			strlcat(s, ".*", regexLen - (s - psRegEx));
+			s++;
+			ret++;
+			break;
+		}
+		if (*pos == '+') {
+			if (*(pos + 1)) {
+				strlcat(s, ".*", regexLen - (s - psRegEx));
+				s++;
+				ret++;
+				continue;
+			} else {
+				strlcat(s, ".*/", regexLen - (s - psRegEx));
+				ret += 2;
+				break;
+			}
+		}
+		for (i = 0; i < sizeof reROM - 1; i++)
+			if (*pos == reROM[i] && regexLen - (s - psRegEx) - 1 > 0) {
+				*s++ = '\\';
+				ret++;
+				break;
+			}
+
+		*s = *pos;
+	}
+	if (EOL) {
+		strlcat(psRegEx, "$", regexLen);
+		ret++;
+	}
+
+	return ret;
+}
+
+/*
+ * mqtt_sqlTopic() - Expanding topic to SQL search string
+ *
+ * @csInput = Input topic
+ * @psSQL = Output to SQL search string
+ * @sqlLen = Length of psSQL
+ * return: -1 error, 0 changed bytes
+ */
+int
+mqtt_sqlTopic(const char *csInput, char * __restrict psSQL, int sqlLen)
+{
+	int ret = 0;
+	register int i;
+	char *pos, *s;
+
+	if (!csInput || !psSQL || sqlLen < 1)
+		return -1;
+	else
+		memset(psSQL, 0, sqlLen);
+
+	/* check # */
+	for (i = 0, pos = (char*) csInput; *pos && i < 2; pos++)
+		if (*pos == '#')
+			i++;
+	if (i == 2) {
+		mqtt_SetErr(EINVAL, "Syntax error, multiple occurrences of #..#");
+		return -1;
+	}
+	if (i == 1 && (pos = strrchr(csInput, '#')))
+		if ((pos != csInput && *(pos - 1) != '/') || *(pos + 1)) {
+			mqtt_SetErr(EINVAL, "Syntax error, bad format of #");
+			return -1;
+		}
+	/* check + */
+	for (pos = (char*) csInput; *pos && (pos = strchr(pos, '+')); pos++)
+		if ((pos != csInput && *(pos - 1) != '/') || (*(pos + 1) && *(pos + 1) != '/')) {
+			mqtt_SetErr(EINVAL, "Syntax error, bad format of +");
+			return -1;
+		}
+
+	/* BUILD SEARCH STRING */
+	s = psSQL;
+	for (pos = (char*) csInput; s < psSQL + sqlLen && *pos; s++, pos++) {
+		if (*pos == '#') {
+			*s = '%';
+			s++;
+			ret++;
+			break;
+		}
+		if (*pos == '+') {
+			if (*(pos + 1)) {
+				*s = '%';
+				ret++;
+				continue;
+			} else {
+				strlcat(s, "%/", sqlLen - (s - psSQL));
+				ret += 2;
+				break;
+			}
+		}
+		/*
+		for (i = 0; i < sizeof reROM - 1; i++)
+			if (*pos == reROM[i] && regexLen - (s - psRegEx) - 1 > 0) {
+				*s++ = '\\';
+				ret++;
+				break;
+			}
+			*/
+
+		*s = *pos;
+	}
+
+	return ret;
 }