diff options
| author | Scott Deandrea <sdeandrea@apple.com> | 2017-03-29 17:20:06 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-03-31 23:24:28 +0000 |
| commit | 62d78199eee5d239b826442c6edd95aeeef1540b (patch) | |
| tree | ce4a4a2fad3e95e16a4cc1dd67cd9aed85f8d8e3 /wiretap | |
| parent | 02f74e47ed3e542f4aff9fc6a7a9c44e29be5c7b (diff) | |
| download | wireshark-62d78199eee5d239b826442c6edd95aeeef1540b.tar.gz | |
Add packet capture support for Darwin USB
Change-Id: Iec9e4ac2362cf8e88a3cf6ae3483cefe938967e5
Reviewed-on: https://code.wireshark.org/review/20814
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index f2e09978f3..0cc3f9d60c 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -437,6 +437,9 @@ static const struct { /* ISO 14443 contactless smartcard standards */ { 264, WTAP_ENCAP_ISO14443 }, + /* USB packets from Darwin (macOS, iOS) BPF tap */ + { 266, WTAP_ENCAP_USB_DARWIN }, + /* IBM SDLC frames containing SNA PDUs */ { 268, WTAP_ENCAP_SDLC }, diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 0f13e6b788..1b9ab0552a 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -918,6 +918,9 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_JUNIPER_VN */ { "Juniper VN", "juniper-vn" }, + + /* WTAP_ENCAP_USB_DARWIN */ + { "Darwin USB", "darwin-usb" }, }; WS_DLL_LOCAL diff --git a/wiretap/wtap.h b/wiretap/wtap.h index c94371a854..c5d9db4c5c 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -269,6 +269,7 @@ extern "C" { #define WTAP_ENCAP_GFP_F 179 #define WTAP_ENCAP_IP_OVER_IB_PCAP 180 #define WTAP_ENCAP_JUNIPER_VN 181 +#define WTAP_ENCAP_USB_DARWIN 182 /* After adding new item here, please also add new item to encap_table_base array */ #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |