Diff for /libaitmqtt/inc/aitmqtt.h between versions 1.1.1.1 and 1.1.1.1.2.3

version 1.1.1.1, 2012/01/26 13:07:33 version 1.1.1.1.2.3, 2012/01/27 15:12:27
Line 47  SUCH DAMAGE. Line 47  SUCH DAMAGE.
 #define __AITMQTT_H  #define __AITMQTT_H
   
   
   #define MAX_CONNID              24
   #define MAX_CRED                13
   #define MQTTMSG_MAX             65529
   
 /* FIXED HEADER */  /* FIXED HEADER */
   
 struct mqtthdr {  struct mqtthdr {
Line 138  typedef struct { Line 142  typedef struct {
         unsigned short  msg_len;          unsigned short  msg_len;
 } mqtt_msg_t;  } mqtt_msg_t;
   
 /* MQTT hooks callback */  
   
 typedef void *(*mqtt_cb_t)(void *);  
   
 /* MQTT structures */  /* MQTT structures */
   
 typedef union {  typedef union {
Line 218  inline void mqtt_msgFree(mqtt_msg_t ** __restrict msg, Line 218  inline void mqtt_msgFree(mqtt_msg_t ** __restrict msg,
 inline int mqtt_msgRealloc(mqtt_msg_t * __restrict msg, unsigned short len);  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   * mqtt_encodeLen() Encode number to MQTT length field
  *   *
  * @num = number for encode   * @num = number for encode
Line 488  struct mqtthdr *mqtt_readPUBLISH(mqtt_msg_t * __restri Line 501  struct mqtthdr *mqtt_readPUBLISH(mqtt_msg_t * __restri
  * @buf = Message buffer   * @buf = Message buffer
  * return: -1 error or MessageID   * 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   * mqtt_readPUBREC() Read PUBREC message
  *   *
  * @buf = Message buffer   * @buf = Message buffer
  * return: -1 error or MessageID   * 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   * mqtt_readPUBREL() Read PUBREL message
  *   *
  * @buf = Message buffer   * @buf = Message buffer
  * return: -1 error or MessageID   * 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   * mqtt_readPUBCOMP() Read PUBCOMP message
  *   *
  * @buf = Message buffer   * @buf = Message buffer
  * return: -1 error or MessageID   * 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   * mqtt_readSUBSCRIBE() Read SUBSCRIBE message
Line 529  struct mqtthdr *mqtt_readSUBSCRIBE(mqtt_msg_t * __rest Line 542  struct mqtthdr *mqtt_readSUBSCRIBE(mqtt_msg_t * __rest
  * @subqos = Subscribes QoS, must be free after use with free()   * @subqos = Subscribes QoS, must be free after use with free()
  * return: -1 error or >-1 readed subscribes QoS elements   * 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   * mqtt_readUNSUBSCRIBE() Read UNSUBSCRIBE message
  *   *
Line 546  struct mqtthdr *mqtt_readUNSUBSCRIBE(mqtt_msg_t * __re Line 559  struct mqtthdr *mqtt_readUNSUBSCRIBE(mqtt_msg_t * __re
  * @buf = Message buffer   * @buf = Message buffer
  * return: -1 error or MessageID   * return: -1 error or MessageID
  */   */
u_short mqtt_readUNSUBACK(mqtt_msg_t * __restrict buf);unsigned 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); 
   
   
 #endif  #endif

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.1.2.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>