diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-15 19:00:06 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-16 03:00:34 +0000 |
| commit | 0802f12f42f755d9692d4db23ea5f85e65303f46 (patch) | |
| tree | 8370c9ca509e90c476a70c45ca92d7ae1770b8cb /epan/dissectors/packet-ppi.c | |
| parent | 91b6718f821417840bc543077f343f07d2c45314 (diff) | |
Don't export wtap_encap_dissector_table from packet-frame.c.
Dissectors that need it should fetch it with
find_dissector_table("wtap_encap").
Change-Id: I4b12888f20182aa529274b934b81d36f7697e1a6
Reviewed-on: https://code.wireshark.org/review/13323
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ppi.c')
| -rw-r--r-- | epan/dissectors/packet-ppi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index fd39b0307d..7188eaf74b 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -59,8 +59,6 @@ /* Needed for wtap_pcap_encap_to_wtap_encap(). */ #include <wiretap/pcap-encap.h> -#include "packet-frame.h" - /* * Per-Packet Information (PPI) header. * See the PPI Packet Header documentation at http://www.cacetech.com/documents @@ -353,6 +351,8 @@ static dissector_handle_t ieee80211_radio_handle; static dissector_handle_t ppi_gps_handle, ppi_vector_handle, ppi_sensor_handle, ppi_antenna_handle; static dissector_handle_t ppi_fnet_handle; +static dissector_table_t wtap_encap_dissector_table; + static const true_false_string tfs_ppi_head_flag_alignment = { "32-bit aligned", "Not aligned" }; static const true_false_string tfs_tsft_ms = { "milliseconds", "microseconds" }; static const true_false_string tfs_ht20_40 = { "HT40", "HT20" }; @@ -1543,6 +1543,8 @@ proto_register_ppi(void) void proto_reg_handoff_ppi(void) { + wtap_encap_dissector_table = find_dissector_table("wtap_encap"); + data_handle = find_dissector("data"); ieee80211_radio_handle = find_dissector("wlan_radio"); ppi_gps_handle = find_dissector("ppi_gps"); |