taxonomy: add gaming consoles and others.
+ Add PS3 & Wii.
+ Update iPhone 4S signature to v2, and add a version of the signature
with spectrum management present.
+ iOS 9 DHCP signature changed, add it.
+ Add Samsung OUIs.
+ Add Motorola OUIs.
+ Add yet another signature for Nexus 7.
+ Add Chromecast v3 signatures.
Change-Id: I74058921525c4f2ed04e2f2309d3e5a1550c2db6
diff --git a/taxonomy/dhcp.py b/taxonomy/dhcp.py
index 2053fb2..f4433c3 100644
--- a/taxonomy/dhcp.py
+++ b/taxonomy/dhcp.py
@@ -34,10 +34,16 @@
'1,121,33,3,6,12,15,26,28,51,54,58,59,119': 'chromeos',
'1,3,6,15,119,252': 'ios',
+ '1,121,3,6,15,119,252': 'ios',
'1,3,6,15,119,95,252,44,46,101': 'macos',
'1,3,6,15,119,95,252,44,46': 'macos',
+ '1,3,15,6': 'playstation',
+
+ '1,3,6,15,28,33': 'wii',
+ '1,3,6,15': 'wii',
+
'1,15,3,6,44,46,47,31,33,121,249,252,43': 'windows-phone',
}
diff --git a/taxonomy/ethernet.py b/taxonomy/ethernet.py
index cfab707..0eef281 100644
--- a/taxonomy/ethernet.py
+++ b/taxonomy/ethernet.py
@@ -46,6 +46,7 @@
'60:45:bd': 'microsoft',
+ '5c:51:88': 'motorola',
'98:4b:4a': 'motorola',
'9c:d9:17': 'motorola',
'f8:7b:7a': 'motorola',
@@ -54,12 +55,17 @@
'18:b4:30': 'nest',
+ '00:27:09': 'nintendo',
+ '34:af:2c': 'nintendo',
+
'10:a5:d0': 'samsung',
'14:7d:c5': 'samsung',
+ '34:23:ba': 'samsung',
'38:aa:3c': 'samsung',
'40:0e:85': 'samsung',
'5c:0a:5b': 'samsung',
'6c:2f:2c': 'samsung',
+ '88:32:9b': 'samsung',
'8c:77:12': 'samsung',
'90:b6:86': 'samsung',
'90:e7:c4': 'samsung',
@@ -67,12 +73,15 @@
'b0:df:3a': 'samsung',
'c0:bd:d1': 'samsung',
'c4:42:02': 'samsung',
+ 'cc:07:ab': 'samsung',
'cc:3a:61': 'samsung',
'd0:22:be': 'samsung',
'e8:50:8b': 'samsung',
+ 'ec:1f:72': 'samsung',
'f0:25:b7': 'samsung',
'f4:09:d8': 'samsung',
+ '00:d9:d1': 'sony',
'30:17:c8': 'sony',
'40:b8:37': 'sony',
'b4:52:7e': 'sony',
diff --git a/taxonomy/wifi.py b/taxonomy/wifi.py
index df1062d..85858a7 100644
--- a/taxonomy/wifi.py
+++ b/taxonomy/wifi.py
@@ -74,6 +74,10 @@
'wifi|probe:0,1,3,45,50,htcap:0120|assoc:0,1,48,50,127,221(0050f2,2),45,htcap:012c|name:Chromecast':
('Marvell_88W8797', 'Chromecast', '2.4GHz'),
+ 'wifi|probe:0,1,45,50,127,191,htcap:0062,htagg:03,htmcs:00000000,vhtcap:33c07030,vhtrxmcs:0124fffc,vhttxmcs:0124fffc,extcap:00000000|assoc:0,1,33,36,48,127,221(0050f2,2),45,191,htcap:006e,htagg:03,htmcs:000000ff,vhtcap:33c07030,vhtrxmcs:0186fffe,vhttxmcs:0186fffe,extcap:00000004|name:Chromecast':
+ ('Marvell_88W8887', 'Chromecast', '2.4GHz'),
+ 'wifi|probe:0,1,45,50,127,191,htcap:0062,htagg:03,htmcs:00000000,vhtcap:33c07030,vhtrxmcs:0124fffc,vhttxmcs:0124fffc,extcap:00000000|assoc:0,1,33,36,48,127,221(0050f2,2),45,191,htcap:006e,htagg:03,htmcs:000000ff,vhtcap:33c07030,vhtrxmcs:0186fffe,vhttxmcs:0186fffe,extcap:00000004|name:Hendrix':
+ ('Marvell_88W8887', 'Chromecast Audio', '2.4GHz'),
'wifi|probe:0,1,45,221(001018,2),221(00904c,51),htcap:007c|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:007c':
('', 'DirecTV HR-44', ''),
@@ -144,7 +148,9 @@
'wifi|probe:0,1,50,3,221(001018,2)|assoc:0,1,48,50,221(001018,2),221(0050f2,2)|name:iphone':
('BCM4325', 'iPhone 3GS', '2.4GHz'),
- 'wifi|probe:0,1,50,45,3,221(001018,2),221(00904c,51),htcap:0100|assoc:0,1,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:0100':
+ 'wifi|probe:0,1,50,45,3,221(001018,2),221(00904c,51),htcap:0100,htagg:19,htmcs:000000ff|assoc:0,1,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:0100,htagg:19,htmcs:000000ff':
+ ('BCM4330', 'iPhone 4S', '2.4GHz'),
+ 'wifi|probe:0,1,50,45,3,221(001018,2),221(00904c,51),htcap:0100,htagg:19,htmcs:000000ff|assoc:0,1,48,50,45,70,221(001018,2),221(00904c,51),221(0050f2,2),htcap:0100,htagg:19,htmcs:000000ff':
('BCM4330', 'iPhone 4S', '2.4GHz'),
'wifi|probe:0,1,45,127,107,221(001018,2),221(00904c,51),221(0050f2,8),htcap:0062|assoc:0,1,33,36,48,45,70,221(001018,2),221(00904c,51),221(0050f2,2),htcap:0062|name:iphone':
@@ -350,6 +356,8 @@
('QCA_WCN3660', 'Nexus 7 (2013)', '2.4GHz'),
'wifi|probe:0,1,50,45,221(0050f2,8),htcap:012c,htagg:03,htmcs:000000ff|assoc:0,1,50,48,45,221(0050f2,2),127,htcap:012c,htagg:03,htmcs:000000ff,extcap:020a0000|oui:asus':
('QCA_WCN3660', 'Nexus 7 (2013)', '2.4GHz'),
+ 'wifi|probe:0,1,50,45,221(0050f2,8),127,221(0050f2,4),221(506f9a,9),htcap:012c,htagg:03,htmcs:000000ff,extcap:020a0000,wps:Nexus_7|assoc:0,1,50,48,45,221(0050f2,2),127,htcap:012c,htagg:03,htmcs:000000ff,extcap:020a0000':
+ ('QCA_WCN3660', 'Nexus 7 (2013)', '2.4GHz'),
'wifi|probe:0,1,50,3,45,127,221(0050f2,4),221(506f9a,9),221(001018,2),htcap:002d,wps:Nexus_9|assoc:0,1,50,33,36,48,45,127,221(001018,2),221(0050f2,2),htcap:002d|oui:htc':
('BCM4354', 'Nexus 9', '5GHz'),
@@ -367,7 +375,10 @@
'wifi|probe:0,1,50,45,htcap:012c,htagg:1b,htmcs:000000ff|assoc:0,1,48,50,221(0050f2,2),45,51,127,htcap:012c,htagg:1b,htmcs:000000ff,extcap:00000001|os:windows-phone':
('', 'Nokia Lumia 635', '2.4GHz'),
- 'wifi|probe:0,1,3,50|assoc:0,1,48,50,221(0050f2,2),45,htcap:112c':
+ 'wifi|probe:0,1,50|assoc:0,1,50,48,221(005043,1)|os:playstation':
+ ('', 'Playstation 3', '2.4GHz'),
+
+ 'wifi|probe:0,1,3,50|assoc:0,1,48,50,221(0050f2,2),45,htcap:112c|os:playstation':
('Marvell_88W8797', 'Playstation 4', '2.4GHz'),
'wifi|probe:0,1,45,221(0050f2,4),221(001018,2),221(00904c,51),htcap:010c,wps:Galaxy_Nexus|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:010c':
@@ -478,7 +489,10 @@
'wifi|probe:0,1,50,3,45,127,107,221(506f9a,16),221(0050f2,8),221(001018,2),htcap:002d,htagg:17,htmcs:0000ffff,intwrk:0f,extcap:80080000|assoc:0,1,50,33,36,48,70,45,127,107,221(001018,2),221(0050f2,2),htcap:002d,htagg:17,htmcs:0000ffff,intwrk:0f,extcap:80080000|oui:sony':
('', 'Sony Xperia Z4 Tablet', '2.4GHz'),
- 'wifi|probe:0,1,50,45,3,221(00904c,51),htcap:100c|assoc:0,1,48,50,45,221(00904c,51),221(0050f2,2),htcap:100c':
+ 'wifi|probe:0,1,50,221(001018,2)|assoc:0,1,48,50,221(001018,2)|os:wii':
+ ('BCM4318', 'Wii', '2.4GHz'),
+
+ 'wifi|probe:0,1,50,45,3,221(00904c,51),htcap:100c|assoc:0,1,48,50,45,221(00904c,51),221(0050f2,2),htcap:100c|os:wii':
('BCM43362', 'Wii-U', '2.4GHz'),
'wifi|probe:0,1,3,45,50,htcap:058f|assoc:0,1,48,50,221(0050f2,2),45,htcap:058d|name:Xbox-SystemOS':
