diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-15 08:00:10 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 03:50:05 +0000 |
| commit | bbdd89b973353a0df1d98d884c38f3832670bfea (patch) | |
| tree | 9b992f923f565af2fcab30902508a191de85ca53 /epan/dissectors/packet-cdp.c | |
| parent | 6012ba8f008bfba24fd44ce7a2a3055572453dce (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: Ie514f126352e7598acc4f7c38db9c61d105d5e48
Reviewed-on: https://code.wireshark.org/review/11850
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-cdp.c')
| -rw-r--r-- | epan/dissectors/packet-cdp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 5403b23bc9..6c8a870879 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -270,8 +270,8 @@ static const value_string type_nrgyz_vals[] = { { 0, NULL } }; -static void -dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti, *checksum_item; proto_tree *cdp_tree = NULL, *checksum_tree; @@ -1039,13 +1039,14 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (length > 4) { proto_tree_add_item(tlv_tree, hf_cdp_data, tvb, offset + 4, length - 4, ENC_NA); } else { - return; + return tvb_captured_length(tvb); } } offset += length; } } call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, cdp_tree); + return tvb_captured_length(tvb); } #define PROTO_TYPE_NLPID 1 @@ -1474,7 +1475,7 @@ proto_reg_handoff_cdp(void) dissector_handle_t cdp_handle; data_handle = find_dissector("data"); - cdp_handle = create_dissector_handle(dissect_cdp, proto_cdp); + cdp_handle = new_create_dissector_handle(dissect_cdp, proto_cdp); dissector_add_uint("llc.cisco_pid", 0x2000, cdp_handle); dissector_add_uint("chdlc.protocol", 0x2000, cdp_handle); dissector_add_uint("ppp.protocol", 0x0207, cdp_handle); |