[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.26 and 1.1.1.1.2.34

version 1.1.1.1.2.26, 2011/12/05 17:05:38 version 1.1.1.1.2.34, 2011/12/13 15:23:43
Line 108  typedef struct { Line 108  typedef struct {
   
 typedef unsigned char mqtthdr_protover_t;  typedef unsigned char mqtthdr_protover_t;
   
typedef struct {typedef union {
        unsigned char   reserved:1,        struct {
                        clean_sess:1,                unsigned char   reserved:1,
                        will_flg:1,                                clean_sess:1,
                        will_qos:2,                                will_flg:1,
                        will_retain:1,                                will_qos:2,
                        password:1,                                will_retain:1,
                        username:1;                                password:1,
                                 username:1;
         };
         unsigned char           flags;
 } __packed mqtthdr_connflgs_t;  } __packed mqtthdr_connflgs_t;
   
 typedef struct {  typedef struct {
Line 214  inline void mqtt_subFree(mqtt_subscr_t ** __restrict s Line 217  inline void mqtt_subFree(mqtt_subscr_t ** __restrict s
  * return: NULL error or subscribe array, after use must call mqtt_subFree()   * return: NULL error or subscribe array, after use must call mqtt_subFree()
  */   */
 inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num);  inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num);
   /*
    * mqtt_subRealloc() Reallocate array from subscribe variables
    *
    * @subs = Subscribe array
    * @num = Number of elements
    * return: NULL error or subscribe array, after use must call mqtt_subFree()
    */
   inline mqtt_subscr_t *mqtt_subRealloc(mqtt_subscr_t * __restrict subs, unsigned short num);
   
   
 /*** SENDER FUNCTIONS ***/  /*** SENDER FUNCTIONS ***/
Line 223  inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num Line 234  inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num
  *   *
  * @buf = Message buffer   * @buf = Message buffer
  * @csConnID = ConnectID   * @csConnID = ConnectID
    * @kasec = Keep alive timeout
  * @csUser = Username if !=NULL   * @csUser = Username if !=NULL
  * @csPass = Password for Username, only if csUser is set   * @csPass = Password for Username, only if csUser is set
  * @csWillTopic = Will Topic if !=NULL Will Flags set into message   * @csWillTopic = Will Topic if !=NULL Will Flags set into message
Line 233  inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num Line 245  inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num
  * return: -1 error or >-1 message size for send   * return: -1 error or >-1 message size for send
  */   */
 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,                 unsigned short kasec, const char *csUser, const char *csPass, 
                 const char *csWillTopic, const char *csWillMessage,                   const char *csWillTopic, const char *csWillMessage, 
                 unsigned char ClrSess, unsigned char WillQOS, unsigned char WillRetain);                  unsigned char ClrSess, unsigned char WillQOS, unsigned char WillRetain);
 /*  /*
Line 279  int mqtt_msgPINGRESP(mqtt_msg_t * __restrict buf); Line 291  int mqtt_msgPINGRESP(mqtt_msg_t * __restrict buf);
  * @datlen = Publish data length   * @datlen = Publish data length
  * return: -1 error or >-1 message size for send   * return: -1 error or >-1 message size for send
  */   */
int mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const char *csTopic, unsigned short msgID, int mqtt_msgPUBLISH(mqtt_msg_t * __restrict buf, const char *csTopic, 
                unsigned char Dup, unsigned char QOS, unsigned char Retain,                 unsigned short msgID, unsigned char Dup, unsigned char QOS, 
                const void *pData, unsigned short datlen);                unsigned char Retain, const void *pData, int datlen);
 /*  /*
  * mqtt_msgPUBACK() Create PUBACK message   * mqtt_msgPUBACK() Create PUBACK message
  *   *
Line 374  int mqtt_msgUNSUBACK(mqtt_msg_t * __restrict buf, unsi Line 386  int mqtt_msgUNSUBACK(mqtt_msg_t * __restrict buf, unsi
  * @userLen = Username length   * @userLen = Username length
  * @psPass = Password for Username, only if csUser is set   * @psPass = Password for Username, only if csUser is set
  * @passLen = Password length   * @passLen = Password length
 * @psWillTopic = Will Topic if !=NULL Will Flags set into message * @psWillTopic = Will Topic if !=NULL Will Flags set into message and must be free()
 * @topicLen = Will Topic length * @psWillMessage = Will Message, may be NULL if !NULL must be free() after use!
 * @psWillMessage = Will Message, may be NULL 
 * @msgLen = Will Message length 
  * return: .reserved == 1 is error or == 0 connection flags & msg ok   * return: .reserved == 1 is error or == 0 connection flags & msg ok
  */   */
mqtthdr_connflgs_t mqtt_readCONNECT(mqtt_msg_t * __restrict buf, unsigned short *kasec, mqtthdr_connack_t mqtt_readCONNECT(mqtt_msg_t * __restrict buf, unsigned short *kasec, 
                 char * __restrict psConnID, int connLen,                   char * __restrict psConnID, int connLen, 
                 char * __restrict psUser, int userLen, char * __restrict psPass, int passLen,                    char * __restrict psUser, int userLen, char * __restrict psPass, int passLen,  
                char * __restrict psWillTopic, int topicLen, char * __restrict psWillMessage, int msgLen);                char ** __restrict psWillTopic, char ** __restrict psWillMessage);
 /*  /*
  * mqtt_readCONNACK() Read CONNACK message   * mqtt_readCONNACK() Read CONNACK message
  *   *
Line 413  int mqtt_readPINGREQ(mqtt_msg_t * __restrict buf); Line 423  int mqtt_readPINGREQ(mqtt_msg_t * __restrict buf);
  */   */
 int mqtt_readPINGRESP(mqtt_msg_t * __restrict buf);  int mqtt_readPINGRESP(mqtt_msg_t * __restrict buf);
   
   /*
    * mqtt_readPUBLISH() Read PUBLISH message
    *
    * @buf = Message buffer
    * @psTopic = Topic
    * @topicLen = Topic length
    * @msgID = MessageID
    * @pData = Data buffer
    * @datLen = Data buffer length, if *datLen == 0 allocate memory for pData
    * return: NULL error or !=NULL MQTT fixed header
    */
   struct mqtthdr *mqtt_readPUBLISH(mqtt_msg_t * __restrict buf, char * __restrict psTopic, 
                   int topicLen, unsigned short *msgID, void * __restrict pData, int *datLen);
   /*
    * mqtt_readPUBACK() Read PUBACK message
    *
    * @buf = Message buffer
    * return: -1 error or MessageID
    */
   u_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);
   /*
    * mqtt_readPUBREL() Read PUBREL message
    *
    * @buf = Message buffer
    * return: -1 error or MessageID
    */
   u_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);
   
   /*
    * mqtt_readSUBSCRIBE() Read SUBSCRIBE message
    *
    * @buf = Message buffer
    * @msgID = MessageID
    * @subscr = Subscriptions, must be free after use with mqtt_subFree()
    * return: NULL error or !=NULL MQTT fixed header
    */
   struct mqtthdr *mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, unsigned short *msgID, 
                   mqtt_subscr_t **subscr);
   /*
    * mqtt_readSUBACK() Read SUBACK message
    *
    * @buf = Message buffer
    * @msgID = MessageID
    * @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);
   /*
    * 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
    */
   struct mqtthdr *mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, unsigned short *msgID, 
                   mqtt_subscr_t **subscr);
   /*
    * mqtt_readUNSUBACK() Read UNSUBACK message
    *
    * @buf = Message buffer
    * return: -1 error or MessageID
    */
   u_short mqtt_readUNSUBACK(mqtt_msg_t * __restrict buf);
   
 /*** ENGINE FUNCTIONS ***/  /*** ENGINE FUNCTIONS ***/
   
Removed from v.1.1.1.1.2.26  
changed lines
  Added in v.1.1.1.1.2.34

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