--- libaitmqtt/inc/aitmqtt.h 2012/01/26 13:07:33 1.1.1.1 +++ libaitmqtt/inc/aitmqtt.h 2012/04/26 15:26:37 1.1.1.1.2.10 @@ -3,7 +3,7 @@ * by Michael Pounov * * $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.10 2012/04/26 15:26:37 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 -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -47,6 +47,15 @@ SUCH DAMAGE. #define __AITMQTT_H +#define MAX_CONNID 24 +#define MAX_CRED 13 +#define MQTTMSG_MAX 65529 +#define MQTT_DATA_MAX 268435455 + +#define MQTT_PROTO_VER 3 +#define MQTT_KEEPALIVE 10 +#define MQTT_DEFAULT_MSGID 0xDEBA + /* FIXED HEADER */ struct mqtthdr { @@ -95,6 +104,9 @@ struct mqtthdr { #define MQTT_QOS_EXACTLY 2 /* Exactly once, Assured delivery, =1 */ #define MQTT_QOS_RESERVED 3 /* reserved */ +#define MQTT_QOS_DENY 0 /* Not granted QoS for SUBACK */ +#define MQTT_QOS_PASS 2 /* Granted QoS for SUBACK */ + #define MQTT_FLAG_RETAIN 1 /* This flag is only used on PUBLISH messages. When a client sends a PUBLISH to a server, @@ -138,10 +150,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 +226,28 @@ 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_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); + +/* * mqtt_encodeLen() Encode number to MQTT length field * * @num = number for encode @@ -240,15 +270,16 @@ inline unsigned int mqtt_decodeLen(void * __restrict l */ inline char mqtt_sizeLen(unsigned int len); /* - * mqtt_str2sub Create MQTT subscribe variable from string(s) + * mqtt_str2subs Create MQTT subscribe variable from string(s) * - * @csStr = strings - * @strnum = number of strings elements + * @csStr = null terminated string array + * @strnum = copy at most 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, unsigned short strnum, unsigned char *qoses); +inline mqtt_subscr_t *mqtt_str2subs(const char **csStr, unsigned short strnum, + unsigned char *qoses); /* * mqtt_subFree() Free array from subscribe variables * @@ -488,28 +519,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 @@ -517,9 +548,9 @@ u_short mqtt_readPUBCOMP(mqtt_msg_t * __restrict buf); * @buf = Message buffer * @msgID = MessageID * @subscr = Subscriptions, must be free after use with mqtt_subFree() - * return: NULL error or !=NULL MQTT fixed header + * return: -1 error or >-1 elements into subscr */ -struct mqtthdr *mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, unsigned short *msgID, +int mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, unsigned short *msgID, mqtt_subscr_t **subscr); /* * mqtt_readSUBACK() Read SUBACK message @@ -529,16 +560,16 @@ 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 * * @buf = Message buffer * @msgID = MessageID * @subscr = Subscriptions, must be free after use with mqtt_subFree() - * return: NULL error or !=NULL MQTT fixed header + * return: -1 error or >-1 elements into subscr */ -struct mqtthdr *mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, unsigned short *msgID, +int mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, unsigned short *msgID, mqtt_subscr_t **subscr); /* * mqtt_readUNSUBACK() Read UNSUBACK message @@ -546,40 +577,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