osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

MQTT: Revert subdissector call to not pass topic as data 

An inadvertent change in f6ad48 caused sub-dissectors to be called
with their data argument set to the message topic.

This isn't required for the SparkplugB heuristic dissector (or any
other it seems).
This commit is contained in:
Graham Bloice 2021-05-30 20:25:42 +01:00
parent a5df597b3d
commit 59de442abb
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-mqtt.c
View File

@ -752,12 +752,7 @@ static gboolean mqtt_user_decode_message(proto_tree *tree, proto_tree *mqtt_tree
message_decode_entry->payload_proto_name);
proto_item_set_generated(ti);
if (strcmp(dissector_handle_get_short_name(message_decode_entry->payload_proto), "SparkplugB") == 0)
{
call_dissector_with_data(message_decode_entry->payload_proto, msg_tvb, pinfo, tree, (void*)topic_str);
} else {
call_dissector(message_decode_entry->payload_proto, msg_tvb, pinfo, tree);
}
call_dissector(message_decode_entry->payload_proto, msg_tvb, pinfo, tree);
}
}