taxonomy: add several AP variants, Samsung edition.

The contents of the Beacon alter the contents of the signature.
For example the presence of the Spectrum Management bit in
the Beacon from an AP causes iOS devices to include IE#70
(Radio Resource Management).

Gather signatures for a number of client devices using several
different APs with differing Beacons:
+ Fiber GFRG210
+ Google OnHub
+ Google Wifi

The new pcap files in this CL contain:
+ the Beacon of the AP
+ the Probe Request from the client. We generally provide
  both a Broadcast Probe Request and a Probe directed at the
  specific AP's SSID, because some clients include different IEs.
  Qualcomm radios frequently include 802.11ac (VHT) IEs in their
  2.4GHz Probe if sent to the Broadcast SSID, as some kind of
  proprietary higher bitrate operating mode for 2.4GHz. When
  sending to our specific SSID apparently the right bits are
  not present in the Beacon, and the Probe does not contain VHT IEs.

  Notably, Apple iOS devices have never been seen to send a different
  Probe Request to Broadcast as to a specific SSID, we include both
  variants for completeness and to document that there is no
  difference.
+ the Probe Response from the AP
+ the Authentication packet in both directions
+ the Associate Request from the client and Association Response
  from the AP.
+ the EAPOL exchange for WPA2. Note that being able to analyze the
  collection of EAPOL messages in this archive isn't sufficient to
  discover the Wifi PSK, otherwise people would camp out in the
  parking lot gathering samples.
+ a few packets after joining the WLAN

We're going to try to make a regular practice of this, to make the
corpus of collected WLAN traces more useful in the future for
development of new signature extensions.

Change-Id: Ide8f868cd18e8672a5e5b9b608dc10b3c8610f29
diff --git a/taxonomy/pcaptest.py b/taxonomy/pcaptest.py
index 73b807c..fc5806e 100644
--- a/taxonomy/pcaptest.py
+++ b/taxonomy/pcaptest.py
@@ -114,6 +114,16 @@
   ('Roku 4 or TV', './testdata/pcaps/Roku 4 5GHz.pcap'),
   ('Samsung Galaxy Note or S2+', './testdata/pcaps/Samsung Galaxy S2+ 5GHz.pcap'),
   ('Samsung Galaxy Note or S2+', './testdata/pcaps/Samsung Galaxy Note 5GHz.pcap'),
+  ('Samsung Galaxy Note or S2+', './testdata/pcaps/Samsung Galaxy Note 5GHz GFRG210 An4.0.4 SGH-T879 Broadcast Probe.pcap'),
+  ('Samsung Galaxy Note or S2+', './testdata/pcaps/Samsung Galaxy Note 5GHz GFRG210 An4.0.4 SGH-T879 Specific Probe.pcap'),
+  ('Samsung Galaxy Note or S2+', './testdata/pcaps/Samsung Galaxy Note 5GHz OnHub An4.0.4 SGH-T879 Broadcast Probe.pcap'),
+  ('Samsung Galaxy Note or S2+', './testdata/pcaps/Samsung Galaxy Note 5GHz OnHub An4.0.4 SGH-T879 Specific Probe.pcap'),
+  ('Samsung Galaxy Note or S2+', './testdata/pcaps/Samsung Galaxy Note 5GHz Google Wifi An4.0.4 SGH-T879 Specific Probe.pcap'),
+  ('Samsung Galaxy Note or S2+', './testdata/pcaps/Samsung Galaxy Note 5GHz Google Wifi An4.0.4 SGH-T879 Broadcast Probe.pcap'),
+  ('Samsung Galaxy Note 5 or S7 Edge', './testdata/pcaps/Samsung Galaxy S7 Edge 5GHz GFRG210 An6.0.1 SM-G935F Specific Probe.pcap'),
+  ('Samsung Galaxy Note 5 or S7 Edge', './testdata/pcaps/Samsung Galaxy S7 Edge 5GHz GFRG210 An6.0.1 SM-G935F Broadcast Probe.pcap'),
+  ('Samsung Galaxy Note 5 or S7 Edge', './testdata/pcaps/Samsung Galaxy Note 5 5GHz GFRG210 An6.0.1 SM-N920C Broadcast Probe.pcap'),
+  ('Samsung Galaxy Note 5 or S7 Edge', './testdata/pcaps/Samsung Galaxy Note 5 5GHz GFRG210 An6.0.1 SM-N920C Specific Probe.pcap'),
   ('Samsung Galaxy S2 or Infuse', './testdata/pcaps/Samsung Galaxy S2 2.4GHz.pcap'),
   ('Samsung Galaxy S2 or Infuse', './testdata/pcaps/Samsung Infuse 2.4GHz.pcap'),
   ('Sony Xperia Z4 or Z5', './testdata/pcaps/Sony Xperia Z5 5GHz.pcap'),
