Diff for /mqtt/inc/Attic/aitmqtt.h between versions 1.1.1.1.2.4 and 1.1.1.1.2.6

version 1.1.1.1.2.4, 2011/11/07 16:55:46 version 1.1.1.1.2.6, 2011/11/21 12:16:11
Line 93  typedef union { Line 93  typedef union {
                                 l:8;                                  l:8;
         } sb;          } sb;
         unsigned short  val;          unsigned short  val;
} mqtthdr_val_t;} mqtt_v_t;
   
 typedef struct {  typedef struct {
        mqtthdr_val_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))
   
 typedef unsigned char mqtthdr_protover_t;  typedef unsigned char mqtthdr_protover_t;
 typedef unsigned char mqtthdr_retcode_t;  typedef unsigned char mqtthdr_retcode_t;
Line 114  typedef struct { Line 115  typedef struct {
 } __packed mqtthdr_connflgs_t;  } __packed mqtthdr_connflgs_t;
   
   
   /* MQTT Message buffer */
   
   typedef struct {
           void            *msg_base;
           unsigned short  msg_len;
   } mqtt_msg_t;
   
   
 // -------------------------------------------------------  // -------------------------------------------------------
 // mqtt_GetErrno() Get error code of last operation  // mqtt_GetErrno() Get error code of last operation
 inline int mqtt_GetErrno();  inline int mqtt_GetErrno();
Line 123  inline const char *mqtt_GetError(); Line 132  inline const char *mqtt_GetError();
   
   
 /*  /*
    * mqtt_msgAlloc() Allocate memory for MQTT Message
    * @len = >0 Allocate buffer with length
    * return: NULL error or Message, after use must call mqtt_msgFree() with all!=0
    */
   inline mqtt_msg_t *mqtt_msgAlloc(unsigned short len);
   /*
    * mqtt_msgFree() Free MQTT message
    * @msg = Message buffer
    * @all = !=0 Destroy entire message, if MQTT Message allocated with mqtt_msgAlloc()
    * return: none
    */
   inline void mqtt_msgFree(mqtt_msg_t ** __restrict msg, int all);
   /*
    * mqtt_msgRealloc() Reallocate MQTT message buffer
    * @msg = MQTT message
    * @len = new length
    * return: -1 error or >-1 old buffer length
    */
   inline int mqtt_msgRealloc(mqtt_msg_t * __restrict msg, unsigned short len);
   
   /*
  * 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
Line 148  inline char mqtt_sizeLen(unsigned int len); Line 178  inline char mqtt_sizeLen(unsigned int len);
  * return: NULL error or != ok variable, must be free after use!   * return: NULL error or != ok variable, must be free after use!
  */   */
 inline mqtthdr_var_t *mqtt_str2var(const unsigned char *csStr, unsigned short strLen);  inline mqtthdr_var_t *mqtt_str2var(const unsigned char *csStr, unsigned short strLen);
   
   /*
    * mqtt_msgCONNECT() Create CONNECT message
    *
    * @buf = Message buffer
    * @csConnID = ConnectID
    * @csUser = Username if !=NULL
    * @csPass = Password for Username, only if csUser is set
    * @csWillTopic = Will Topic if !=NULL Will Flags set into message
    * @csWillMessage = Will Message, may be NULL
    * @ClrSess = Clear Session subscriptions after disconnect
    * @WillQOS = Will QOS if csWillTopic is set
    * @WillRetain = Will Retain Will Message if csWillTopic is set
    * return: -1 error or >-1 message size for send
    */
   int mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const char *csConnID, 
                   const char *csUser, const char *csPass, 
                   const char *csWillTopic, const char *csWillMessage, 
                   char ClrSess, char WillQOS, char WillRetain);
   
   
 #endif  #endif

Removed from v.1.1.1.1.2.4  
changed lines
  Added in v.1.1.1.1.2.6


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