aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-zdp.c
diff options
context:
space:
mode:
authorPaul Zander <p.j.zander@lighting.com>2019-01-22 08:29:22 +0100
committerAnders Broman <a.broman58@gmail.com>2019-01-23 14:15:13 +0000
commitf3e27b8a3e369f2fb974c59062bdd32bee39aa9f (patch)
tree5b4d76d78231932c7c35b7d39f4af64f819b347e /epan/dissectors/packet-zbee-zdp.c
parentf535a6318b6bd29bcec4a87426c3153ec0188bb3 (diff)
Show manufacturer specific cluster
When the ZCL cluster id is in the range 0xFC00 .. 0xFFFF the cluster is a manufacturer specific cluster. The information shown was 'Unknown' and should be 'Manufacturer Specific'. Change-Id: Id3ae90aea65c6049c38df2029871fdcfc41ce565 Reviewed-on: https://code.wireshark.org/review/31668 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-zdp.c')
-rw-r--r--epan/dissectors/packet-zbee-zdp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c
index 2d2686b0ec..7b9615d83a 100644
--- a/epan/dissectors/packet-zbee-zdp.c
+++ b/epan/dissectors/packet-zbee-zdp.c
@@ -1381,7 +1381,7 @@ void proto_register_zbee_zdp(void)
NULL, HFILL }},
{ &hf_zbee_zdp_addr_mode,
- { "Address Mode", "zbee_zdp.addr_mode", FT_UINT8, BASE_DEC|BASE_RANGE_STRING, RVALS(zbee_zcl_zdp_address_modes), 0x0,
+ { "Address Mode", "zbee_zdp.addr_mode", FT_UINT8, BASE_DEC | BASE_RANGE_STRING, RVALS(zbee_zcl_zdp_address_modes), 0x0,
NULL, HFILL }},
{ &hf_zbee_zdp_cluster,
@@ -1409,11 +1409,11 @@ void proto_register_zbee_zdp(void)
NULL, HFILL }},
{ &hf_zbee_zdp_in_cluster,
- { "Input Cluster", "zbee_zdp.in_cluster", FT_UINT16, BASE_HEX, VALS(zbee_aps_cid_names), 0x0,
+ { "Input Cluster", "zbee_zdp.in_cluster", FT_UINT16, BASE_HEX | BASE_RANGE_STRING, RVALS(zbee_aps_cid_names), 0x0,
NULL, HFILL }},
{ &hf_zbee_zdp_out_cluster,
- { "Output Cluster", "zbee_zdp.out_cluster", FT_UINT16, BASE_HEX, VALS(zbee_aps_cid_names), 0x0,
+ { "Output Cluster", "zbee_zdp.out_cluster", FT_UINT16, BASE_HEX | BASE_RANGE_STRING, RVALS(zbee_aps_cid_names), 0x0,
NULL, HFILL }},
{ &hf_zbee_zdp_assoc_device_count,