diff --git a/taxonomy/testdata/pcaps/Amazon Kindle 2.4GHz OnHub Kindle4.1.3 B00E Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Amazon Kindle 2.4GHz OnHub Kindle4.1.3 B00E Broadcast Probe.pcap
new file mode 100644
index 0000000..64b9d60
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Amazon Kindle 2.4GHz OnHub Kindle4.1.3 B00E Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Amazon Kindle 2.4GHz OnHub Kindle4.1.3 B00E Specific Probe.pcap b/taxonomy/testdata/pcaps/Amazon Kindle 2.4GHz OnHub Kindle4.1.3 B00E Specific Probe.pcap
new file mode 100644
index 0000000..6d9ea3a
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Amazon Kindle 2.4GHz OnHub Kindle4.1.3 B00E Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz GFRG210 An7.1.1 Pixel XL Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz GFRG210 An7.1.1 Pixel XL Broadcast Probe.pcap
new file mode 100644
index 0000000..03c40dd
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz GFRG210 An7.1.1 Pixel XL Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz GFRG210 An7.1.1 Pixel XL Specific Probe.pcap b/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz GFRG210 An7.1.1 Pixel XL Specific Probe.pcap
new file mode 100644
index 0000000..34553fd
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz GFRG210 An7.1.1 Pixel XL Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz Google Wifi An7.1.1 Pixel XL Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz Google Wifi An7.1.1 Pixel XL Broadcast Probe.pcap
new file mode 100644
index 0000000..fe9daf3
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz Google Wifi An7.1.1 Pixel XL Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz Google Wifi An7.1.1 Pixel XL Specific Probe.pcap b/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz Google Wifi An7.1.1 Pixel XL Specific Probe.pcap
new file mode 100644
index 0000000..e664066
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz Google Wifi An7.1.1 Pixel XL Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz OnHub An7.1.1 Pixel XL Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz OnHub An7.1.1 Pixel XL Broadcast Probe.pcap
new file mode 100644
index 0000000..a3e410f
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz OnHub An7.1.1 Pixel XL Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz OnHub An7.1.1 Pixel XL Specific Probe.pcap b/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz OnHub An7.1.1 Pixel XL Specific Probe.pcap
new file mode 100644
index 0000000..cff06c6
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Pixel Phone 2.4GHz OnHub An7.1.1 Pixel XL Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Pixel Phone 5GHz GFRG210 An7.1.1 Pixel XL Specific Probe.pcap b/taxonomy/testdata/pcaps/Pixel Phone 5GHz GFRG210 An7.1.1 Pixel XL Specific Probe.pcap
new file mode 100644
index 0000000..5217ed8
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Pixel Phone 5GHz GFRG210 An7.1.1 Pixel XL Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Pixel Phone 5GHz Google Wifi An7.1.1 Pixel XL Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Pixel Phone 5GHz Google Wifi An7.1.1 Pixel XL Broadcast Probe.pcap
new file mode 100644
index 0000000..1bc612e
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Pixel Phone 5GHz Google Wifi An7.1.1 Pixel XL Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Pixel Phone 5GHz Google Wifi An7.1.1 Pixel XL Specific Probe.pcap b/taxonomy/testdata/pcaps/Pixel Phone 5GHz Google Wifi An7.1.1 Pixel XL Specific Probe.pcap
new file mode 100644
index 0000000..4dbd9ad
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Pixel Phone 5GHz Google Wifi An7.1.1 Pixel XL Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Pixel Phone 5GHz OnHub An7.1.1 Pixel XL Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Pixel Phone 5GHz OnHub An7.1.1 Pixel XL Broadcast Probe.pcap
new file mode 100644
index 0000000..a41a8a5
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Pixel Phone 5GHz OnHub An7.1.1 Pixel XL Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Pixel Phone 5GHz OnHub An7.1.1 Pixel XL Specific Probe.pcap b/taxonomy/testdata/pcaps/Pixel Phone 5GHz OnHub An7.1.1 Pixel XL Specific Probe.pcap
new file mode 100644
index 0000000..f5b3c9a
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Pixel Phone 5GHz OnHub An7.1.1 Pixel XL Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz GFRG210 An4.0.4 SGH-T879 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz GFRG210 An4.0.4 SGH-T879 Broadcast Probe.pcap
new file mode 100644
index 0000000..3aba5c0
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz GFRG210 An4.0.4 SGH-T879 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz GFRG210 An4.0.4 SGH-T879 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz GFRG210 An4.0.4 SGH-T879 Specific Probe.pcap
new file mode 100644
index 0000000..3acff4c
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz GFRG210 An4.0.4 SGH-T879 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz Google Wifi An4.0.4 SGH-T879 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz Google Wifi An4.0.4 SGH-T879 Broadcast Probe.pcap
new file mode 100644
index 0000000..d86f8bd
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz Google Wifi An4.0.4 SGH-T879 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz Google Wifi An4.0.4 SGH-T879 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz Google Wifi An4.0.4 SGH-T879 Specific Probe.pcap
new file mode 100644
index 0000000..3626aec
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz Google Wifi An4.0.4 SGH-T879 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz OnHub An4.0.4 SGH-T879 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz OnHub An4.0.4 SGH-T879 Broadcast Probe.pcap
new file mode 100644
index 0000000..1a86944
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz OnHub An4.0.4 SGH-T879 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz OnHub An4.0.4 SGH-T879 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz OnHub An4.0.4 SGH-T879 Specific Probe.pcap
new file mode 100644
index 0000000..455d937
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz OnHub An4.0.4 SGH-T879 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz.pcap
deleted file mode 100644
index db09cba..0000000
--- a/taxonomy/testdata/pcaps/Samsung Galaxy Note 2.4GHz.pcap
+++ /dev/null
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz GFRG210 An5.0 SM-N900 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz GFRG210 An5.0 SM-N900 Broadcast Probe.pcap
new file mode 100644
index 0000000..c14d265
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz GFRG210 An5.0 SM-N900 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz GFRG210 An5.0 SM-N900 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz GFRG210 An5.0 SM-N900 Specific Probe.pcap
new file mode 100644
index 0000000..2b04f1b
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz GFRG210 An5.0 SM-N900 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz Google Wifi An5.0 SM-N900 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz Google Wifi An5.0 SM-N900 Broadcast Probe.pcap
new file mode 100644
index 0000000..b5ba9e5
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz Google Wifi An5.0 SM-N900 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz Google Wifi An5.0 SM-N900 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz Google Wifi An5.0 SM-N900 Specific Probe.pcap
new file mode 100644
index 0000000..bddfed9
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz Google Wifi An5.0 SM-N900 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz OnHub An5.0 SM-N900 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz OnHub An5.0 SM-N900 Broadcast Probe.pcap
new file mode 100644
index 0000000..5ec87d9
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz OnHub An5.0 SM-N900 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz OnHub An5.0 SM-N900 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz OnHub An5.0 SM-N900 Specific Probe.pcap
new file mode 100644
index 0000000..a1e46f1
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 2.4GHz OnHub An5.0 SM-N900 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz GFRG210 An5.0 SM-N900 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz GFRG210 An5.0 SM-N900 Broadcast Probe.pcap
new file mode 100644
index 0000000..82ee93b
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz GFRG210 An5.0 SM-N900 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz GFRG210 An5.0 SM-N900 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz GFRG210 An5.0 SM-N900 Specific Probe.pcap
new file mode 100644
index 0000000..9aba548
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz GFRG210 An5.0 SM-N900 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz Google Wifi An5.0 SM-N900 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz Google Wifi An5.0 SM-N900 Broadcast Probe.pcap
new file mode 100644
index 0000000..17881d0
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz Google Wifi An5.0 SM-N900 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz Google Wifi An5.0 SM-N900 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz Google Wifi An5.0 SM-N900 Specific Probe.pcap
new file mode 100644
index 0000000..00127ed
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz Google Wifi An5.0 SM-N900 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz OnHub An5.0 SM-N900 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz OnHub An5.0 SM-N900 Broadcast Probe.pcap
new file mode 100644
index 0000000..68e2ec5
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 3 5GHz OnHub An5.0 SM-N900 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz GFRG210 An6.0.1 SM-N920C Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz GFRG210 An6.0.1 SM-N920C Broadcast Probe.pcap
new file mode 100644
index 0000000..421ffe2
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz GFRG210 An6.0.1 SM-N920C Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz GFRG210 An6.0.1 SM-N920C Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz GFRG210 An6.0.1 SM-N920C Specific Probe.pcap
new file mode 100644
index 0000000..7aeca1c
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz GFRG210 An6.0.1 SM-N920C Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz Google Wifi An6.0.1 SM-N920C Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz Google Wifi An6.0.1 SM-N920C Broadcast Probe.pcap
new file mode 100644
index 0000000..06c9757
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz Google Wifi An6.0.1 SM-N920C Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz Google Wifi An6.0.1 SM-N920C Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz Google Wifi An6.0.1 SM-N920C Specific Probe.pcap
new file mode 100644
index 0000000..aba3f43
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz Google Wifi An6.0.1 SM-N920C Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz OnHub An6.0.1 SM-N920C Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz OnHub An6.0.1 SM-N920C Broadcast Probe.pcap
new file mode 100644
index 0000000..526d695
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz OnHub An6.0.1 SM-N920C Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz OnHub An6.0.1 SM-N920C Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz OnHub An6.0.1 SM-N920C Specific Probe.pcap
new file mode 100644
index 0000000..496e756
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 2.4GHz OnHub An6.0.1 SM-N920C Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz GFRG210 An6.0.1 SM-N920C Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz GFRG210 An6.0.1 SM-N920C Broadcast Probe.pcap
new file mode 100644
index 0000000..802436e
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz GFRG210 An6.0.1 SM-N920C Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz GFRG210 An6.0.1 SM-N920C Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz GFRG210 An6.0.1 SM-N920C Specific Probe.pcap
new file mode 100644
index 0000000..e5d4c4e
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz GFRG210 An6.0.1 SM-N920C Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz Google Wifi An6.0.1 SM-N920C Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz Google Wifi An6.0.1 SM-N920C Broadcast Probe.pcap
new file mode 100644
index 0000000..dc2d879
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz Google Wifi An6.0.1 SM-N920C Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz Google Wifi An6.0.1 SM-N920C Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz Google Wifi An6.0.1 SM-N920C Specific Probe.pcap
new file mode 100644
index 0000000..489faf3
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz Google Wifi An6.0.1 SM-N920C Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz OnHub An6.0.1 SM-N920C Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz OnHub An6.0.1 SM-N920C Broadcast Probe.pcap
new file mode 100644
index 0000000..eb55d7f
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz OnHub An6.0.1 SM-N920C Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz OnHub An6.0.1 SM-N920C Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz OnHub An6.0.1 SM-N920C Specific Probe.pcap
new file mode 100644
index 0000000..05756ca
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5 5GHz OnHub An6.0.1 SM-N920C Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz GFRG210 An4.0.4 SGH-T879 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz GFRG210 An4.0.4 SGH-T879 Broadcast Probe.pcap
new file mode 100644
index 0000000..d086613
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz GFRG210 An4.0.4 SGH-T879 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz GFRG210 An4.0.4 SGH-T879 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz GFRG210 An4.0.4 SGH-T879 Specific Probe.pcap
new file mode 100644
index 0000000..2142353
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz GFRG210 An4.0.4 SGH-T879 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz Google Wifi An4.0.4 SGH-T879 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz Google Wifi An4.0.4 SGH-T879 Broadcast Probe.pcap
new file mode 100644
index 0000000..64df540
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz Google Wifi An4.0.4 SGH-T879 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz Google Wifi An4.0.4 SGH-T879 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz Google Wifi An4.0.4 SGH-T879 Specific Probe.pcap
new file mode 100644
index 0000000..8c465cb
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz Google Wifi An4.0.4 SGH-T879 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz OnHub An4.0.4 SGH-T879 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz OnHub An4.0.4 SGH-T879 Broadcast Probe.pcap
new file mode 100644
index 0000000..cd08707
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz OnHub An4.0.4 SGH-T879 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz OnHub An4.0.4 SGH-T879 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz OnHub An4.0.4 SGH-T879 Specific Probe.pcap
new file mode 100644
index 0000000..b998c69
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz OnHub An4.0.4 SGH-T879 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz.pcap
index 888b913..c41925a 100644
--- a/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz.pcap
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note 5GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz GFRG210 An4.4.2 SGH-I317 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz GFRG210 An4.4.2 SGH-I317 Broadcast Probe.pcap
new file mode 100644
index 0000000..ac88722
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz GFRG210 An4.4.2 SGH-I317 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz GFRG210 An4.4.2 SGH-I317 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz GFRG210 An4.4.2 SGH-I317 Specific Probe.pcap
new file mode 100644
index 0000000..2b6563e
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz GFRG210 An4.4.2 SGH-I317 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz Google Wifi An4.4.2 SGH-I317 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz Google Wifi An4.4.2 SGH-I317 Broadcast Probe.pcap
new file mode 100644
index 0000000..ced551a
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz Google Wifi An4.4.2 SGH-I317 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz Google Wifi An4.4.2 SGH-I317 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz Google Wifi An4.4.2 SGH-I317 Specific Probe.pcap
new file mode 100644
index 0000000..0f75751
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz Google Wifi An4.4.2 SGH-I317 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz OnHub An4.4.2 SGH-I317 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz OnHub An4.4.2 SGH-I317 Broadcast Probe.pcap
new file mode 100644
index 0000000..b26f0f3
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz OnHub An4.4.2 SGH-I317 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz OnHub An4.4.2 SGH-I317 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz OnHub An4.4.2 SGH-I317 Specific Probe.pcap
new file mode 100644
index 0000000..38c36fd
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 2.4GHz OnHub An4.4.2 SGH-I317 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz GFRG210 An4.4.2 SGH-I317 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz GFRG210 An4.4.2 SGH-I317 Specific Probe.pcap
new file mode 100644
index 0000000..3099ea5
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz GFRG210 An4.4.2 SGH-I317 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz Google Wifi An4.4.2 SGH-I317 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz Google Wifi An4.4.2 SGH-I317 Broadcast Probe.pcap
new file mode 100644
index 0000000..051522a
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz Google Wifi An4.4.2 SGH-I317 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz Google Wifi An4.4.2 SGH-I317 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz Google Wifi An4.4.2 SGH-I317 Specific Probe.pcap
new file mode 100644
index 0000000..8ebc97e
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz Google Wifi An4.4.2 SGH-I317 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz OnHub An4.4.2 SGH-I317 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz OnHub An4.4.2 SGH-I317 Broadcast Probe.pcap
new file mode 100644
index 0000000..3e45089
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz OnHub An4.4.2 SGH-I317 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz OnHub An4.4.2 SGH-I317 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz OnHub An4.4.2 SGH-I317 Specific Probe.pcap
new file mode 100644
index 0000000..4facea3
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Note II 5GHz OnHub An4.4.2 SGH-I317 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz GFRG210 An5.0.1 GT-I9500 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz GFRG210 An5.0.1 GT-I9500 Broadcast Probe.pcap
new file mode 100644
index 0000000..3be90ad
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz GFRG210 An5.0.1 GT-I9500 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz GFRG210 An5.0.1 GT-I9500 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz GFRG210 An5.0.1 GT-I9500 Specific Probe.pcap
new file mode 100644
index 0000000..75ffff1
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz GFRG210 An5.0.1 GT-I9500 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz Google Wifi An5.0.1 GT-I9500 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz Google Wifi An5.0.1 GT-I9500 Broadcast Probe.pcap
new file mode 100644
index 0000000..100241a
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz Google Wifi An5.0.1 GT-I9500 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz Google Wifi An5.0.1 GT-I9500 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz Google Wifi An5.0.1 GT-I9500 Specific Probe.pcap
new file mode 100644
index 0000000..f3e9137
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz Google Wifi An5.0.1 GT-I9500 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz OnHub An5.0.1 GT-I9500 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz OnHub An5.0.1 GT-I9500 Broadcast Probe.pcap
new file mode 100644
index 0000000..51bf98a
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz OnHub An5.0.1 GT-I9500 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz OnHub An5.0.1 GT-I9500 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz OnHub An5.0.1 GT-I9500 Specific Probe.pcap
new file mode 100644
index 0000000..e9ceb51
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz OnHub An5.0.1 GT-I9500 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz GFRG210 An5.0.1 GT-I9500 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz GFRG210 An5.0.1 GT-I9500 Broadcast Probe.pcap
new file mode 100644
index 0000000..6f6dac7
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz GFRG210 An5.0.1 GT-I9500 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz GFRG210 An5.0.1 GT-I9500 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz GFRG210 An5.0.1 GT-I9500 Specific Probe.pcap
new file mode 100644
index 0000000..517e956
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz GFRG210 An5.0.1 GT-I9500 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz Google Wifi An5.0.1 GT-I9500 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz Google Wifi An5.0.1 GT-I9500 Broadcast Probe.pcap
new file mode 100644
index 0000000..1768baa
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz Google Wifi An5.0.1 GT-I9500 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz Google Wifi An5.0.1 GT-I9500 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz Google Wifi An5.0.1 GT-I9500 Specific Probe.pcap
new file mode 100644
index 0000000..f57b9de
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz Google Wifi An5.0.1 GT-I9500 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz OnHub An5.0.1 GT-I9500 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz OnHub An5.0.1 GT-I9500 Broadcast Probe.pcap
new file mode 100644
index 0000000..1eccfb3
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz OnHub An5.0.1 GT-I9500 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz OnHub An5.0.1 GT-I9500 Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz OnHub An5.0.1 GT-I9500 Specific Probe.pcap
new file mode 100644
index 0000000..d95f230
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz OnHub An5.0.1 GT-I9500 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz GFRG210 An6.0.1 SM-G935F Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz GFRG210 An6.0.1 SM-G935F Broadcast Probe.pcap
new file mode 100644
index 0000000..236f52a
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz GFRG210 An6.0.1 SM-G935F Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz GFRG210 An6.0.1 SM-G935F Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz GFRG210 An6.0.1 SM-G935F Specific Probe.pcap
new file mode 100644
index 0000000..45cfb90
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz GFRG210 An6.0.1 SM-G935F Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz Google Wifi An6.0.1 SM-G935F Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz Google Wifi An6.0.1 SM-G935F Broadcast Probe.pcap
new file mode 100644
index 0000000..2aae15a
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz Google Wifi An6.0.1 SM-G935F Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz Google Wifi An6.0.1 SM-G935F Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz Google Wifi An6.0.1 SM-G935F Specific Probe.pcap
new file mode 100644
index 0000000..0ff8ffb
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz Google Wifi An6.0.1 SM-G935F Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz OnHub An6.0.1 SM-G935F Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz OnHub An6.0.1 SM-G935F Broadcast Probe.pcap
new file mode 100644
index 0000000..02d3d6c
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz OnHub An6.0.1 SM-G935F Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz OnHub An6.0.1 SM-G935F Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz OnHub An6.0.1 SM-G935F Specific Probe.pcap
new file mode 100644
index 0000000..ed9fdc8
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 2.4GHz OnHub An6.0.1 SM-G935F Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz GFRG210 An6.0.1 SM-G935F Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz GFRG210 An6.0.1 SM-G935F Broadcast Probe.pcap
new file mode 100644
index 0000000..e84f427
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz GFRG210 An6.0.1 SM-G935F Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz GFRG210 An6.0.1 SM-G935F Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz GFRG210 An6.0.1 SM-G935F Specific Probe.pcap
new file mode 100644
index 0000000..db62491
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz GFRG210 An6.0.1 SM-G935F Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz Google Wifi An6.0.1 SM-G935F Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz Google Wifi An6.0.1 SM-G935F Broadcast Probe.pcap
new file mode 100644
index 0000000..4f95d1b
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz Google Wifi An6.0.1 SM-G935F Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz Google Wifi An6.0.1 SM-G935F Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz Google Wifi An6.0.1 SM-G935F Specific Probe.pcap
new file mode 100644
index 0000000..200be7b
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz Google Wifi An6.0.1 SM-G935F Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz OnHub An6.0.1 SM-G935F Broadcast Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz OnHub An6.0.1 SM-G935F Broadcast Probe.pcap
new file mode 100644
index 0000000..198dc6d
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz OnHub An6.0.1 SM-G935F Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz OnHub An6.0.1 SM-G935F Specific Probe.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz OnHub An6.0.1 SM-G935F Specific Probe.pcap
new file mode 100644
index 0000000..d414fa1
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S7 Edge 5GHz OnHub An6.0.1 SM-G935F Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/wifi.py b/taxonomy/wifi.py
index 75aa819..4057db6 100644
--- a/taxonomy/wifi.py
+++ b/taxonomy/wifi.py
@@ -1005,6 +1005,8 @@
         ('Pixel Phone', '', '5GHz'),
     'wifi4|probe:0,1,45,191,221(0050f2,8),127,htcap:01ef,htagg:1f,htmcs:0000ffff,vhtcap:338001b2,vhtrxmcs:030cfffa,vhttxmcs:030cfffa,extcap:04000a020100004080|assoc:0,1,48,45,221(0050f2,2),191,127,htcap:01ef,htagg:1f,htmcs:0000ffff,vhtcap:339031b2,vhtrxmcs:030cfffa,vhttxmcs:030cfffa,extcap:04000a020100004080|oui:htc':
         ('Pixel Phone', '', '5GHz'),
