Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-16 23:40:43 +01:00
Code Releases Activity

monitor: update nlmon.c to use exposed vendor OUIs

Browse Source
This commit is contained in:
James Prestwood 2019-07-15 11:33:13 -07:00 committed by Denis Kenzior
parent 090ac03100
commit b483a78464
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monitor/nlmon.c
View File

@ -991,9 +991,6 @@ static void print_ipv4(unsigned int level, const char *label,
static void print_ie_vendor(unsigned int level, const char *label, static void print_ie_vendor(unsigned int level, const char *label,
const void *data, uint16_t size) const void *data, uint16_t size)
{ {
static const unsigned char msoft_oui[3] = { 0x00, 0x50, 0xf2 };
static const unsigned char wfa_oui[3] = { 0x50, 0x6f, 0x9a };
static const unsigned char ieee80211_oui[3] = { 0x00, 0x0f, 0xac };
const uint8_t *oui = data; const uint8_t *oui = data;
print_attr(level, "%s: len %u", label, size); print_attr(level, "%s: len %u", label, size);
@ -1007,7 +1004,7 @@ static void print_ie_vendor(unsigned int level, const char *label,
data += 4; data += 4;
size -= 4; size -= 4;
if (!memcmp(oui, msoft_oui, 3)) { if (!memcmp(oui, microsoft_oui, 3)) {
switch (oui[3]) { switch (oui[3]) {
case 1: /* MSoft WPA IE */ case 1: /* MSoft WPA IE */
print_ie_wpa(level + 2, label, data, size); print_ie_wpa(level + 2, label, data, size);
@ -1015,7 +1012,7 @@ static void print_ie_vendor(unsigned int level, const char *label,
default: default:
return; return;
} }
} else if (!memcmp(oui, wfa_oui, 3)) { } else if (!memcmp(oui, wifi_alliance_oui, 3)) {
switch (oui[3]) { switch (oui[3]) {
case 0x04: case 0x04:
print_attr(level + 1, "IP Address Request KDE"); print_attr(level + 1, "IP Address Request KDE");
@ -1039,7 +1036,7 @@ static void print_ie_vendor(unsigned int level, const char *label,
default: default:
return; return;
} }
} else if (!memcmp(oui, ieee80211_oui, 3)) { } else if (!memcmp(oui, ieee_oui, 3)) {
const char *kde; const char *kde;
/* EAPoL-Key KDEs */ /* EAPoL-Key KDEs */