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-flexnet.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-flexnet.c')
| -rw-r--r-- | epan/dissectors/packet-flexnet.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/epan/dissectors/packet-flexnet.c b/epan/dissectors/packet-flexnet.c index 5555a2d952..02633ec16d 100644 --- a/epan/dissectors/packet-flexnet.c +++ b/epan/dissectors/packet-flexnet.c @@ -46,8 +46,6 @@ void proto_reg_handoff_flexnet(void); #define FLEXNET_CTLLEN 15 #define FLEXNET_HDRLEN (FLEXNET_ADRLEN + FLEXNET_ADRLEN + FLEXNET_CTLLEN) -static dissector_handle_t default_handle; - static int proto_flexnet = -1; static int hf_flexnet_dst = -1; static int hf_flexnet_src = -1; @@ -91,7 +89,7 @@ dissect_flexnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void /* Call sub-dissectors here */ next_tvb = tvb_new_subset_remaining(tvb, FLEXNET_HDRLEN); - call_dissector( default_handle , next_tvb, pinfo, parent_tree ); + call_data_dissector(next_tvb, pinfo, parent_tree ); return tvb_captured_length(tvb); } @@ -135,11 +133,6 @@ void proto_reg_handoff_flexnet(void) { dissector_add_uint( "ax25.pid", AX25_P_FLEXNET, create_dissector_handle( dissect_flexnet, proto_flexnet ) ); - - /* - */ - default_handle = find_dissector( "data" ); - } /* |