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-macsec.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-macsec.c')
| -rw-r--r-- | epan/dissectors/packet-macsec.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-macsec.c b/epan/dissectors/packet-macsec.c index ca2e13ea7f..18b9280dee 100644 --- a/epan/dissectors/packet-macsec.c +++ b/epan/dissectors/packet-macsec.c @@ -38,8 +38,6 @@ void proto_reg_handoff_macsec(void); #define TCI_AN_MASK 0x03 -static dissector_handle_t data_handle; - static int proto_macsec = -1; static int hf_macsec_TCI = -1; static int hf_macsec_TCI_V = -1; @@ -131,7 +129,7 @@ static int dissect_macsec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v sectag_offset + 12, 2, ENC_BIG_ENDIAN); } - call_dissector(data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); proto_tree_add_item(macsec_tree, hf_macsec_ICV, tvb, icv_offset, icv_length, ENC_NA); @@ -192,7 +190,6 @@ void proto_reg_handoff_macsec(void) { dissector_handle_t macsec_handle; - data_handle = find_dissector("data"); macsec_handle = create_dissector_handle(dissect_macsec, proto_macsec); dissector_add_uint("ethertype", ETHERTYPE_MACSEC, macsec_handle); } |