diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-15 16:51:45 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 22:00:30 +0000 |
| commit | 799d6fd057b0c20a7692a1181d811a8ff3a88d04 (patch) | |
| tree | 31d6d1248aee7c3192ae6d854b43eeb2c0b996a0 /epan/dissectors/packet-netanalyzer.c | |
| parent | 92bb13a4d22a48c43aa5fa6910c68829edebfdd0 (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I96aa9cf53533cbb07105aa400d42922baf3016b3
Reviewed-on: https://code.wireshark.org/review/11860
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-netanalyzer.c')
| -rw-r--r-- | epan/dissectors/packet-netanalyzer.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index 29941e47f2..195dc4426d 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -297,8 +297,8 @@ dissect_netanalyzer_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Ethernet capture mode */ -static void -dissect_netanalyzer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_netanalyzer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { tvbuff_t *next_tvb; @@ -318,12 +318,13 @@ dissect_netanalyzer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_expert_format(tree, pinfo, &ei_netanalyzer_header_version_none, tvb, 4, -1, "netANALYZER - No netANALYZER header found"); } + return tvb_captured_length(tvb); } /* Transparent capture mode */ -static void -dissect_netanalyzer_transparent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_netanalyzer_transparent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *transparent_payload_tree = NULL; tvbuff_t *next_tvb; @@ -352,6 +353,7 @@ dissect_netanalyzer_transparent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t proto_tree_add_expert_format(tree, pinfo, &ei_netanalyzer_header_version_none, tvb, 4, -1, "netANALYZER transparent mode - No netANALYZER header found"); } + return tvb_captured_length(tvb); } @@ -462,8 +464,8 @@ void proto_reg_handoff_netanalyzer(void) eth_dissector_handle = find_dissector("eth_withfcs"); data_dissector_handle = find_dissector("data"); - netana_handle = create_dissector_handle(dissect_netanalyzer, proto_netanalyzer); - netana_handle_transparent = create_dissector_handle(dissect_netanalyzer_transparent, proto_netanalyzer); + netana_handle = new_create_dissector_handle(dissect_netanalyzer, proto_netanalyzer); + netana_handle_transparent = new_create_dissector_handle(dissect_netanalyzer_transparent, proto_netanalyzer); dissector_add_uint("wtap_encap", WTAP_ENCAP_NETANALYZER, netana_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_NETANALYZER_TRANSPARENT, netana_handle_transparent); } |