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-rmcp.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-rmcp.c')
| -rw-r--r-- | epan/dissectors/packet-rmcp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-rmcp.c b/epan/dissectors/packet-rmcp.c index 74387e8aa3..910c91765d 100644 --- a/epan/dissectors/packet-rmcp.c +++ b/epan/dissectors/packet-rmcp.c @@ -57,7 +57,6 @@ static gint ett_rmcp_typeclass = -1; static gint ett_rsp = -1; -static dissector_handle_t data_handle; static dissector_table_t rmcp_dissector_table; #define UDP_PORT_RMCP 623 @@ -142,7 +141,7 @@ dissect_rmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ if (!dissector_try_uint(rmcp_dissector_table, rmcp_class, next_tvb, pinfo, tree)) { - len = call_dissector(data_handle, next_tvb, pinfo, tree); + len = call_data_dissector(next_tvb, pinfo, tree); if (len < tvb_reported_length(next_tvb)) { proto_tree_add_item(tree, hf_rmcp_trailer, tvb, 4 + len, -1, ENC_NA); } @@ -255,8 +254,6 @@ proto_reg_handoff_rmcp(void) { dissector_handle_t rmcp_handle; - data_handle = find_dissector("data"); - rmcp_handle = create_dissector_handle(dissect_rmcp, proto_rmcp); dissector_add_uint("udp.port", UDP_PORT_RMCP, rmcp_handle); } |