aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-zbee-nwk-gp.c
diff options
context:
space:
mode:
authordsrsupport <eugene.exarevsky@dsr-company.com>2016-05-11 11:52:51 +0300
committerAnders Broman <a.broman58@gmail.com>2016-05-19 08:42:39 +0000
commita558178874d4b3ff218010bec4bb1f164ab29995 (patch)
tree9e0f46515b7c716cc5e26082caddccc21bfb34cb /epan/dissectors/packet-zbee-nwk-gp.c
parent01830846ef9b81c38482a433cb7471d8c4193d70 (diff)
ZigBee: implemented Green Power ZCL cluster dissector.
Implemented basic Green Power ZCL cluster support and parsing of some GP cluster commands. Implemented following commands parsing: GP_NOTIFICATION GP_COMMISSIONING_NOTIFICATION GP_PAIRING GP_PROXY_COMMISSIONING_MODE GP_RESPONSE That is enough for Green Power Basic Proxy commissioning. Change-Id: Icbe00667a6dfb89346288843ce8fa20d62b822dc Reviewed-on: https://code.wireshark.org/review/15363 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-nwk-gp.c')
-rw-r--r--epan/dissectors/packet-zbee-nwk-gp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c
index 28940d55d1..f1d2ce35ce 100644
--- a/epan/dissectors/packet-zbee-nwk-gp.c
+++ b/epan/dissectors/packet-zbee-nwk-gp.c
@@ -417,11 +417,11 @@ static const value_string zbee_nwk_gp_app_id_names[] = {
VALUE_STRING_ENUM(zbee_nwk_gp_cmd_names);
VALUE_STRING_ARRAY(zbee_nwk_gp_cmd_names);
-static value_string_ext zbee_nwk_gp_cmd_names_ext = VALUE_STRING_EXT_INIT(zbee_nwk_gp_cmd_names);
+value_string_ext zbee_nwk_gp_cmd_names_ext = VALUE_STRING_EXT_INIT(zbee_nwk_gp_cmd_names);
/* Green Power devices. */
-static const value_string zbee_nwk_gp_device_ids_names[] = {
+const value_string zbee_nwk_gp_device_ids_names[] = {
/* GP GENERIC */
{ GPD_DEVICE_ID_GENERIC_GP_SIMPLE_GENERIC_1STATE_SWITCH, "Generic: GP Simple Generic 1-state Switch" },
@@ -959,7 +959,7 @@ dissect_zbee_nwk_gp_cmd_step_up_down(tvbuff_t *tvb, packet_info *pinfo _U_, prot
*@param data raw packet private data.
*@return payload processed offset
*/
-static guint
+static int
dissect_zbee_nwk_gp_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
guint offset = 0;
@@ -1686,6 +1686,7 @@ proto_register_zbee_nwk_gp(void)
/* Register the dissectors. */
register_dissector(ZBEE_PROTOABBREV_NWK_GP, dissect_zbee_nwk_gp, proto_zbee_nwk_gp);
+ register_dissector(ZBEE_PROTOABBREV_NWK_GP_CMD, dissect_zbee_nwk_gp_cmd, proto_zbee_nwk_gp);
} /* proto_register_zbee_nwk_gp */
/**