diff options
| author | Flavio Santes <flavio.santes@1byt3.com> | 2017-10-16 01:11:48 -0400 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2017-10-16 09:56:08 +0000 |
| commit | 1a8143172c973fb74fa7b329a8b698cbb42ef865 (patch) | |
| tree | a79e7a62eb0f98d1427d3f13926ee6595bf44e37 /epan/dissectors/packet-mqtt.c | |
| parent | 5967621d19204947021932ea86f1e55fbe810124 (diff) | |
dissector/mqtt: Add the protocol version string
Add the protocol version string:
- 3 maps to MQTT v3.1
- 4 maps to MQTT v3.1.1
Change-Id: I8cf1ba0c1bcabd5718467946b33082e4eb5a37ed
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/23938
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan/dissectors/packet-mqtt.c')
| -rw-r--r-- | epan/dissectors/packet-mqtt.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/epan/dissectors/packet-mqtt.c b/epan/dissectors/packet-mqtt.c index 129d5c38f0..809401f73a 100644 --- a/epan/dissectors/packet-mqtt.c +++ b/epan/dissectors/packet-mqtt.c @@ -47,6 +47,10 @@ #define MQTT_DEFAULT_PORT 1883 /* IANA registered under service name as mqtt */ #define MQTT_SSL_DEFAULT_PORT 8883 /* IANA registered under service name secure-mqtt */ +/* MQTT Protocol Versions */ +#define MQTT_PROTO_V31 3 +#define MQTT_PROTO_V311 4 + #define MQTT_HDR_SIZE_BEFORE_LEN 1 /* MQTT MEssage Types */ @@ -76,6 +80,12 @@ void proto_register_mqtt(void); void proto_reg_handoff_mqtt(void); +static const value_string mqtt_protocol_version_vals[] = { + { MQTT_PROTO_V31, "MQTT v3.1" }, + { MQTT_PROTO_V311, "MQTT v3.1.1" }, + { 0, NULL } +}; + static const value_string mqtt_msgtype_vals[] = { { MQTT_RESERVED, "Reserved" }, { MQTT_CONNECT, "Connect Command" }, @@ -602,8 +612,8 @@ void proto_register_mqtt(void) NULL, HFILL }}, { &hf_mqtt_proto_ver, { "Version", "mqtt.ver", - FT_UINT8, BASE_DEC, NULL, 0, - NULL, HFILL }}, + FT_UINT8, BASE_DEC, VALS(mqtt_protocol_version_vals), 0, + "MQTT version", HFILL }}, /* Connect Flags */ { &hf_mqtt_conflags, { "Connect Flags", "mqtt.conflags", |