Files
paho.mqtt-sn.embedded-c/MQTTSNPacket/src/MQTTSNUnsubscribeClient.c
tomoaki 5c278f1aec BugFix: MQTTSNDeserialize_XXXX() functions don't return error code when
error occurs.

Do not store the length of packet into rc.

If the packet is incorrect, skip the processing that follows.

Bugfix: Print out the value of TopicId in SUBACK and UNSUBACK. 
 
Signed-off-by: tomoaki <tomoaki@tomy-tech.com>
2017-05-19 09:44:51 +09:00

118 lines
3.3 KiB
C

/*******************************************************************************
* Copyright (c) 2014 IBM Corp.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* and Eclipse Distribution License v1.0 which accompany this distribution.
*
* The Eclipse Public License is available at
* http://www.eclipse.org/legal/epl-v10.html
* and the Eclipse Distribution License is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
* Contributors:
* Ian Craggs - initial API and implementation and/or initial documentation
*******************************************************************************/
#include "MQTTSNPacket.h"
#include "StackTrace.h"
#include <string.h>
/**
* Determines the length of the MQTTSN subscribe packet that would be produced using the supplied parameters,
* excluding length
* @param topicName the topic name to be used in the publish
* @return the length of buffer needed to contain the serialized version of the packet
*/
int MQTTSNSerialize_unsubscribeLength(MQTTSN_topicid* topicFilter)
{
int len = 4;
if (topicFilter->type == MQTTSN_TOPIC_TYPE_NORMAL)
len += topicFilter->data.long_.len;
else if (topicFilter->type == MQTTSN_TOPIC_TYPE_SHORT || topicFilter->type == MQTTSN_TOPIC_TYPE_PREDEFINED)
len += 2;
return len;
}
int MQTTSNSerialize_unsubscribe(unsigned char* buf, int buflen, unsigned short packetid, MQTTSN_topicid* topicFilter)
{
unsigned char *ptr = buf;
MQTTSNFlags flags;
int len = 0;
int rc = 0;
FUNC_ENTRY;
if ((len = MQTTSNPacket_len(MQTTSNSerialize_unsubscribeLength(topicFilter))) > buflen)
{
rc = MQTTSNPACKET_BUFFER_TOO_SHORT;
goto exit;
}
ptr += MQTTSNPacket_encode(ptr, len); /* write length */
writeChar(&ptr, MQTTSN_UNSUBSCRIBE); /* write message type */
flags.all = 0;
flags.bits.topicIdType = topicFilter->type;
writeChar(&ptr, flags.all);
writeInt(&ptr, packetid);
/* now the topic id or name */
if (topicFilter->type == MQTTSN_TOPIC_TYPE_NORMAL) /* means long topic name */
{
memcpy(ptr, topicFilter->data.long_.name, topicFilter->data.long_.len);
ptr += topicFilter->data.long_.len;
}
else if (topicFilter->type == MQTTSN_TOPIC_TYPE_PREDEFINED)
writeInt(&ptr, topicFilter->data.id);
else if (topicFilter->type == MQTTSN_TOPIC_TYPE_SHORT)
{
writeChar(&ptr, topicFilter->data.short_name[0]);
writeChar(&ptr, topicFilter->data.short_name[1]);
}
rc = ptr - buf;
exit:
FUNC_EXIT_RC(rc);
return rc;
}
/**
* Deserializes the supplied (wire) buffer into unsuback data
* @param packetid returned - the same value as the one contained in the corresponding SUBSCRIBE
* @param buf the raw buffer data, of the correct length determined by the remaining length field
* @param buflen the length in bytes of the data in the supplied buffer
* @return error code. 1 is success
*/
int MQTTSNDeserialize_unsuback(unsigned short* packetid, unsigned char* buf, int buflen)
{
unsigned char* curdata = buf;
unsigned char* enddata = NULL;
int rc = 0;
int mylen = 0;
FUNC_ENTRY;
curdata += MQTTSNPacket_decode(curdata, buflen, &mylen); /* read length */
enddata = buf + mylen;
if (enddata - curdata > buflen)
goto exit;
if (readChar(&curdata) != MQTTSN_UNSUBACK)
goto exit;
*packetid = readInt(&curdata);
rc = 1;
exit:
FUNC_EXIT_RC(rc);
return rc;
}