diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2019-10-09 09:39:44 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-10-14 06:49:51 +0000 |
| commit | 7e12cb1537ff4a95b0b8487e36dd2b8d727577d8 (patch) | |
| tree | 5c3b5c0b72805accc8582247c04343c630c9c525 /epan/dissectors/packet-mqtt.c | |
| parent | 5dd3c2b8ef2de97c3c262cb9006bffa9918bca9e (diff) | |
mqtt: fix conflict
'mqtt.willmsg' exists multiple times with NOT compatible types: FT_STRING and FT_BYTES
'mqtt.msg' exists multiple times with NOT compatible types: FT_STRING and FT_BYTES
Change-Id: Iaace2464c3e7174bbd6adc7550fe51e614b4d0bb
Reviewed-on: https://code.wireshark.org/review/34750
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mqtt.c')
| -rw-r--r-- | epan/dissectors/packet-mqtt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-mqtt.c b/epan/dissectors/packet-mqtt.c index ab29b3e864..fc8b102de6 100644 --- a/epan/dissectors/packet-mqtt.c +++ b/epan/dissectors/packet-mqtt.c @@ -1425,7 +1425,7 @@ void proto_register_mqtt(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_mqtt_will_msg_text, - { "Will Message", "mqtt.willmsg", + { "Will Message", "mqtt.willmsg_text", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_mqtt_will_msg_len, @@ -1453,7 +1453,7 @@ void proto_register_mqtt(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_mqtt_pubmsg_text, - { "Message", "mqtt.msg", + { "Message", "mqtt.msg_text", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_mqtt_pubmsg_decoded, |