diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-09-19 16:26:37 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-09-19 16:26:37 +0000 |
| commit | 80e94e3ec3807e48aad6c67e2d9a2a261fd721b3 (patch) | |
| tree | e57e2120d00da2e96bd5ecc7e510498fd4af4c20 /epan/dissectors/packet-ppi.c | |
| parent | bf24d9c3dc51330526ef158807546f66c6ea244e (diff) | |
Move wtap_pcap_encap_to_wtap_encap and wtap_wtap_encap_to_pcap_encap to
libwsutil.
svn path=/trunk/; revision=26233
Diffstat (limited to 'epan/dissectors/packet-ppi.c')
| -rw-r--r-- | epan/dissectors/packet-ppi.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 408106be2b..c4c0af7092 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -60,9 +60,7 @@ #include <epan/range.h> #include <epan/frequency-utils.h> -/* Needed for wtap_pcap_encap_to_wtap_encap(). Should we move it somewhere - * else? */ -#include <wiretap/libpcap.h> +#include <wsutil/encap_util.h> #include "packet-frame.h" #include "packet-eth.h" @@ -709,13 +707,13 @@ static void dissect_8023_extension(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ ptvcursor_add_no_advance(csr, hf_8023_extension_flags_flag2, 4, TRUE); ptvcursor_add(csr, hf_8023_extension_flags_flag3, 4, TRUE); ptvcursor_pop_subtree(csr); - + ptvcursor_add_with_subtree(csr, hf_8023_extension_errors, 4, TRUE, ett_8023_extension_errors); ptvcursor_add_no_advance(csr, hf_8023_extension_errors_error1, 4, TRUE); ptvcursor_add_no_advance(csr, hf_8023_extension_errors_error2, 4, TRUE); ptvcursor_add(csr, hf_8023_extension_errors_error3, 4, TRUE); ptvcursor_pop_subtree(csr); - + ptvcursor_free(csr); } @@ -820,11 +818,11 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case PPI_CAPTURE_INFO: ADD_BASIC_TAG(hf_capture_info); break; - + case PPI_AGGREGATION_EXTENSION: dissect_aggregation_extension(tvb, pinfo, ppi_tree, offset, data_len); break; - + case PPI_8023_EXTENSION: dissect_8023_extension(tvb, pinfo, ppi_tree, offset, data_len); break; @@ -1235,7 +1233,7 @@ proto_register_ppi(void) { &hf_aggregation_extension_interface_id, { "Interface ID", "ppi.aggregation_extension.interface_id", FT_UINT32, BASE_DEC, NULL, 0x0, "Zero-based index of the physical interface the packet was captured from", HFILL } }, - + /* 802.3 Extension */ { &hf_8023_extension_flags, { "Flags", "ppi.8023_extension.flags", @@ -1261,7 +1259,7 @@ proto_register_ppi(void) { &hf_8023_extension_errors_error3, { "Error 3", "ppi.8023_extension.errors.error3", FT_BOOLEAN, 32, TFS(&tfs_true_false), 0x0004, "Debug Error 3", HFILL } }, - + }; static gint *ett[] = { |