diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-09 23:01:28 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-13 17:44:24 +0000 |
| commit | 01f7356f85d33567a25e722e6488addd72ff64d4 (patch) | |
| tree | 2d8623b57706cc924f76293f0f5b6ce8d83124ab /epan/dissectors/packet-fddi.c | |
| parent | b776707af540d7431e815818e21ea1efac326d9f (diff) | |
register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I3d5e576b796556ef070bb36d8b55da0b175dcba8
Reviewed-on: https://code.wireshark.org/review/11805
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-fddi.c')
| -rw-r--r-- | epan/dissectors/packet-fddi.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index abda0ff52e..df740c0312 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -443,16 +443,18 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* dissect_fddi */ -static void -dissect_fddi_bitswapped(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_fddi_bitswapped(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_fddi(tvb, pinfo, tree, TRUE); + return tvb_captured_length(tvb); } -static void -dissect_fddi_not_bitswapped(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_fddi_not_bitswapped(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_fddi(tvb, pinfo, tree, FALSE); + return tvb_captured_length(tvb); } void @@ -509,7 +511,7 @@ proto_register_fddi(void) * Called from various dissectors for encapsulated FDDI frames. * We assume the MAC addresses in them aren't bitswapped. */ - register_dissector("fddi", dissect_fddi_not_bitswapped, proto_fddi); + new_register_dissector("fddi", dissect_fddi_not_bitswapped, proto_fddi); fddi_module = prefs_register_protocol(proto_fddi, NULL); prefs_register_bool_preference(fddi_module, "padding", @@ -538,7 +540,7 @@ proto_reg_handoff_fddi(void) dissector_add_uint("sflow_245.header_protocol", SFLOW_245_HEADER_FDDI, fddi_handle); fddi_bitswapped_handle = - create_dissector_handle(dissect_fddi_bitswapped, proto_fddi); + new_create_dissector_handle(dissect_fddi_bitswapped, proto_fddi); dissector_add_uint("wtap_encap", WTAP_ENCAP_FDDI_BITSWAPPED, fddi_bitswapped_handle); } |