--- mqtt/inc/Attic/aitmqtt.h 2011/12/05 22:17:39 1.1.1.1.2.27 +++ mqtt/inc/Attic/aitmqtt.h 2011/12/06 09:04:55 1.1.1.1.2.28 @@ -279,9 +279,9 @@ int mqtt_msgPINGRESP(mqtt_msg_t * __restrict buf); * @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); +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, int datlen); /* * mqtt_msgPUBACK() Create PUBACK message * @@ -413,6 +413,19 @@ int mqtt_readPINGREQ(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 *