+    'wifi4|probe:0,1,45,191,221(0050f2,8),127,htcap:01ef,htagg:1f,htmcs:0000ffff,vhtcap:338001b2,vhtrxmcs:030cfffa,vhttxmcs:030cfffa,extcap:04000a020100004080|assoc:0,1,48,45,221(0050f2,2),191,127,htcap:01ef,htagg:1f,htmcs:0000ffff,vhtcap:339071b2,vhtrxmcs:030cfffa,vhttxmcs:030cfffa,extcap:04000a020100004080|oui:htc':
+        ('Pixel Phone', '', '5GHz'),
     'wifi4|probe:0,1,50,3,45,221(0050f2,8),127,htcap:01ad,htagg:1f,htmcs:0000ffff,extcap:040000000000000080|assoc:0,1,50,33,48,70,45,221(0050f2,2),127,htcap:01ad,htagg:1f,htmcs:0000ffff,txpow:1e08,extcap:04000a020100000080|oui:htc':
         ('Pixel Phone', '', '2.4GHz'),
     'wifi4|probe:0,1,50,3,45,221(0050f2,8),127,htcap:01ad,htagg:1f,htmcs:0000ffff,extcap:040000000000000080|assoc:0,1,50,48,45,221(0050f2,2),127,htcap:01ad,htagg:1f,htmcs:0000ffff,extcap:04000a020100000080|oui:htc':
