aboutsummaryrefslogtreecommitdiffstats
path: root/epan/oui.h
diff options
context:
space:
mode:
authorOwen Kirby <osk@exegin.com>2017-11-09 18:33:51 -0800
committerAnders Broman <a.broman58@gmail.com>2017-11-11 19:11:44 +0000
commit3f11c2f7c53ff07aa2d402eda013259706f257f8 (patch)
tree9d76e1360ed34cbc4a47449f30ff266c32e630d6 /epan/oui.h
parent499ae4ab573fbfefdb1c200e3177e18844e545b5 (diff)
Wi-SUN Protocol dissection and IEEE 802.15.4 IE cleanup.
This patch adds dissection for the Wi-SUN Field Area Network standard. Wi-SUN packets are encoded as a collection of IEEE 802.15.4 information elements. This required a bit of refactoring in how the IE dissector table is handled so that external protocols could supply their own dissectors. While I was working with the IEs, I also added support for the TSCH Timeslot and Global Time IEs from the IEEE 802.15.4 standard in addition to some general cleanup. Change-Id: I2858e4ab577756568e33b86adfe282967899abd5 Reviewed-on: https://code.wireshark.org/review/24331 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/oui.h')
-rw-r--r--epan/oui.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/oui.h b/epan/oui.h
index 1c25f416a4..7272d04a06 100644
--- a/epan/oui.h
+++ b/epan/oui.h
@@ -87,6 +87,7 @@
#define OUI_APPLE_ATALK 0x080007 /* Appletalk */
#define OUI_HP 0x080009 /* Hewlett-Packard */
#define OUI_HYTEC_GER 0x30B216 /* Hytec Geraetebau GmbH */
+#define OUI_ZIGBEE 0x4A191B /* ZigBee Alliance */
#define OUI_WFA 0x506F9A /* Wi-Fi Alliance */
#define OUI_3GPP2 0xCF0002 /* 3GPP2 */