aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/pcap-common.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-03-31 21:04:13 -0700
committerEvan Huus <eapache@gmail.com>2014-04-01 17:03:29 +0000
commitfc48f57214d55d3f35bff87f1fffa08ac6f7bfd6 (patch)
tree48c537aad2784c8cf09875092788993a148debe7 /wiretap/pcap-common.c
parent47d296709dcd0ed1fc8900de12648583c9df7b43 (diff)
Add a dissector for Apple's PKTAP headers.
It automatically works for LINKTYPE_PKTAP and, by default, for LINKTYPE_USER2; if any other dissector is specified for LINKTYPE_USER2, that dissector overrides PKTAP. Change-Id: Ic00ac8a81c6101e45d638d337aef42df3920da12 Reviewed-on: https://code.wireshark.org/review/903 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'wiretap/pcap-common.c')
-rw-r--r--wiretap/pcap-common.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c
index 57c25a931f..a53fb47e67 100644
--- a/wiretap/pcap-common.c
+++ b/wiretap/pcap-common.c
@@ -423,6 +423,10 @@ static const struct {
{ 255, WTAP_ENCAP_BLUETOOTH_BREDR_BB },
/* Bluetooth Low Energy Link Layer RF captures */
{ 256, WTAP_ENCAP_BLUETOOTH_LE_LL_WITH_PHDR },
+
+ /* Apple PKTAP */
+ { 258, WTAP_ENCAP_PKTAP },
+
/*
* To repeat:
*