Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set NULL payloads and fix unit test #71

Merged
merged 5 commits into from
Sep 19, 2020
Merged

Set NULL payloads and fix unit test #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd4d6a8
Set payload to NULL when zero length
muneebahmed10 Sep 18, 2020
a9a3391
Add unit test for zero length payload
muneebahmed10 Sep 18, 2020
03deda8
Fix unit tests for deserialize publish
muneebahmed10 Sep 18, 2020
0281aa8
Rename setupWillInfo to setupPublishInfo
muneebahmed10 Sep 18, 2020
92c254a
Remove void * from memset
muneebahmed10 Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions source/core_mqtt_serializer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1274,6 +1274,9 @@ static MQTTStatus_t deserializePublish( const MQTTPacketInfo_t * pIncomingPacket

LogDebug( ( "Packet identifier %hu.", *pPacketId ) );

/* Advance pointer two bytes to start of payload as in the QoS 0 case. */
pPacketIdentifierHigh += sizeof( uint16_t );

/* Packet identifier cannot be 0. */
if( *pPacketId == 0U )
{
Expand All @@ -1286,17 +1289,17 @@ static MQTTStatus_t deserializePublish( const MQTTPacketInfo_t * pIncomingPacket
{
/* Calculate the length of the payload. QoS 1 or 2 PUBLISH packets contain
* a packet identifier, but QoS 0 PUBLISH packets do not. */
if( pPublishInfo->qos == MQTTQoS0 )
{
pPublishInfo->payloadLength = ( pIncomingPacket->remainingLength - pPublishInfo->topicNameLength - sizeof( uint16_t ) );
pPublishInfo->pPayload = pPacketIdentifierHigh;
}
else
pPublishInfo->payloadLength = pIncomingPacket->remainingLength - pPublishInfo->topicNameLength - sizeof( uint16_t );

if( pPublishInfo->qos != MQTTQoS0 )
{
pPublishInfo->payloadLength = ( pIncomingPacket->remainingLength - pPublishInfo->topicNameLength - 2U * sizeof( uint16_t ) );
pPublishInfo->pPayload = pPacketIdentifierHigh + sizeof( uint16_t );
/* Two more bytes for the packet identifier. */
pPublishInfo->payloadLength -= sizeof( uint16_t );
Copy link
Contributor

@yourslab yourslab Sep 18, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of adding two bytes in advance then subtracting them if pPublishInfo->qos != MQTTQoS0, why not just add once if pPublishInfo->qos != MQTTQoS0?

Copy link
Contributor Author

@muneebahmed10 muneebahmed10 Sep 18, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what you mean, we're not adding any bytes to the payload length. The payload length is defined as: Remaining length - # of Topic length bytes - Topic length - # of packet ID bytes. There are two packet ID bytes for QoS > 0, and none for QoS 0. So, we need to subtract an additional 2 for QoS > 0.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh got it, I seem to have misread the code.

}

/* Set payload if it exists. */
pPublishInfo->pPayload = ( pPublishInfo->payloadLength != 0U ) ? pPacketIdentifierHigh : NULL;

LogDebug( ( "Payload length %lu.", ( unsigned long ) pPublishInfo->payloadLength ) );
}

Expand Down
Loading