@@ -1119,9 +1121,13 @@
 
     'wifi4|probe:0,1,45,3,221(001018,2),221(00904c,51),htcap:000c,htagg:19,htmcs:000000ff|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:000c,htagg:19,htmcs:000000ff,txpow:0f09|oui:samsung':
         ('Samsung Galaxy Note or S2+', '', '5GHz'),
+    'wifi4|probe:0,1,45,221(001018,2),221(00904c,51),htcap:000c,htagg:19,htmcs:000000ff|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:000c,htagg:19,htmcs:000000ff,txpow:0f09|oui:samsung':
+        ('Samsung Galaxy Note or S2+', '', '5GHz'),
 
     'wifi4|probe:0,1,50,45,3,221(001018,2),221(00904c,51),htcap:100c,htagg:19,htmcs:000000ff|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:100c,htagg:19,htmcs:000000ff,txpow:1409|oui:samsung':
         ('Samsung Galaxy Note', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,45,221(001018,2),221(00904c,51),htcap:100c,htagg:19,htmcs:000000ff|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:100c,htagg:19,htmcs:000000ff,txpow:1409|oui:samsung':
+        ('Samsung Galaxy Note', '', '2.4GHz'),
 
     'wifi4|probe:0,1,45,221(001018,2),221(00904c,51),htcap:0062,htagg:1a,htmcs:000000ff|assoc:0,1,33,36,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:0062,htagg:1a,htmcs:000000ff,txpow:0e09|oui:samsung':
         ('Samsung Galaxy Note II', '', '5GHz'),
@@ -1135,15 +1141,27 @@
         ('Samsung Galaxy Note II', '', '2.4GHz'),
     'wifi4|probe:0,1,50,45,3,221(001018,2),221(00904c,51),htcap:1020,htagg:1a,htmcs:000000ff|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:1020,htagg:1a,htmcs:000000ff,txpow:1209|oui:samsung':
         ('Samsung Galaxy Note II', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,45,221(001018,2),221(00904c,51),htcap:1020,htagg:1a,htmcs:000000ff|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:1020,htagg:1a,htmcs:000000ff,txpow:1209|oui:samsung':
+        ('Samsung Galaxy Note II', '', '2.4GHz'),
 
     'wifi4|probe:0,1,3,45,127,191,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:016f,htagg:17,htmcs:000000ff,vhtcap:0f805932,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:0000080000000040|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(00904c,4),221(0050f2,2),htcap:016f,htagg:17,htmcs:000000ff,vhtcap:0f805932,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:e008,extcap:0000000000000040|oui:samsung':
         ('Samsung Galaxy Note 3', '', '5GHz'),
     'wifi4|probe:0,1,45,127,191,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:016f,htagg:17,htmcs:000000ff,vhtcap:0f805932,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:0000080000000040|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(00904c,4),221(0050f2,2),htcap:016f,htagg:17,htmcs:000000ff,vhtcap:0f805932,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:e008,extcap:0000000000000040|oui:samsung':
         ('Samsung Galaxy Note 3', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,191,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:016f,htagg:17,htmcs:000000ff,vhtcap:0f805932,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:0000088001400040|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(00904c,4),221(0050f2,2),htcap:016f,htagg:17,htmcs:000000ff,vhtcap:0f805932,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:e008,extcap:0000008001400040|oui:samsung':
+        ('Samsung Galaxy Note 3', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,191,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:016f,htagg:17,htmcs:000000ff,vhtcap:0f805932,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:0000088001400040|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(00904c,4),221(0050f2,2),htcap:016f,htagg:17,htmcs:000000ff,vhtcap:0f805932,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:e008,extcap:0000088001400040|oui:samsung':
+        ('Samsung Galaxy Note 3', '', '5GHz'),
     'wifi4|probe:0,1,50,3,45,127,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:112d,htagg:17,htmcs:000000ff,extcap:0000080000000040|assoc:0,1,33,36,48,50,45,221(001018,2),221(0050f2,2),htcap:112d,htagg:17,htmcs:000000ff,txpow:1208|oui:samsung':
         ('Samsung Galaxy Note 3', '', '2.4GHz'),
     'wifi4|probe:0,1,50,3,45,127,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:112d,htagg:17,htmcs:000000ff,extcap:0000080000000040|assoc:0,1,33,36,48,50,45,127,221(001018,2),221(0050f2,2),htcap:112d,htagg:17,htmcs:000000ff,txpow:1208|oui:samsung':
         ('Samsung Galaxy Note 3', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,45,127,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:112d,htagg:17,htmcs:000000ff,extcap:0000088001400040|assoc:0,1,33,36,48,50,45,127,221(001018,2),221(00904c,4),221(0050f2,2),htcap:112d,htagg:17,htmcs:000000ff,txpow:1208,extcap:0000088001400040|oui:samsung':
+        ('Samsung Galaxy Note 3', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:112d,htagg:17,htmcs:000000ff,extcap:0000088001400040|assoc:0,1,33,36,48,50,45,127,221(001018,2),221(00904c,4),221(0050f2,2),htcap:112d,htagg:17,htmcs:000000ff,txpow:1208,extcap:0000088001400040|oui:samsung':
+        ('Samsung Galaxy Note 3', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:112d,htagg:17,htmcs:000000ff,extcap:0000088001400040|assoc:0,1,33,36,48,50,45,127,221(001018,2),221(0050f2,2),htcap:112d,htagg:17,htmcs:000000ff,txpow:1208,extcap:000000800140|oui:samsung':
+        ('Samsung Galaxy Note 3', '', '2.4GHz'),
 
     'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:0000088001400040|assoc:0,1,33,36,48,45,127,107,191,221(00904c,4),221(001018,2),221(0050f2,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:e009,extcap:0000088001400040|oui:samsung':
         ('Samsung Galaxy Note 4', '', '5GHz'),
@@ -1154,14 +1172,31 @@
     'wifi4|probe:0,1,50,3,45,127,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:002d,htagg:17,htmcs:0000ffff,extcap:0000088001400040|assoc:0,1,50,33,36,48,70,45,127,221(001018,2),221(0050f2,2),htcap:002d,htagg:17,htmcs:0000ffff,txpow:1509,extcap:0000088001400040|oui:samsung':
         ('Samsung Galaxy Note 4', '', '2.4GHz'),
 
+    'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9178b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f8401400040|assoc:0,1,33,36,48,70,45,127,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102,extcap:0000000000000040|oui:samsung':
+        ('Samsung Galaxy Note 5 or S7 Edge', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f8401400040|assoc:0,1,33,36,48,70,45,127,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102,extcap:0000000000000040|oui:samsung':
+        ('Samsung Galaxy Note 5 or S7 Edge', '', '5GHz'),
+
     'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f8401400040|assoc:0,1,33,36,48,45,127,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102,extcap:0000000000000040|oui:samsung':
         ('Samsung Galaxy Note 5', '', '5GHz'),
     'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f8401400040|assoc:0,1,33,36,48,70,45,127,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1202,extcap:0000000000000040|oui:samsung':
         ('Samsung Galaxy Note 5', '', '5GHz'),
     'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f840140|assoc:0,1,33,36,48,70,45,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1202|oui:samsung':
         ('Samsung Galaxy Note 5', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9178b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f8401400040|assoc:0,1,33,36,48,45,127,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102,extcap:0000080000000040|oui:samsung':
+        ('Samsung Galaxy Note 5', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f8401400040|assoc:0,1,33,36,48,45,127,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9138b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102,extcap:0000080000000040|oui:samsung':
+        ('Samsung Galaxy Note 5', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9178b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f8401400040|assoc:0,1,33,36,48,45,127,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9138b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102,extcap:0000080000000040|oui:samsung':
+        ('Samsung Galaxy Note 5', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f8401400040|assoc:0,1,33,36,48,45,127,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102,extcap:0000080000000040|oui:samsung':
+        ('Samsung Galaxy Note 5', '', '5GHz'),
     'wifi4|probe:0,1,50,3,45,127,107,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ad,htagg:17,htmcs:0000ffff,extcap:00080f8401400040|assoc:0,1,50,33,36,48,45,221(001018,2),221(0050f2,2),htcap:01ad,htagg:17,htmcs:0000ffff,txpow:1202|oui:samsung':
         ('Samsung Galaxy Note 5', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,107,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ad,htagg:17,htmcs:0000ffff,extcap:00080f8401400040|assoc:0,1,50,33,36,48,45,127,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ad,htagg:17,htmcs:0000ffff,txpow:1202,extcap:0000080000000040|oui:samsung':
+        ('Samsung Galaxy Note 5', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,107,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ad,htagg:17,htmcs:0000ffff,extcap:00080f8401400040|assoc:0,1,50,33,36,48,70,45,221(001018,2),221(0050f2,2),htcap:01ad,htagg:17,htmcs:0000ffff,txpow:1202|oui:samsung':
+        ('Samsung Galaxy Note 5', '', '2.4GHz'),
 
     'wifi4|probe:0,1,45,221(001018,2),221(00904c,51),htcap:000c,htagg:19,htmcs:000000ff|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:000c,htagg:19,htmcs:000000ff,txpow:0f0a|oui:samsung':
         ('Samsung Galaxy S2', '', '5GHz'),
@@ -1204,6 +1239,8 @@
         ('Samsung Galaxy S4', '', '2.4GHz'),
     'wifi4|probe:0,1,50,45,127,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:102d,htagg:17,htmcs:000000ff,extcap:0000080000400040|assoc:0,1,33,36,48,50,45,127,221(001018,2),221(00904c,4),221(0050f2,2),htcap:102d,htagg:17,htmcs:000000ff,txpow:1201,extcap:0000000000400040|oui:samsung':
         ('Samsung Galaxy S4', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:102d,htagg:17,htmcs:000000ff,extcap:0000080000400040|assoc:0,1,33,36,48,50,45,127,221(001018,2),221(0050f2,2),htcap:102d,htagg:17,htmcs:000000ff,txpow:1201,extcap:000000000040|oui:samsung':
+        ('Samsung Galaxy S4', '', '2.4GHz'),
 
     'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:0000088001400040|assoc:0,1,33,36,48,45,127,107,191,221(00904c,4),221(001018,2),221(0050f2,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:e20b,extcap:0000088001400040|oui:samsung':
         ('Samsung Galaxy S5', '', '5GHz'),
@@ -1244,8 +1281,20 @@
 
     'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9178b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f840140|assoc:0,1,33,36,48,70,45,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102|oui:samsung':
         ('Samsung Galaxy S7 Edge', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f8401400040|assoc:0,1,33,36,48,45,127,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9138b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1002,extcap:0000080000000040|oui:samsung':
+        ('Samsung Galaxy S7 Edge', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9138b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f8401400040|assoc:0,1,33,36,48,45,127,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1002,extcap:0000080000000040|oui:samsung':
+        ('Samsung Galaxy S7 Edge', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9178b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f8401400040|assoc:0,1,33,36,48,45,127,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1002,extcap:0000080000000040|oui:samsung':
+        ('Samsung Galaxy S7 Edge', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9178b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f8401400040|assoc:0,1,33,36,48,45,127,191,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9138b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1002,extcap:0000080000000040|oui:samsung':
+        ('Samsung Galaxy S7 Edge', '', '5GHz'),
     'wifi4|probe:0,1,50,3,45,127,107,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:1163,htagg:17,htmcs:0000ffff,extcap:00080f8401400040|assoc:0,1,50,33,36,48,70,45,221(001018,2),221(0050f2,2),htcap:01ad,htagg:17,htmcs:0000ffff,txpow:1302|oui:samsung':
         ('Samsung Galaxy S7 Edge', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,107,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ad,htagg:17,htmcs:0000ffff,extcap:00080f8401400040|assoc:0,1,50,33,36,48,70,45,221(001018,2),221(0050f2,2),htcap:01ad,htagg:17,htmcs:0000ffff,txpow:1302|oui:samsung':
+        ('Samsung Galaxy S7 Edge', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,107,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:01ad,htagg:17,htmcs:0000ffff,extcap:00080f8401400040|assoc:0,1,50,33,36,48,45,127,199,221(00904c,4),221(001018,2),221(0050f2,2),htcap:01ad,htagg:17,htmcs:0000ffff,txpow:1302,extcap:0000080000000040|oui:samsung':
+        ('Samsung Galaxy S7 Edge', '', '2.4GHz'),
 
     'wifi4|probe:0,1,45,221(001018,2),221(00904c,51),htcap:082c,htagg:1b,htmcs:000000ff|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:082c,htagg:1b,htmcs:000000ff,txpow:0f08|oui:samsung':
         ('Samsung Galaxy Tab', '', '5GHz'),