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-ifcp.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-ifcp.c')
| -rw-r--r-- | epan/dissectors/packet-ifcp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c index c6b42d48fb..1d519927d3 100644 --- a/epan/dissectors/packet-ifcp.c +++ b/epan/dissectors/packet-ifcp.c @@ -142,7 +142,6 @@ static int ett_ifcp_frame_len = -1; static gboolean ifcp_desegment = TRUE; static dissector_handle_t ifcp_handle = NULL; -static dissector_handle_t data_handle = NULL; static dissector_handle_t fc_handle = NULL; @@ -443,8 +442,8 @@ dissect_ifcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi if(fc_handle){ call_dissector_with_data(fc_handle, next_tvb, pinfo, parent_tree, &fc_data); - } else if(data_handle){ - call_dissector(data_handle, next_tvb, pinfo, parent_tree); + } else { + call_data_dissector(next_tvb, pinfo, parent_tree); } return tvb_captured_length(tvb); @@ -613,7 +612,6 @@ proto_reg_handoff_ifcp (void) ifcp_handle = create_dissector_handle(dissect_ifcp_handle, proto_ifcp); dissector_add_for_decode_as("tcp.port", ifcp_handle); - data_handle = find_dissector("data"); fc_handle = find_dissector_add_dependency("fc_ifcp", proto_ifcp); } |