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-kismet.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-kismet.c')
-rw-r--r-- | epan/dissectors/packet-kismet.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c index 81153d0170..5f8534cbe1 100644 --- a/epan/dissectors/packet-kismet.c +++ b/epan/dissectors/packet-kismet.c @@ -45,8 +45,6 @@ static int hf_kismet_time = -1; static gint ett_kismet = -1; static gint ett_kismet_reqresp = -1; -static dissector_handle_t data_handle; - #define TCP_PORT_KISMET 2501 static guint global_kismet_tcp_port = TCP_PORT_KISMET; @@ -138,7 +136,7 @@ dissect_kismet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void * da /* * Put the whole packet into the tree as data. */ - call_dissector(data_handle, tvb, pinfo, kismet_tree); + call_data_dissector(tvb, pinfo, kismet_tree); return tvb_captured_length(tvb); } @@ -339,7 +337,6 @@ proto_reg_handoff_kismet(void) if (!kismet_prefs_initialized) { kismet_handle = create_dissector_handle(dissect_kismet, proto_kismet); - data_handle = find_dissector("data"); kismet_prefs_initialized = TRUE; } else { dissector_delete_uint("tcp.port", tcp_port, kismet_handle); |