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-fcip.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-fcip.c')
| -rw-r--r-- | epan/dissectors/packet-fcip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 6e230da629..4772a8c051 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -133,7 +133,6 @@ static int ett_fcip = -1; static guint fcip_port = 3225; static gboolean fcip_desegment = TRUE; -static dissector_handle_t data_handle; static dissector_handle_t fc_handle; /* This routine attempts to locate the position of the next header in the @@ -493,8 +492,8 @@ dissect_fcip (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, fc_data.ethertype = 0; call_dissector_with_data(fc_handle, next_tvb, pinfo, tree, &fc_data); } - else if (data_handle) { - call_dissector (data_handle, next_tvb, pinfo, tree); + else { + call_data_dissector(next_tvb, pinfo, tree); } } else { @@ -654,7 +653,6 @@ proto_reg_handoff_fcip (void) fcip_handle = create_dissector_handle(dissect_fcip_handle, proto_fcip); dissector_add_for_decode_as("tcp.port", fcip_handle); - data_handle = find_dissector("data"); fc_handle = find_dissector_add_dependency("fc", proto_fcip); } |