diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-03-19 20:33:14 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-20 17:38:03 +0000 |
| commit | 1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf (patch) | |
| tree | 4147c4f2bee3b93c250a49fa8ec337072c80e713 /epan/dissectors/packet-udld.c | |
| parent | 2b2fc64447e5f778d969e6c850e9196d248cbbe1 (diff) | |
Create call_data_dissector() to call data dissector.
This saves many dissectors the need to find the data dissector and store a handle to it.
There were also some that were finding it, but not using it.
For others this was the only reason for their handoff function, so it could be eliminated.
Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b
Reviewed-on: https://code.wireshark.org/review/14530
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-udld.c')
| -rw-r--r-- | epan/dissectors/packet-udld.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c index 2ba0b15148..b694d0d3a6 100644 --- a/epan/dissectors/packet-udld.c +++ b/epan/dissectors/packet-udld.c @@ -62,8 +62,6 @@ static gint ett_udld = -1; static gint ett_udld_flags = -1; static gint ett_udld_tlv = -1; -static dissector_handle_t data_handle; - #define TYPE_DEVICE_ID 0x0001 #define TYPE_PORT_ID 0x0002 #define TYPE_ECHO 0x0003 @@ -226,7 +224,7 @@ dissect_udld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } } - call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, udld_tree); + call_data_dissector(tvb_new_subset_remaining(tvb, offset), pinfo, udld_tree); return tvb_captured_length(tvb); } @@ -304,7 +302,6 @@ proto_reg_handoff_udld(void) { dissector_handle_t udld_handle; - data_handle = find_dissector("data"); udld_handle = create_dissector_handle(dissect_udld, proto_udld); dissector_add_uint("llc.cisco_pid", 0x0111, udld_handle); dissector_add_uint("chdlc.protocol", 0x0111, udld_handle); |