taxonomy: update Nexus Player to signature v4.
Also add pcaps for Motorola Droid Razr, in case it turns out
to be popular enough to add to the database.
Change-Id: Id105febea26c8f858f4f4a6ee076ea25a865b31b
diff --git a/taxonomy/pcaptest.py b/taxonomy/pcaptest.py
index ffc7161..bb76e15 100644
--- a/taxonomy/pcaptest.py
+++ b/taxonomy/pcaptest.py
@@ -38,6 +38,10 @@
('Unknown', './testdata/pcaps/MediaTek MT7610U 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Motorola Droid 2 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Motorola Droid 3 2.4GHz.pcap'),
+ ('Unknown', './testdata/pcaps/Motorola Droid Razr 2.4GHz XT910 Broadcast Probe.pcap'),
+ ('Unknown', './testdata/pcaps/Motorola Droid Razr 2.4GHz XT910 Specific Probe.pcap'),
+ ('Unknown', './testdata/pcaps/Motorola Droid Razr 2.4GHz XT910.pcap'),
+ ('Unknown', './testdata/pcaps/Motorola Droid Razr 5GHz XT910.pcap'),
('Unknown', './testdata/pcaps/Motorola Droid Razr Maxx 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Nexus One 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Nokia Lumia 920 2.4GHz.pcap'),
diff --git a/taxonomy/testdata/pcaps/Motorola Droid Razr 2.4GHz XT910 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Motorola Droid Razr 2.4GHz XT910 Broadcast Probe.pcap
new file mode 100644
index 0000000..07b4d99
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Motorola Droid Razr 2.4GHz XT910 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Motorola Droid Razr 2.4GHz XT910 Specific Probe.pcap b/taxonomy/testdata/pcaps/Motorola Droid Razr 2.4GHz XT910 Specific Probe.pcap
new file mode 100644
index 0000000..7cd4d3b
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Motorola Droid Razr 2.4GHz XT910 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Motorola Droid Razr 2.4GHz XT910.pcap b/taxonomy/testdata/pcaps/Motorola Droid Razr 2.4GHz XT910.pcap
new file mode 100644
index 0000000..77cb52a
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Motorola Droid Razr 2.4GHz XT910.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Motorola Droid Razr 5GHz XT910.pcap b/taxonomy/testdata/pcaps/Motorola Droid Razr 5GHz XT910.pcap
new file mode 100644
index 0000000..d52dcda
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Motorola Droid Razr 5GHz XT910.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Nexus Player 2.4GHz.pcap b/taxonomy/testdata/pcaps/Nexus Player 2.4GHz.pcap
new file mode 100644
index 0000000..429dc07
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Nexus Player 2.4GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Nexus Player 5GHz.pcap b/taxonomy/testdata/pcaps/Nexus Player 5GHz.pcap
new file mode 100644
index 0000000..aaff1e4
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Nexus Player 5GHz.pcap
Binary files differ
diff --git a/taxonomy/wifi.py b/taxonomy/wifi.py
index c8e224f..585bf80 100644
--- a/taxonomy/wifi.py
+++ b/taxonomy/wifi.py
@@ -489,9 +489,9 @@
'wifi4|probe:0,1,50,3,45,221(001018,2),221(00904c,51),htcap:01bc,htagg:1b,htmcs:0000ffff|assoc:0,1,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:01bc,htagg:1b,htmcs:0000ffff|oui:murata':
('', 'Nexus 10', '2.4GHz'),
- 'wifi|probe:0,1,45,127,191,221(0050f2,4),221(506f9a,9),221(001018,2),htcap:006f,vhtcap:0f815832,wps:Nexus_Player|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(0050f2,2),htcap:006f,vhtcap:0f815832':
+ 'wifi4|probe:0,1,45,127,191,221(0050f2,4),221(506f9a,9),221(001018,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:0000088001400040,wps:Nexus_Player|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(0050f2,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:e009,extcap:0000088001400040':
('BCM4356', 'Nexus Player', '5GHz'),
- 'wifi|probe:0,1,50,3,45,127,221(0050f2,4),221(506f9a,9),221(001018,2),htcap:002d,wps:Nexus_Player|assoc:0,1,50,33,36,48,45,127,221(001018,2),221(0050f2,2),htcap:002d':
+ 'wifi4|probe:0,1,50,3,45,127,221(0050f2,4),221(506f9a,9),221(001018,2),htcap:002d,htagg:17,htmcs:0000ffff,extcap:0000088001400040,wps:Nexus_Player|assoc:0,1,50,33,36,48,45,127,221(001018,2),221(0050f2,2),htcap:002d,htagg:17,htmcs:0000ffff,txpow:1209,extcap:000008800140':
('BCM4356', 'Nexus Player', '2.4GHz'),
'wifi4|probe:0,1,50,45,51,127,htcap:012c,htagg:1b,htmcs:000000ff,extcap:0100000000000040|assoc:0,1,48,50,221(0050f2,2),45,51,127,htcap:012c,htagg:1b,htmcs:000000ff,extcap:0100000000000040|os:windows-phone':
