osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Mikael Kanstrup 2017-08-15 09:12:31 +02:00 committed by Anders Broman
parent e13a81c62a
commit 5f52e65500
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extcap/androiddump.c
View File

@ -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;