From c2b858e26de89bd90c3c782c43c1bff1c0ac79f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Sun, 11 Sep 2016 20:21:10 +0200 Subject: mqtt: Fix subscribe/suback QoS values MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I15424b768e6e0fe2e8268db69b82d81351146155 Reviewed-on: https://code.wireshark.org/review/17643 Reviewed-by: Stig Bjørlykke --- epan/dissectors/packet-mqtt.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'epan') diff --git a/epan/dissectors/packet-mqtt.c b/epan/dissectors/packet-mqtt.c index 3108b39601..c85211d2bb 100644 --- a/epan/dissectors/packet-mqtt.c +++ b/epan/dissectors/packet-mqtt.c @@ -97,17 +97,15 @@ static const value_string mqtt_qos_vals[] = { { 0, NULL } }; -#define MQTT_QOS_0 0 -#define MQTT_QOS_1 1 -#define MQTT_QOS_2 2 #define MQTT_SUBACK_FAILURE 128 static const value_string mqtt_subqos_vals[] = { - { MQTT_QOS_0, "0" }, - { MQTT_QOS_1, "1" }, - { MQTT_QOS_2, "2" }, - { MQTT_SUBACK_FAILURE, "Failure" }, - { 0, NULL } + { MQTT_QOS_ATMOST_ONCE, "At most once delivery (Fire and Forget)" }, + { MQTT_QOS_ATLEAST_ONCE, "At least once delivery (Acknowledged deliver)" }, + { MQTT_QOS_EXACTLY_ONCE, "Exactly once delivery (Assured Delivery)" }, + { MQTT_QOS_RESERVED, "Reserved" }, + { MQTT_SUBACK_FAILURE, "Failure" }, + { 0, NULL } }; #define MQTT_CON_ACCEPTED 0 -- cgit v1.2.3