osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

ZigBee: add new manufacturer codes 

Change-Id: If0a481e4cfe7bd97684522b8ef7e72ea86684851
Reviewed-on: https://code.wireshark.org/review/34882
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Chris Brandson 2019-10-28 20:32:06 -07:00 committed by Anders Broman
parent ddb943bf0e
commit 4d8692fca0
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-zbee-zcl.c
View File

@ -715,6 +715,13 @@ const value_string zbee_mfr_code_names[] = {
{ ZBEE_MFG_CODE_FEELUX_CO_LTD, ZBEE_MFG_FEELUX_CO_LTD },
{ ZBEE_MFG_CODE_SMARTPLUS_INC, ZBEE_MFG_SMARTPLUS_INC },
{ ZBEE_MFG_CODE_HALEMEIER_GMBH, ZBEE_MFG_HALEMEIER_GMBH },
{ ZBEE_MFG_CODE_TRUST_INTL, ZBEE_MFG_TRUST_INTL },
{ ZBEE_MFG_CODE_DUKE_ENERGY, ZBEE_MFG_DUKE_ENERGY },
{ ZBEE_MFG_CODE_CALIX, ZBEE_MFG_CALIX },
{ ZBEE_MFG_CODE_ADEO, ZBEE_MFG_ADEO },
{ ZBEE_MFG_CODE_DATEK_WIRLESS, ZBEE_MFG_DATEK_WIRLESS },
{ ZBEE_MFG_CODE_GEWISS_SPA, ZBEE_MFG_GEWISS_SPA },
{ ZBEE_MFG_CODE_CLIMAX_TECH, ZBEE_MFG_CLIMAX_TECH },
{ 0, NULL }
};
static value_string_ext zbee_mfr_code_names_ext = VALUE_STRING_EXT_INIT(zbee_mfr_code_names);

15
epan/dissectors/packet-zbee.h
View File

@ -967,7 +967,14 @@
#define ZBEE_MFG_CODE_FEELUX_CO_LTD 0x1271
#define ZBEE_MFG_CODE_SMARTPLUS_INC 0x1272
#define ZBEE_MFG_CODE_HALEMEIER_GMBH 0x1273
#define ZBEE_MFG_CODE_TRUST_INTL 0x1274
#define ZBEE_MFG_CODE_DUKE_ENERGY 0x1275
#define ZBEE_MFG_CODE_CALIX 0x1276
#define ZBEE_MFG_CODE_ADEO 0x1277
#define ZBEE_MFG_CODE_DATEK_WIRLESS 0x1337
#define ZBEE_MFG_CODE_GEWISS_SPA 0x1994
#define ZBEE_MFG_CODE_CLIMAX_TECH 0x2794
/* Manufacturer Names */
#define ZBEE_MFG_CIRRONET "Cirronet"
@ -1495,6 +1502,14 @@
#define ZBEE_MFG_FEELUX_CO_LTD "FEELUX Co., Ltd."
#define ZBEE_MFG_SMARTPLUS_INC "SmartPlus Inc."
#define ZBEE_MFG_HALEMEIER_GMBH "Halemeier GmbH"
#define ZBEE_MFG_TRUST_INTL "Trust International BBV"
#define ZBEE_MFG_DUKE_ENERGY "Duke Energy Business Services LLC"
#define ZBEE_MFG_CALIX "Calix, Inc."
#define ZBEE_MFG_ADEO "ADEO"
#define ZBEE_MFG_DATEK_WIRLESS "Datek Wireless AS"
#define ZBEE_MFG_GEWISS_SPA "Gewiss S.p.A."
#define ZBEE_MFG_CLIMAX_TECH "Climax Technology Cp., Ltd."
/* Protocol Abbreviations */
#define ZBEE_PROTOABBREV_NWK "zbee_nwk"