From 3f11c2f7c53ff07aa2d402eda013259706f257f8 Mon Sep 17 00:00:00 2001 From: Owen Kirby Date: Thu, 9 Nov 2017 18:33:51 -0800 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/oui.h | 1 + 1 file changed, 1 insertion(+) (limited to 'epan/oui.h') 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 */ -- cgit v1.2.3