diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-12-17 00:07:49 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-17 01:04:26 +0000 |
| commit | 8cb03d57a600bc092fd5670f37fb990784fffd96 (patch) | |
| tree | 81655feb022cee8ab63b017bc02d47927c3b6dc6 /epan/dissectors/packet-ieee8021ah.c | |
| parent | b55d1b5e1f95defec4d624f8378a5d824917128d (diff) | |
Capture dissectors must be registered only once at startup
So ensure that register_capture_dissector() is not called again when changing a preference
Bug: 11884
Change-Id: I18ce05e89b19f106470a8ec843062c115dae60db
Reviewed-on: https://code.wireshark.org/review/12689
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ieee8021ah.c')
| -rw-r--r-- | epan/dissectors/packet-ieee8021ah.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c index e6769638ec..ab022d5338 100644 --- a/epan/dissectors/packet-ieee8021ah.c +++ b/epan/dissectors/packet-ieee8021ah.c @@ -431,6 +431,8 @@ proto_reg_handoff_ieee8021ah(void) proto_ieee8021ad); dissector_add_uint("ethertype", ETHERTYPE_IEEE_802_1AD, ieee8021ad_handle); ethertype_handle = find_dissector("ethertype"); + register_capture_dissector("ethertype", ETHERTYPE_IEEE_802_1AD, capture_ieee8021ah, proto_ieee8021ah); + register_capture_dissector("ethertype", ETHERTYPE_IEEE_802_1AH, capture_ieee8021ah, proto_ieee8021ah); prefs_initialized = TRUE; } @@ -440,9 +442,6 @@ proto_reg_handoff_ieee8021ah(void) old_ieee8021ah_ethertype = ieee8021ah_ethertype; dissector_add_uint("ethertype", ieee8021ah_ethertype, ieee8021ah_handle); - register_capture_dissector("ethertype", ETHERTYPE_IEEE_802_1AD, capture_ieee8021ah, proto_ieee8021ah); - register_capture_dissector("ethertype", ETHERTYPE_IEEE_802_1AH, capture_ieee8021ah, proto_ieee8021ah); - } /* |