[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.6 and 1.1.1.1.2.13

version 1.1.1.1.2.6, 2011/11/21 12:16:11 version 1.1.1.1.2.13, 2011/11/22 10:33:39
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 114  typedef struct { Line 119  typedef struct {
                         username:1;                          username:1;
 } __packed mqtthdr_connflgs_t;  } __packed mqtthdr_connflgs_t;
   
   typedef struct {
           unsigned char   reserved;
           unsigned char   retcode;
   } __packed mqtthdr_connack_t;
   
   
 /* MQTT Message buffer */  /* MQTT Message buffer */
   
 typedef struct {  typedef struct {
Line 172  inline unsigned int mqtt_decodeLen(unsigned int len, c Line 182  inline unsigned int mqtt_decodeLen(unsigned int len, c
  */   */
 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 * @csStr = strings
 * @strLen = string length * @strnum = number of strings elements
 * return: NULL error or != ok variable, must be free after use! * @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_freeSub() Free array from subscribe variables
  *
  * @subs = Subscribe variables
  * return: none
  */
 inline void mqtt_freeSub(mqtt_subscr_t ** __restrict subs);
   
 /*  /*
  * mqtt_msgCONNECT() Create CONNECT message   * mqtt_msgCONNECT() Create CONNECT message
Line 196  inline mqtthdr_var_t *mqtt_str2var(const unsigned char Line 215  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
  *
  * @buf = Message buffer
  * @retcode = Return code
  * return: -1 error or >-1 message size for send
  */
 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);
   
   
 #endif  #endif
Removed from v.1.1.1.1.2.6  
changed lines
  Added in v.1.1.1.1.2.13

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