diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-04-12 21:16:27 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-04-13 01:01:07 +0000 |
| commit | d7320989a03e3ac5a21bc04a1d471be8584413d0 (patch) | |
| tree | ece3360ad526810456fe38a95fda88b4871d0256 /epan/dissectors/packet-zbee-zcl-ha.c | |
| parent | e5a120a570ae4abbfde6f60bdb719b91625ac5ed (diff) | |
zbee zcl: fix conflicting entry in its value_string
Field 'Command' (zbee_zcl_general.applctrl.execcmd.id) has a conflicting entry in its value_string: 4 is at indices 4 (Start Superfreezing) and 5 (Stop Superfreezing))
Field 'Meter Type ID' (zbee_zcl_ha.metidt.attr.meter_type.id) has a conflicting entry in its value_string: 0 is at indices 0 (Utility Primary Meter) and 2 (Data Quality ID))
Change-Id: I9e92a5c58aea0d6ef00e8d5f61fdfb073b41ee80
Reviewed-on: https://code.wireshark.org/review/21058
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-zbee-zcl-ha.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-ha.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c index 3befb04c31..625fdd9445 100644 --- a/epan/dissectors/packet-zbee-zcl-ha.c +++ b/epan/dissectors/packet-zbee-zcl-ha.c @@ -383,7 +383,7 @@ proto_reg_handoff_zbee_zcl_appl_idt(void) /* Meter Type IDs */ #define ZBEE_ZCL_MET_IDT_MET_TYPE_UTILITY_1_METER 0x0000 /* Utility Primary Meter */ #define ZBEE_ZCL_MET_IDT_MET_TYPE_UTILITY_P_METER 0x0001 /* Utility Production Meter */ -#define ZBEE_ZCL_MET_IDT_MET_TYPE_UTILITY_2_METER 0x0000 /* Utility Secondary Meter */ +#define ZBEE_ZCL_MET_IDT_MET_TYPE_UTILITY_2_METER 0x0002 /* Utility Secondary Meter */ #define ZBEE_ZCL_MET_IDT_MET_TYPE_PRIVATE_1_METER 0x0100 /* Private Primary Meter */ #define ZBEE_ZCL_MET_IDT_MET_TYPE_PRIVATE_P_METER 0x0101 /* Private Primary Meter */ #define ZBEE_ZCL_MET_IDT_MET_TYPE_PRIVATE_2_METER 0x0102 /* Private Primary Meter */ |