diff options
| author | Mikael Kanstrup <mikael.kanstrup@gmail.com> | 2017-08-15 09:12:31 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-08-18 07:04:19 +0000 |
| commit | 5f52e655002de5fa4ff29d32869cfca2b7eda214 (patch) | |
| tree | 5acef5e8d4e2841ef9dc25c00b39fa8e83ed3149 | |
| parent | e13a81c62a1312ab39f228c70a0c0479af8782ec (diff) | |
androiddump: Support 802.11 monitor and nlmon interfaces
Some Android devices support 802.11 monitor mode and nlmon
interfaces. Add linktype defines to be able to capture frames
from such interfaces.
Change-Id: I8b8b444ac2821542fc946694b71c8d9fb7ba1238
Reviewed-on: https://code.wireshark.org/review/23080
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | extcap/androiddump.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index f2c03db9cf..bdd4aaf4db 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -91,11 +91,15 @@ #define EXTCAP_ENCAP_WIRESHARK_UPPER_PDU DLT_WIRESHARK_UPPER_PDU #define EXTCAP_ENCAP_ETHERNET DLT_EN10MB #define EXTCAP_ENCAP_LINUX_SLL DLT_LINUX_SLL + #define EXTCAP_ENCAP_IEEE802_11_RADIO DLT_IEEE802_11_RADIO + #define EXTCAP_ENCAP_NETLINK DLT_NETLINK #else #define EXTCAP_ENCAP_BLUETOOTH_H4_WITH_PHDR WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR #define EXTCAP_ENCAP_WIRESHARK_UPPER_PDU WTAP_ENCAP_WIRESHARK_UPPER_PDU #define EXTCAP_ENCAP_ETHERNET WTAP_ENCAP_ETHERNET #define EXTCAP_ENCAP_LINUX_SLL WTAP_ENCAP_SLL + #define EXTCAP_ENCAP_IEEE802_11_RADIO WTAP_ENCAP_IEEE_802_11_RADIOTAP + #define EXTCAP_ENCAP_NETLINK WTAP_ENCAP_NETLINK #endif #define WIRESHARK_UPPER_PDU_TAG_DISSECTOR_NAME 0x000C @@ -2273,6 +2277,8 @@ static int linktype_to_extcap_encap(const char* linktype) const struct dlt_encap lookup[] = { { EXTCAP_ENCAP_LINUX_SLL, "LINUX_SLL" }, { EXTCAP_ENCAP_ETHERNET, "EN10MB" }, + { EXTCAP_ENCAP_IEEE802_11_RADIO, "IEEE802_11_RADIO" }, + { EXTCAP_ENCAP_NETLINK, "NETLINK" }, { -1, NULL } }; int i; |