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-fr.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-fr.c')
| -rw-r--r-- | epan/dissectors/packet-fr.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index f9029093d2..fa27e2ece4 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -617,27 +617,29 @@ dissect_fr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } -static void -dissect_fr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_fr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_fr_common(tvb, pinfo, tree, FALSE, TRUE ); + return tvb_captured_length(tvb); } -static void -dissect_fr_phdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_fr_phdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_fr_common(tvb, pinfo, tree, TRUE, TRUE ); + return tvb_captured_length(tvb); } -static void -dissect_fr_stripped_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_fr_stripped_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_fr_common(tvb, pinfo, tree, TRUE, FALSE ); + return tvb_captured_length(tvb); } -static void -dissect_fr_uncompressed(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree) +static int +dissect_fr_uncompressed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; proto_tree *fr_tree; @@ -649,6 +651,7 @@ dissect_fr_uncompressed(tvbuff_t *tvb, packet_info *pinfo, fr_tree = proto_item_add_subtree(ti, ett_fr); dissect_fr_nlpid(tvb, 0, pinfo, tree, ti, fr_tree, XDLC_U); + return tvb_captured_length(tvb); } static void @@ -982,9 +985,9 @@ proto_register_fr(void) fr_osinl_subdissector_table = register_dissector_table("fr.osinl", "Frame Relay OSI NLPID", FT_UINT8, BASE_HEX, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE); - register_dissector("fr_uncompressed", dissect_fr_uncompressed, proto_fr); - register_dissector("fr", dissect_fr, proto_fr); - register_dissector("fr_stripped_address", dissect_fr_stripped_address, proto_fr); + new_register_dissector("fr_uncompressed", dissect_fr_uncompressed, proto_fr); + new_register_dissector("fr", dissect_fr, proto_fr); + new_register_dissector("fr_stripped_address", dissect_fr_stripped_address, proto_fr); frencap_module = prefs_register_protocol(proto_fr, NULL); /* @@ -1013,7 +1016,7 @@ proto_reg_handoff_fr(void) dissector_add_uint("atm.aal5.type", TRAF_FR, fr_handle); dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_FR, fr_handle); - fr_phdr_handle = create_dissector_handle(dissect_fr_phdr, proto_fr); + fr_phdr_handle = new_create_dissector_handle(dissect_fr_phdr, proto_fr); dissector_add_uint("wtap_encap", WTAP_ENCAP_FRELAY_WITH_PHDR, fr_phdr_handle); eth_withfcs_handle = find_dissector("eth_withfcs"); |