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-wai.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-wai.c')
| -rw-r--r-- | epan/dissectors/packet-wai.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c index b8918d7960..43d3e63a6b 100644 --- a/epan/dissectors/packet-wai.c +++ b/epan/dissectors/packet-wai.c @@ -159,8 +159,6 @@ static gint ett_wai_parameter = -1; static gint ett_wai_fragment = -1; static gint ett_wai_fragments = -1; -static dissector_handle_t data_handle; - static const value_string wai_type_names [] = { { 1, "WAI protocol package"}, { 0, NULL } @@ -934,7 +932,7 @@ Figure 18 from [ref:1] next_tvb = tvb_new_subset_remaining(tvb, WAI_DATA_OFFSET); - /* Replace INFO column if message is fragmented and call data_handle */ + /* Replace INFO column if message is fragmented and call data dissector */ if (flags) { col_add_fstr(pinfo->cinfo, COL_INFO, "Fragment (%d) of message, data not dissected", fragment_num); @@ -943,7 +941,7 @@ Figure 18 from [ref:1] "Reassembled WAI", frag_msg, &wai_frag_items, NULL, wai_tree); - call_dissector(data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } else { /* If this is the last fragment of fragmented message, then reassamble and dissect otherwise only dissect */ @@ -1380,7 +1378,6 @@ proto_register_wai(void) void proto_reg_handoff_wai(void) { - data_handle = find_dissector("data"); dissector_add_uint("ethertype", ETHERTYPE_WAI, wai_handle); } |