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-enc.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-enc.c')
| -rw-r--r-- | epan/dissectors/packet-enc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c index fb4aef0f17..61ed92e849 100644 --- a/epan/dissectors/packet-enc.c +++ b/epan/dissectors/packet-enc.c @@ -48,7 +48,6 @@ struct enchdr { #define BSD_ENC_M_AUTH_AH 0x2000 /* header authenticated */ static dissector_table_t enc_dissector_table; -static dissector_handle_t data_handle; /* header fields */ static int proto_enc = -1; @@ -118,7 +117,7 @@ dissect_enc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) /* Set the tvbuff for the payload after the header */ next_tvb = tvb_new_subset_remaining(tvb, BSD_ENC_HDRLEN); if (!dissector_try_uint(enc_dissector_table, ench.af, next_tvb, pinfo, tree)) - call_dissector(data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); return tvb_captured_length(tvb); } @@ -169,8 +168,6 @@ proto_reg_handoff_enc(void) { dissector_handle_t enc_handle; - data_handle = find_dissector("data"); - enc_handle = create_dissector_handle(dissect_enc, proto_enc); dissector_add_uint("wtap_encap", WTAP_ENCAP_ENC, enc_handle); |