[BACK]Return to aitmqtt.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / inc

Diff for /mqtt/inc/Attic/aitmqtt.h between versions 1.1.1.1.2.7 and 1.1.1.1.2.15

version 1.1.1.1.2.7, 2011/11/21 12:47:15 version 1.1.1.1.2.15, 2011/11/22 13:00:33
Line 96  typedef union { Line 96  typedef union {
 } mqtt_v_t;  } mqtt_v_t;
   
 typedef struct {  typedef struct {
           mqtt_v_t        sub_sb;
           char            *sub_data;
           unsigned char   sub_qos;
   } mqtt_subscr_t;
   
   typedef struct {
         mqtt_v_t        var_sb;          mqtt_v_t        var_sb;
         unsigned char   var_data[0];          unsigned char   var_data[0];
 } __packed mqtthdr_var_t;  } __packed mqtthdr_var_t;
 #define MQTTHDR_VAR_SIZEOF(x)           (assert((x)), sizeof(mqtt_v_t) + ntohs((x)->var_sb.val))  #define MQTTHDR_VAR_SIZEOF(x)           (assert((x)), sizeof(mqtt_v_t) + ntohs((x)->var_sb.val))
   
 typedef unsigned char mqtthdr_protover_t;  typedef unsigned char mqtthdr_protover_t;
 typedef unsigned char mqtthdr_retcode_t;  
   
 typedef struct {  typedef struct {
         unsigned char   reserved:1,          unsigned char   reserved:1,
Line 138  inline const char *mqtt_GetError(); Line 143  inline const char *mqtt_GetError();
   
 /*  /*
  * mqtt_msgAlloc() Allocate memory for MQTT Message   * mqtt_msgAlloc() Allocate memory for MQTT Message
    *
  * @len = >0 Allocate buffer with length   * @len = >0 Allocate buffer with length
  * return: NULL error or Message, after use must call mqtt_msgFree() with all!=0   * return: NULL error or Message, after use must call mqtt_msgFree() with all!=0
  */   */
 inline mqtt_msg_t *mqtt_msgAlloc(unsigned short len);  inline mqtt_msg_t *mqtt_msgAlloc(unsigned short len);
 /*  /*
  * mqtt_msgFree() Free MQTT message   * mqtt_msgFree() Free MQTT message
    *
  * @msg = Message buffer   * @msg = Message buffer
  * @all = !=0 Destroy entire message, if MQTT Message allocated with mqtt_msgAlloc()   * @all = !=0 Destroy entire message, if MQTT Message allocated with mqtt_msgAlloc()
  * return: none   * return: none
Line 151  inline mqtt_msg_t *mqtt_msgAlloc(unsigned short len); Line 158  inline mqtt_msg_t *mqtt_msgAlloc(unsigned short len);
 inline void mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all);  inline void mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all);
 /*  /*
  * mqtt_msgRealloc() Reallocate MQTT message buffer   * mqtt_msgRealloc() Reallocate MQTT message buffer
    *
  * @msg = MQTT message   * @msg = MQTT message
  * @len = new length   * @len = new length
  * return: -1 error or >-1 old buffer length   * return: -1 error or >-1 old buffer length
Line 159  inline int mqtt_msgRealloc(mqtt_msg_t * __restrict msg Line 167  inline int mqtt_msgRealloc(mqtt_msg_t * __restrict msg
   
 /*  /*
  * mqtt_encodeLen() Encode number to MQTT length field   * mqtt_encodeLen() Encode number to MQTT length field
    *
  * @num = number for encode   * @num = number for encode
  * return: -1 error or >-1 length   * return: -1 error or >-1 length
  */   */
 inline unsigned int mqtt_encodeLen(unsigned int num);  inline unsigned int mqtt_encodeLen(unsigned int num);
 /*  /*
  * mqtt_decodeLen() Decode length from MQTT packet   * mqtt_decodeLen() Decode length from MQTT packet
    *
  * @len = length   * @len = length
  * @n = sizeof bytes, if !=NULL   * @n = sizeof bytes, if !=NULL
  * return: -1 error, >-1 length of message   * return: -1 error, >-1 length of message
Line 172  inline unsigned int mqtt_encodeLen(unsigned int num); Line 182  inline unsigned int mqtt_encodeLen(unsigned int num);
 inline unsigned int mqtt_decodeLen(unsigned int len, char *n);  inline unsigned int mqtt_decodeLen(unsigned int len, char *n);
 /*  /*
  * mqtt_sizeLen Return sizeof len field   * mqtt_sizeLen Return sizeof len field
    *
  * @len = length   * @len = length
  * return: -1 error, >-1 sizeof len in bytes   * return: -1 error, >-1 sizeof len in bytes
  */   */
 inline char mqtt_sizeLen(unsigned int len);  inline char mqtt_sizeLen(unsigned int len);
 /*  /*
 * mqtt_str2var Create MQTT variable from string * mqtt_str2sub Create MQTT subscribe variable from string(s)
 * @csStr = string *
 * @strLen = string length * @csStr = strings
 * return: NULL error or != ok variable, must be free after use! * @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 mqtthdr_var_t *mqtt_str2var(const unsigned char *csStr, unsigned short strLen);inline mqtt_subscr_t *mqtt_str2sub(const char **csStr, unsigned short strnum, unsigned char *qoses);
 /*
  * mqtt_subFree() Free array from subscribe variables
  *
  * @subs = Subscribe variables
  * @all = if !=0 free and subs pointer
  * return: none
  */
 inline void mqtt_subFree(mqtt_subscr_t ** __restrict subs, int all);
 /*
  * mqtt_subAlloc() Create array from subscribe variables
  *
  * @num = Number of elements
  * return: NULL error or subscribe array, after use must call mqtt_subFree() with all!=0
  */
 inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num);
   
 /*  /*
  * mqtt_msgCONNECT() Create CONNECT message   * mqtt_msgCONNECT() Create CONNECT message
Line 201  inline mqtthdr_var_t *mqtt_str2var(const unsigned char Line 230  inline mqtthdr_var_t *mqtt_str2var(const unsigned char
 int mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const char *csConnID,   int mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const char *csConnID, 
                 const char *csUser, const char *csPass,                   const char *csUser, const char *csPass, 
                 const char *csWillTopic, const char *csWillMessage,                   const char *csWillTopic, const char *csWillMessage, 
                char ClrSess, char WillQOS, char WillRetain);                unsigned char ClrSess, unsigned char WillQOS, unsigned char WillRetain);
 /*  /*
  * mqtt_msgCONNACK() Create CONNACK message   * mqtt_msgCONNACK() Create CONNACK message
  *   *
Line 209  int mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const Line 238  int mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const
  * @retcode = Return code   * @retcode = Return code
  * return: -1 error or >-1 message size for send   * return: -1 error or >-1 message size for send
  */   */
int mqtt_msgCONNACK(mqtt_msg_t * __restrict buf, u_char retcode);int mqtt_msgCONNACK(mqtt_msg_t * __restrict buf, unsigned char retcode);
 
 /*
  * mqtt_msgPUBLISH() Create PUBLISH message
  *
  * @buf = Message buffer
  * @csTopic = Publish topic
  * @msgID = MessageID >0, if QOS != MQTT_QOS_ONCE
  * @Dup = Duplicate message
  * @QOS = QoS
  * @Retain = Retain message
  * @pData = Publish data into topic
  * @datlen = Publish data length
  * return: -1 error or >-1 message size for send
  */
 int mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const char *csTopic, unsigned short msgID, 
                 unsigned char Dup, unsigned char QOS, unsigned char Retain, 
                 const void *pData, unsigned short datlen);
 /*
  * mqtt_msgPUBACK() Create PUBACK message
  *
  * @buf = Message buffer
  * @msgID = MessageID
  * return: -1 error or >-1 message size for send
  */
 inline int mqtt_msgPUBACK(mqtt_msg_t * __restrict buf, unsigned short msgID);
 /*
  * mqtt_msgPUBREC() Create PUBREC message
  *
  * @buf = Message buffer
  * @msgID = MessageID
  * return: -1 error or >-1 message size for send
  */
 inline int mqtt_msgPUBREC(mqtt_msg_t * __restrict buf, unsigned short msgID);
 /*
  * mqtt_msgPUBREL() Create PUBREL message
  *
  * @buf = Message buffer
  * @msgID = MessageID
  * return: -1 error or >-1 message size for send
  */
 inline int mqtt_msgPUBREL(mqtt_msg_t * __restrict buf, unsigned short msgID);
 /*
  * mqtt_msgPUBCOMP() Create PUBCOMP message
  *
  * @buf = Message buffer
  * @msgID = MessageID
  * return: -1 error or >-1 message size for send
  */
 inline int mqtt_msgPUBCOMP(mqtt_msg_t * __restrict buf, unsigned short msgID);
 
 /*
  * mqtt_msgSUBSCRIBE() Create SUBSCRIBE message
  *
  * @buf = Message buffer
  * @Topics = MQTT subscription topics
  * @msgID = MessageID
  * @Dup = Duplicate message
  * @QOS = QoS
  * return: -1 error or >-1 message size for send
  */
 int
 mqtt_msgSUBSCRIBE(mqtt_msg_t * __restrict buf, mqtt_subscr_t * __restrict Topics, 
                 unsigned short msgID, unsigned char Dup, unsigned char QOS);
 /*
  * mqtt_msgSUBACK() Create SUBACK message
  *
  * @buf = Message buffer
  * @Topics = MQTT subscription topics
  * @msgID = MessageID
  * return: -1 error or >-1 message size for send
  */
 int mqtt_msgSUBACK(mqtt_msg_t * __restrict buf, mqtt_subscr_t * __restrict Topics, 
                 unsigned short msgID);
   
   
 #endif  #endif
Removed from v.1.1.1.1.2.7  
changed lines
  Added in v.1.1.1.1.2.15

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