--- libaitmqtt/inc/aitmqtt.h	2012/01/26 13:07:33	1.1.1.1
+++ libaitmqtt/inc/aitmqtt.h	2012/01/27 15:12:27	1.1.1.1.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitmqtt.h,v 1.1.1.1 2012/01/26 13:07:33 misho Exp $
+* $Id: aitmqtt.h,v 1.1.1.1.2.3 2012/01/27 15:12:27 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,6 +47,10 @@ SUCH DAMAGE.
 #define __AITMQTT_H
 
 
+#define MAX_CONNID		24
+#define MAX_CRED		13
+#define MQTTMSG_MAX		65529
+
 /* FIXED HEADER */
 
 struct mqtthdr {
@@ -138,10 +142,6 @@ typedef struct {
 	unsigned short	msg_len;
 } mqtt_msg_t;
 
-/* MQTT hooks callback */
-
-typedef void *(*mqtt_cb_t)(void *);
-
 /* MQTT structures */
 
 typedef union {
@@ -218,6 +218,19 @@ inline void mqtt_msgFree(mqtt_msg_t ** __restrict msg,
 inline int mqtt_msgRealloc(mqtt_msg_t * __restrict msg, unsigned short len);
 
 /*
+ * 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, 
+		unsigned char BOL, unsigned char EOL);
+
+/*
  * mqtt_encodeLen() Encode number to MQTT length field
  *
  * @num = number for encode
@@ -488,28 +501,28 @@ struct mqtthdr *mqtt_readPUBLISH(mqtt_msg_t * __restri
  * @buf = Message buffer
  * return: -1 error or MessageID
  */
-u_short mqtt_readPUBACK(mqtt_msg_t * __restrict buf);
+unsigned short mqtt_readPUBACK(mqtt_msg_t * __restrict buf);
 /*
  * mqtt_readPUBREC() Read PUBREC message
  *
  * @buf = Message buffer
  * return: -1 error or MessageID
  */
-u_short mqtt_readPUBREC(mqtt_msg_t * __restrict buf);
+unsigned short mqtt_readPUBREC(mqtt_msg_t * __restrict buf);
 /*
  * mqtt_readPUBREL() Read PUBREL message
  *
  * @buf = Message buffer
  * return: -1 error or MessageID
  */
-u_short mqtt_readPUBREL(mqtt_msg_t * __restrict buf);
+unsigned short mqtt_readPUBREL(mqtt_msg_t * __restrict buf);
 /*
  * mqtt_readPUBCOMP() Read PUBCOMP message
  *
  * @buf = Message buffer
  * return: -1 error or MessageID
  */
-u_short mqtt_readPUBCOMP(mqtt_msg_t * __restrict buf);
+unsigned short mqtt_readPUBCOMP(mqtt_msg_t * __restrict buf);
 
 /*
  * mqtt_readSUBSCRIBE() Read SUBSCRIBE message
@@ -529,7 +542,7 @@ struct mqtthdr *mqtt_readSUBSCRIBE(mqtt_msg_t * __rest
  * @subqos = Subscribes QoS, must be free after use with free()
  * return: -1 error or >-1 readed subscribes QoS elements
  */
-int mqtt_readSUBACK(mqtt_msg_t * __restrict buf, u_short *msgID, unsigned char **subqos);
+int mqtt_readSUBACK(mqtt_msg_t * __restrict buf, unsigned short *msgID, unsigned char **subqos);
 /*
  * mqtt_readUNSUBSCRIBE() Read UNSUBSCRIBE message
  *
@@ -546,40 +559,7 @@ struct mqtthdr *mqtt_readUNSUBSCRIBE(mqtt_msg_t * __re
  * @buf = Message buffer
  * return: -1 error or MessageID
  */
-u_short mqtt_readUNSUBACK(mqtt_msg_t * __restrict buf);
-
-/*** ENGINE FUNCTIONS ***/
-
-/*
- * mqttInitCallbacks() Init callback array for dispatcher
- *
- * return: NULL error or !=NULL allocated callback array, after use free with mqttFiniCallbacks()
- */
-mqtt_cb_t *mqttInitCallbacks(void);
-/*
- * mqttFiniCallbacks() Free callback array
- *
- * @cb = Callback array
- * return: none
- */
-void mqttFiniCallbacks(mqtt_cb_t ** __restrict cb);
-/*
- * MQTT_CALLBACK() Assign function to callback array for MQTT dispatcher
- *
- * @_cbs = Callback array
- * @_x = MQTT Message type, like MQTT_TYPE_* ...
- * @_func = Function
- * return: none
- */
-#define MQTT_CALLBACK(_cbs, _x, _func)	(assert((_cbs)), (_cbs)[(_x)] = (_func))
-/*
- * mqttDispatcher() MQTT Message type dispatcher
- *
- * @cb = Callback array
- * @buf = Received MQTT message
- * return: -1 error or >-1 return value from executed callback
- */
-inline int mqttDispatcher(mqtt_cb_t * __restrict cb, mqtt_msg_t * __restrict buf);
+unsigned short mqtt_readUNSUBACK(mqtt_msg_t * __restrict buf);
 
 
 #endif