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

Do not register proto_reg_handoff_XXX callback when not required 

None of those protocols need to be notified of a preference change and
their proto_reg_handoff_XXX functions do not differentiate the initial
call from susequent ones, leading to an assert

Bug: 14157
Change-Id: Iac4d88ebef7688bced8daae857eb5c836a6babd6
Reviewed-on: https://code.wireshark.org/review/24211
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Pascal Quantin 2017-11-02 15:21:52 +01:00 committed by Michael Mann
parent dd1f75a53e
commit 78ee8c419f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-aeron.c
View File

@ -3083,7 +3083,7 @@ void proto_register_aeron(void)
proto_register_subtree_array(ett, array_length(ett));
expert_aeron = expert_register_protocol(proto_aeron);
expert_register_field_array(expert_aeron, ei, array_length(ei));
aeron_module = prefs_register_protocol(proto_aeron, proto_reg_handoff_aeron);
aeron_module = prefs_register_protocol(proto_aeron, NULL);
aeron_heuristic_subdissector_list = register_heur_dissector_list("aeron_msg_payload", proto_aeron);
prefs_register_bool_preference(aeron_module,

2
epan/dissectors/packet-ipdc.c
View File

@ -1066,7 +1066,7 @@ proto_register_ipdc(void)
expert_ipdc = expert_register_protocol(proto_ipdc);
expert_register_field_array(expert_ipdc, ei, array_length(ei));
ipdc_module = prefs_register_protocol(proto_ipdc, proto_reg_handoff_ipdc);
ipdc_module = prefs_register_protocol(proto_ipdc, NULL);
prefs_register_bool_preference(ipdc_module, "desegment_ipdc_messages",
"Reassemble IPDC messages spanning multiple TCP segments",
"Whether the IPDC dissector should reassemble messages spanning multiple TCP segments."