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-scop.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-scop.c')
-rw-r--r-- | epan/dissectors/packet-scop.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-scop.c b/epan/dissectors/packet-scop.c index 8456393a89..11d62beca5 100644 --- a/epan/dissectors/packet-scop.c +++ b/epan/dissectors/packet-scop.c @@ -121,7 +121,6 @@ static guint32 gPREF_scop_port = SCOP_DEFAULT_PORT; static guint32 gPREF_scop_port_secured = SCOP_DEFAULT_PORT_SECURED; /* Dissector handle */ -static dissector_handle_t data_handle; static dissector_handle_t ieee802154_handle; /*FUNCTION:------------------------------------------------------ @@ -199,7 +198,7 @@ dissect_scop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ /* Nothing yet defined for the gateway. Fall-Through. */ default: /* Unknown Service Type. */ - call_dissector(data_handle, tvb_new_subset_remaining(next_tvb, offset), pinfo, tree); + call_data_dissector(tvb_new_subset_remaining(next_tvb, offset), pinfo, tree); break; } @@ -288,7 +287,7 @@ dissect_scop_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (offset < tvb_reported_length(tvb)) { tvbuff_t *payload_tvb = tvb_new_subset_remaining(tvb, offset); proto_tree *root = proto_tree_get_root(tree); - call_dissector(data_handle, payload_tvb, pinfo, root); + call_data_dissector(payload_tvb, pinfo, root); } } /* dissect_scop_zip() */ @@ -404,7 +403,6 @@ void proto_reg_handoff_scop(void) scop_udp_handle = find_dissector("scop.udp"); scop_tcp_handle = find_dissector("scop.tcp"); ieee802154_handle = find_dissector_add_dependency("wpan_nofcs", proto_scop); - data_handle = find_dissector("data"); inited = TRUE; } else { dissector_delete_uint("udp.port", lastPort, scop_udp_handle); |