forked from osmocom/wireshark
From Fred Fierling:
Update the ZigBee dissectors to the latest profile identifier database, 05-3298-18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6693 svn path=/trunk/; revision=40272
This commit is contained in:
Anders Broman
parent
c4f4087a9a
commit
55b05cb42b
|
|
@ -336,7 +336,7 @@ const range_string zbee_aps_apid_names[] = {
|
|||
{ ZBEE_PROFILE_YAMATAKE_MIN, ZBEE_PROFILE_YAMATAKE_MAX, ZBEE_MFG_YAMATAKE },
|
||||
{ ZBEE_PROFILE_TENDRIL_MIN, ZBEE_PROFILE_TENDRIL_MAX, ZBEE_MFG_TENDRIL },
|
||||
{ ZBEE_PROFILE_ASSA_MIN, ZBEE_PROFILE_ASSA_MAX, ZBEE_MFG_ASSA },
|
||||
{ ZBEE_PROFILE_DIGI_MIN, ZBEE_PROFILE_DIGI_MAX, ZBEE_MFG_DIGI },
|
||||
{ ZBEE_PROFILE_MAXSTREAM_MIN, ZBEE_PROFILE_MAXSTREAM_MAX, ZBEE_MFG_MAXSTREAM },
|
||||
{ ZBEE_PROFILE_XANADU_MIN, ZBEE_PROFILE_XANADU_MAX, ZBEE_MFG_XANADU },
|
||||
{ ZBEE_PROFILE_NEUROCOM_MIN, ZBEE_PROFILE_NEUROCOM_MAX, ZBEE_MFG_NEUROCOM },
|
||||
{ ZBEE_PROFILE_III_MIN, ZBEE_PROFILE_III_MAX, ZBEE_MFG_III },
|
||||
|
|
@ -443,6 +443,15 @@ const range_string zbee_aps_apid_names[] = {
|
|||
{ ZBEE_PROFILE_SENTEC_MIN, ZBEE_PROFILE_SENTEC_MAX, ZBEE_MFG_SENTEC },
|
||||
{ ZBEE_PROFILE_NAVETAS_MIN, ZBEE_PROFILE_NAVETAS_MAX, ZBEE_MFG_NAVETAS },
|
||||
{ ZBEE_PROFILE_ENERNOC_MIN, ZBEE_PROFILE_ENERNOC_MAX, ZBEE_MFG_ENERNOC },
|
||||
{ ZBEE_PROFILE_ELTAV_MIN, ZBEE_PROFILE_ELTAV_MAX, ZBEE_MFG_ELTAV },
|
||||
{ ZBEE_PROFILE_XSTREAMHD_MIN, ZBEE_PROFILE_XSTREAMHD_MAX, ZBEE_MFG_XSTREAMHD },
|
||||
{ ZBEE_PROFILE_GREEN_MIN, ZBEE_PROFILE_GREEN_MAX, ZBEE_MFG_GREEN },
|
||||
{ ZBEE_PROFILE_OMRON_MIN, ZBEE_PROFILE_OMRON_MAX, ZBEE_MFG_OMRON },
|
||||
{ ZBEE_PROFILE_NEC_TOKIN_MIN, ZBEE_PROFILE_NEC_TOKIN_MAX, ZBEE_MFG_NEC_TOKIN },
|
||||
{ ZBEE_PROFILE_PEEL_MIN, ZBEE_PROFILE_PEEL_MAX, ZBEE_MFG_PEEL },
|
||||
{ ZBEE_PROFILE_ELECTROLUX_MIN, ZBEE_PROFILE_ELECTROLUX_MAX, ZBEE_MFG_ELECTROLUX },
|
||||
{ ZBEE_PROFILE_SAMSUNG_MIN, ZBEE_PROFILE_SAMSUNG_MAX, ZBEE_MFG_SAMSUNG },
|
||||
{ ZBEE_PROFILE_MAINSTREAM_MIN, ZBEE_PROFILE_MAINSTREAM_MAX, ZBEE_MFG_MAINSTREAM },
|
||||
|
||||
{ 0, 0, NULL }
|
||||
};
|
||||
|
|
|
|||
|
|
@ -184,7 +184,8 @@ static const value_string zbee_zcl_cs_cmd_names[] = {
|
|||
};
|
||||
|
||||
|
||||
/* Manufacturer Name Table */
|
||||
/* ZigBee Manufacturer Name Table */
|
||||
/* Per: 053298r18, November 2011 */
|
||||
static const value_string zbee_mfr_code_names[] = {
|
||||
|
||||
{ ZBEE_MFG_CODE_CIRRONET, ZBEE_MFG_CIRRONET },
|
||||
|
|
@ -218,7 +219,7 @@ static const value_string zbee_mfr_code_names[] = {
|
|||
{ ZBEE_MFG_CODE_YAMATAKE, ZBEE_MFG_YAMATAKE },
|
||||
{ ZBEE_MFG_CODE_TENDRIL, ZBEE_MFG_TENDRIL },
|
||||
{ ZBEE_MFG_CODE_ASSA, ZBEE_MFG_ASSA },
|
||||
{ ZBEE_MFG_CODE_DIGI, ZBEE_MFG_DIGI },
|
||||
{ ZBEE_MFG_CODE_MAXSTREAM, ZBEE_MFG_MAXSTREAM },
|
||||
{ ZBEE_MFG_CODE_NEUROCOM, ZBEE_MFG_NEUROCOM },
|
||||
|
||||
{ ZBEE_MFG_CODE_III, ZBEE_MFG_III },
|
||||
|
|
@ -330,7 +331,7 @@ static const value_string zbee_mfr_code_names[] = {
|
|||
{ 0x1084, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_CEDO, ZBEE_MFG_CEDO },
|
||||
{ 0x1086, "Unknown" }, /**/
|
||||
{ 0x1087, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_DIGI, ZBEE_MFG_DIGI },
|
||||
{ 0x1088, "Unknown" }, /**/
|
||||
{ 0x1089, "Unknown" }, /**/
|
||||
{ 0x108a, "Unknown" }, /**/
|
||||
|
|
@ -350,11 +351,7 @@ static const value_string zbee_mfr_code_names[] = {
|
|||
{ ZBEE_MFG_CODE_SYCHIP, ZBEE_MFG_SYCHIP },
|
||||
{ 0x1098, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_PASSIVESYS, ZBEE_MFG_PASSIVESYS },
|
||||
#if 0
|
||||
{ ZBEE_MFG_CODE_G4S_JUSTICE,ZBEE_MFG_G4S_JUSTICE },
|
||||
{ ZBEE_MFG_CODE_MMB, ZBEE_MFG_PASSIVESYS },
|
||||
#endif
|
||||
{ 0x109a, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_MMB, ZBEE_MFG_MMB },
|
||||
{ ZBEE_MFG_CODE_HOME_AUTO, ZBEE_MFG_HOME_AUTO },
|
||||
{ 0x109c, "Unknown" }, /**/
|
||||
{ 0x109d, "Unknown" }, /**/
|
||||
|
|
@ -381,6 +378,83 @@ static const value_string zbee_mfr_code_names[] = {
|
|||
{ 0x10b0, "Unknown" }, /**/
|
||||
{ 0x10b1, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_ENERNOC, ZBEE_MFG_ENERNOC },
|
||||
{ ZBEE_MFG_CODE_ELTAV, ZBEE_MFG_ELTAV },
|
||||
{ 0x10b4, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_XSTREAMHD, ZBEE_MFG_XSTREAMHD },
|
||||
{ 0x10b6, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_GREEN, ZBEE_MFG_GREEN },
|
||||
{ 0x10b8, "Unknown" }, /**/
|
||||
{ 0x10b9, "Unknown" }, /**/
|
||||
{ 0x10ba, "Unknown" }, /**/
|
||||
{ 0x10bb, "Unknown" }, /**/
|
||||
{ 0x10bc, "Unknown" }, /**/
|
||||
{ 0x10bd, "Unknown" }, /**/
|
||||
{ 0x10be, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_OMRON, ZBEE_MFG_OMRON },
|
||||
{ 0x10c0, "Unknown" }, /**/
|
||||
{ 0x10c1, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_PEEL, ZBEE_MFG_PEEL },
|
||||
{ 0x10c3, "Unknown" }, /**/
|
||||
{ 0x10c4, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_NEC_TOKIN, ZBEE_MFG_NEC_TOKIN },
|
||||
{ ZBEE_MFG_CODE_G4S_JUSTICE,ZBEE_MFG_G4S_JUSTICE },
|
||||
{ 0x10c7, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_ELECTROLUX, ZBEE_MFG_ELECTROLUX },
|
||||
{ 0x10c9, "Unknown" }, /**/
|
||||
{ 0x10ca, "Unknown" }, /**/
|
||||
{ 0x10cb, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_MAINSTREAM, ZBEE_MFG_MAINSTREAM },
|
||||
{ 0x10cd, "Unknown" }, /**/
|
||||
{ 0x10ce, "Unknown" }, /**/
|
||||
{ 0x10cf, "Unknown" }, /**/
|
||||
{ 0x10d0, "Unknown" }, /**/
|
||||
{ 0x10d1, "Unknown" }, /**/
|
||||
{ 0x10d2, "Unknown" }, /**/
|
||||
{ 0x10d3, "Unknown" }, /**/
|
||||
{ 0x10d4, "Unknown" }, /**/
|
||||
{ 0x10d5, "Unknown" }, /**/
|
||||
{ 0x10d6, "Unknown" }, /**/
|
||||
{ 0x10d7, "Unknown" }, /**/
|
||||
{ 0x10d8, "Unknown" }, /**/
|
||||
{ 0x10d9, "Unknown" }, /**/
|
||||
{ 0x10da, "Unknown" }, /**/
|
||||
{ 0x10db, "Unknown" }, /**/
|
||||
{ 0x10dc, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_RADIOCRAFTS,ZBEE_MFG_RADIOCRAFTS },
|
||||
{ 0x10de, "Unknown" }, /**/
|
||||
{ 0x10df, "Unknown" }, /**/
|
||||
{ 0x10e0, "Unknown" }, /**/
|
||||
{ 0x10e1, "Unknown" }, /**/
|
||||
{ 0x10e2, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_HUAWEI_1, ZBEE_MFG_HUAWEI },
|
||||
{ ZBEE_MFG_CODE_HUAWEI_2, ZBEE_MFG_HUAWEI },
|
||||
{ 0x10e5, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_BGLOBAL, ZBEE_MFG_BGLOBAL },
|
||||
{ 0x10e7, "Unknown" }, /**/
|
||||
{ 0x10e8, "Unknown" }, /**/
|
||||
{ 0x10e9, "Unknown" }, /**/
|
||||
{ 0x10ea, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_ABB, ZBEE_MFG_ABB },
|
||||
{ 0x10ec, "Unknown" }, /**/
|
||||
{ ZBEE_MFG_CODE_GENUS, ZBEE_MFG_GENUS },
|
||||
{ 0x10ee, "Unknown" }, /**/
|
||||
{ 0x10ef, "Unknown" }, /**/
|
||||
{ 0x10f0, "Unknown" }, /**/
|
||||
{ 0x10f1, "Unknown" }, /**/
|
||||
{ 0x10f2, "Unknown" }, /**/
|
||||
{ 0x10f3, "Unknown" }, /**/
|
||||
{ 0x10f4, "Unknown" }, /**/
|
||||
{ 0x10f5, "Unknown" }, /**/
|
||||
{ 0x10f6, "Unknown" }, /**/
|
||||
{ 0x10f7, "Unknown" }, /**/
|
||||
{ 0x10f8, "Unknown" }, /**/
|
||||
{ 0x10f9, "Unknown" }, /**/
|
||||
{ 0x10fa, "Unknown" }, /**/
|
||||
{ 0x10fb, "Unknown" }, /**/
|
||||
{ 0x10fc, "Unknown" }, /**/
|
||||
{ 0x10fd, "Unknown" }, /**/
|
||||
{ 0x10fe, "Unknown" }, /**/
|
||||
{ 0x10ff, "Unknown" }, /**/
|
||||
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
#define ZBEE_HAS_2007(x) ((x) >= ZBEE_VERSION_2007)
|
||||
|
||||
/* ZigBee Application Profile IDs */
|
||||
/* Per: 053298r17, July 21 2010 */
|
||||
/* Per: 053298r18, November 2011 */
|
||||
#define ZBEE_DEVICE_PROFILE 0x0000
|
||||
|
||||
#define ZBEE_PROFILE_IPM 0x0101
|
||||
|
|
@ -145,8 +145,8 @@
|
|||
#define ZBEE_PROFILE_TENDRIL_MAX 0xc0fa
|
||||
#define ZBEE_PROFILE_ASSA_MIN 0xc0fb
|
||||
#define ZBEE_PROFILE_ASSA_MAX 0xc104
|
||||
#define ZBEE_PROFILE_DIGI_MIN 0xc105
|
||||
#define ZBEE_PROFILE_DIGI_MAX 0xc10e
|
||||
#define ZBEE_PROFILE_MAXSTREAM_MIN 0xc105
|
||||
#define ZBEE_PROFILE_MAXSTREAM_MAX 0xc10e
|
||||
#define ZBEE_PROFILE_XANADU_MIN 0xc10f
|
||||
#define ZBEE_PROFILE_XANADU_MAX 0xc118
|
||||
#define ZBEE_PROFILE_NEUROCOM_MIN 0xc119
|
||||
|
|
@ -364,6 +364,25 @@
|
|||
#define ZBEE_PROFILE_NAVETAS_MAX 0xc4cf
|
||||
#define ZBEE_PROFILE_ENERNOC_MIN 0xc4d0
|
||||
#define ZBEE_PROFILE_ENERNOC_MAX 0xc4d1
|
||||
#define ZBEE_PROFILE_ELTAV_MIN 0xc4d2
|
||||
#define ZBEE_PROFILE_ELTAV_MAX 0xc4d3
|
||||
#define ZBEE_PROFILE_XSTREAMHD_MIN 0xc4d4
|
||||
#define ZBEE_PROFILE_XSTREAMHD_MAX 0xc4d5
|
||||
#define ZBEE_PROFILE_GREEN_MIN 0xc4d6
|
||||
#define ZBEE_PROFILE_GREEN_MAX 0xc4d7
|
||||
#define ZBEE_PROFILE_OMRON_MIN 0xc4d8
|
||||
#define ZBEE_PROFILE_OMRON_MAX 0xc4d9
|
||||
/**/
|
||||
#define ZBEE_PROFILE_NEC_TOKIN_MIN 0xc4e0
|
||||
#define ZBEE_PROFILE_NEC_TOKIN_MAX 0xc4e1
|
||||
#define ZBEE_PROFILE_PEEL_MIN 0xc4e2
|
||||
#define ZBEE_PROFILE_PEEL_MAX 0xc4e3
|
||||
#define ZBEE_PROFILE_ELECTROLUX_MIN 0xc4e4
|
||||
#define ZBEE_PROFILE_ELECTROLUX_MAX 0xc4e5
|
||||
#define ZBEE_PROFILE_SAMSUNG_MIN 0xc4e6
|
||||
#define ZBEE_PROFILE_SAMSUNG_MAX 0xc4e7
|
||||
#define ZBEE_PROFILE_MAINSTREAM_MIN 0xc4e8
|
||||
#define ZBEE_PROFILE_MAINSTREAM_MAX 0xc4e9
|
||||
|
||||
/* Unallocated Manufacturer IDs */
|
||||
#define ZBEE_PROFILE_UNALLOCATED_MIN 0xc000
|
||||
|
|
@ -411,7 +430,7 @@
|
|||
#define ZBEE_MFG_CODE_YAMATAKE 0x101b
|
||||
#define ZBEE_MFG_CODE_TENDRIL 0x101c
|
||||
#define ZBEE_MFG_CODE_ASSA 0x101d
|
||||
#define ZBEE_MFG_CODE_DIGI 0x101e
|
||||
#define ZBEE_MFG_CODE_MAXSTREAM 0x101e
|
||||
#define ZBEE_MFG_CODE_NEUROCOM 0x101f
|
||||
|
||||
#define ZBEE_MFG_CODE_III 0x1020
|
||||
|
|
@ -515,17 +534,15 @@
|
|||
/**/
|
||||
#define ZBEE_MFG_CODE_CEDO 0x1085
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_DIGI 0x1087
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_A_D 0x1094
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_CARRIER 0x1096
|
||||
#define ZBEE_MFG_CODE_SYCHIP 0x1097
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_PASSIVESYS 0x1099
|
||||
#if 0
|
||||
#define ZBEE_MFG_CODE_G4S_JUSTICE 0x109a conflict!
|
||||
#define ZBEE_MFG_CODE_MMB 0x109a conflict!
|
||||
#endif
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_MMB 0x109a
|
||||
#define ZBEE_MFG_CODE_HOME_AUTO 0x109b
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_SUNRISE 0x10a3
|
||||
|
|
@ -536,6 +553,38 @@
|
|||
#define ZBEE_MFG_CODE_NAVETAS 0x10a9
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_ENERNOC 0x10b2
|
||||
#define ZBEE_MFG_CODE_ELTAV 0x10b3
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_XSTREAMHD 0x10b5
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_GREEN 0x10b7
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_OMRON 0x10bf
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_PEEL 0x10c2
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_NEC_TOKIN 0x10c5
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_G4S_JUSTICE 0x10c6
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_ELECTROLUX 0x10c8
|
||||
/* We surmise this Samsung code, because it's
|
||||
* listed as "0009" in r18, which is obviously
|
||||
* wrong */
|
||||
#define ZBEE_MFG_CODE_SAMSUNG 0x10c9
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_MAINSTREAM 0x10cc
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_RADIOCRAFTS 0x10dd
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_HUAWEI_1 0x10e3
|
||||
#define ZBEE_MFG_CODE_HUAWEI_2 0x10e4
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_BGLOBAL 0x10e6
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_ABB 0x10eb
|
||||
/**/
|
||||
#define ZBEE_MFG_CODE_GENUS 0x10ed
|
||||
|
||||
/* Manufacturer Names */
|
||||
#define ZBEE_MFG_CIRRONET "Cirronet"
|
||||
|
|
@ -569,7 +618,7 @@
|
|||
#define ZBEE_MFG_YAMATAKE "Yamatake"
|
||||
#define ZBEE_MFG_TENDRIL "Tendril"
|
||||
#define ZBEE_MFG_ASSA "Assa Abloy"
|
||||
#define ZBEE_MFG_DIGI "Digi"
|
||||
#define ZBEE_MFG_MAXSTREAM "Maxstream"
|
||||
#define ZBEE_MFG_NEUROCOM "Neurocom"
|
||||
|
||||
#define ZBEE_MFG_III "Institute for Information Industry"
|
||||
|
|
@ -673,6 +722,8 @@
|
|||
/**/
|
||||
#define ZBEE_MFG_CEDO "CEDO"
|
||||
/**/
|
||||
#define ZBEE_MFG_DIGI "Digi"
|
||||
/**/
|
||||
#define ZBEE_MFG_A_D "A&D Co. Ltd."
|
||||
/**/
|
||||
#define ZBEE_MFG_CARRIER "Carrier Electronics"
|
||||
|
|
@ -694,6 +745,33 @@
|
|||
#define ZBEE_MFG_NAVETAS "Navetas"
|
||||
/**/
|
||||
#define ZBEE_MFG_ENERNOC "EnerNOC"
|
||||
#define ZBEE_MFG_ELTAV "Eltav"
|
||||
/**/
|
||||
#define ZBEE_MFG_XSTREAMHD "XStreamHD"
|
||||
/**/
|
||||
#define ZBEE_MFG_GREEN "GreenTrapOnline"
|
||||
/**/
|
||||
#define ZBEE_MFG_OMRON "Omron Corporation"
|
||||
/**/
|
||||
#define ZBEE_MFG_PEEL "Peel Technologies"
|
||||
/**/
|
||||
#define ZBEE_MFG_NEC_TOKIN "NEC TOKIN Corporation"
|
||||
/**/
|
||||
#define ZBEE_MFG_ELECTROLUX "Electrolux Italia S.p.A"
|
||||
/**/
|
||||
#define ZBEE_MFG_SAMSUNG "Samsung Electronics Co., Ltd."
|
||||
/**/
|
||||
#define ZBEE_MFG_MAINSTREAM "Mainstream Engineering"
|
||||
/**/
|
||||
#define ZBEE_MFG_RADIOCRAFTS "Radiocrafts AS"
|
||||
/**/
|
||||
#define ZBEE_MFG_HUAWEI "Huawei Technologies Co., Ltd."
|
||||
/**/
|
||||
#define ZBEE_MFG_BGLOBAL "BGlobal Metering Ltd"
|
||||
/**/
|
||||
#define ZBEE_MFG_ABB "ABB"
|
||||
/**/
|
||||
#define ZBEE_MFG_GENUS "Genus Power Infrastructures Limited"
|
||||
|
||||
/* Protocol Abbreviations */
|
||||
#define ZBEE_PROTOABBREV_NWK "zbee.nwk"
|
||||
|
|
|
|||
Loading…
Reference in New Issue