dunkelstern/libmqtt
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bugfix: Do not allow DUP flag for QoS 0

Browse source 
Re #11
This commit is contained in:
Johannes Schriewer 2018-07-30 22:20:10 +02:00
parent 254194dfc6
commit afc0d3aa27
2 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/packet.c
View file

@ -475,6 +475,11 @@ Buffer *encode_publish(PublishPayload *payload) {
}
buffer->data[buffer->position - 2] |= (payload->qos << 1);
if (payload->duplicate) {
if (payload->qos == MQTT_QOS_0) {
DEBUG_LOG("You can not set a DUP flag for QoS Level 0.");
buffer_release(buffer);
return NULL;
}
buffer->data[buffer->position - 2] |= 8;
}

20
tests/encode_packet.c
View file

@ -274,6 +274,25 @@ TestResult test_encode_publish_no_msg(void) {
);
}
TestResult test_encode_publish_dup_qos0(void) {
char data[] = {
0x33, 0x0e, // header, qos1, retain
0x00, 0x0a, 't', 'e', 's', 't', '/', 't', 'o', 'p', 'i', 'c',
0x00, 0x0a // packet id
};
PublishPayload *payload = calloc(1, sizeof(PublishPayload));
payload->qos = MQTT_QOS_0;
payload->duplicate = true;
payload->retain = true;
payload->topic = "test/topic";
payload->packet_id = 10;
Buffer *encoded = mqtt_packet_encode(&(MQTTPacket){ PacketTypePublish, payload });
free(payload);
TESTASSERT(encoded == NULL, "DUP and QoS level 0 is an incompatible combination");
}
TestResult test_encode_publish_with_msg(void) {
char data[] = {
0x3b, 0x15, // header, qos1, retain
@ -511,6 +530,7 @@ TESTS(
TEST("Encode Connect with auth", test_encode_connect_auth),
TEST("Encode ConnAck", test_encode_connack),
TEST("Encode Publish with no message", test_encode_publish_no_msg),
TEST("Encode Publish with invalid flags", test_encode_publish_dup_qos0),
TEST("Encode Publish with message", test_encode_publish_with_msg),
TEST("Encode PubAck", test_encode_puback),
TEST("Encode PubRec", test_encode_pubrec),