diff options
| author | Chris Brandson <chris.brandson@gmail.com> | 2016-06-17 11:38:15 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-06-18 03:31:02 +0000 |
| commit | a7aaf0ba72ecb1e5e975eabef1ba7ff00f49a198 (patch) | |
| tree | 6320bc96720d6e00999badea6bab091bd47d0e77 /epan | |
| parent | 631b9c43e2ee52b46811fcd37cdcb334648b6445 (diff) | |
ZigBee dissector added support for the Power Negotiation bit
An update to R22 adds the Power Negotiation bit to the Parent
Information of the End Device Timeout Response
Change-Id: I3d423e1088821ccaba98183e2be7f2152bd659d1
Reviewed-on: https://code.wireshark.org/review/16001
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-zbee-nwk.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-zbee-nwk.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 323cff725f..4d0cf00808 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -156,6 +156,7 @@ static int hf_zbee_nwk_cmd_end_device_timeout_resp_status = -1; static int hf_zbee_nwk_cmd_end_device_timeout_resp_parent_info = -1; static int hf_zbee_nwk_cmd_prnt_info_mac_data_poll_keepalive_supported = -1; static int hf_zbee_nwk_cmd_prnt_info_ed_to_req_keepalive_supported = -1; +static int hf_zbee_nwk_cmd_prnt_info_power_negotiation_supported = -1; static int hf_zbee_nwk_cmd_link_pwr_list_count = -1; static int hf_zbee_nwk_cmd_link_pwr_type = -1; static int hf_zbee_nwk_cmd_link_pwr_device_address = -1; @@ -1272,6 +1273,7 @@ dissect_zbee_nwk_ed_timeout_response(tvbuff_t *tvb, packet_info *pinfo, proto_tr static const int * end_device_parent_info[] = { &hf_zbee_nwk_cmd_prnt_info_mac_data_poll_keepalive_supported, &hf_zbee_nwk_cmd_prnt_info_ed_to_req_keepalive_supported, + &hf_zbee_nwk_cmd_prnt_info_power_negotiation_supported, NULL }; guint status = tvb_get_guint8(tvb, offset); @@ -2060,6 +2062,11 @@ void proto_register_zbee_nwk(void) ZBEE_NWK_CMD_ED_TIMEO_RSP_PRNT_INFO_ED_TIMOU_REQ_KEEPAL_SUPP, NULL, HFILL }}, + { &hf_zbee_nwk_cmd_prnt_info_power_negotiation_supported, + { "Power Negotiation Supported", "zbee_nwk.cmd.power_negotiation_supported", FT_BOOLEAN, 8, NULL, + ZBEE_NWK_CMD_ED_TIMEO_RSP_PRNT_INFO_PWR_NEG_SUPP, + NULL, HFILL }}, + { &hf_zbee_nwk_cmd_link_pwr_type, { "Type", "zbee_nwk.cmd.link_pwr_delta.type", FT_UINT8, BASE_HEX, VALS(zbee_nwk_link_power_delta_types), ZBEE_NWK_CMD_NWK_LINK_PWR_DELTA_TYPE_MASK, NULL, HFILL }}, diff --git a/epan/dissectors/packet-zbee-nwk.h b/epan/dissectors/packet-zbee-nwk.h index 82fb1f85e7..e3b0532cef 100644 --- a/epan/dissectors/packet-zbee-nwk.h +++ b/epan/dissectors/packet-zbee-nwk.h @@ -107,6 +107,7 @@ /* ZigBee NWK Values of the Parent Information Bitmask (Table 3.47) */ #define ZBEE_NWK_CMD_ED_TIMEO_RSP_PRNT_INFO_MAC_DATA_POLL_KEEPAL_SUPP 0x01 #define ZBEE_NWK_CMD_ED_TIMEO_RSP_PRNT_INFO_ED_TIMOU_REQ_KEEPAL_SUPP 0x02 +#define ZBEE_NWK_CMD_ED_TIMEO_RSP_PRNT_INFO_PWR_NEG_SUPP 0x04 /* ZigBee NWK Link Power Delta Options */ #define ZBEE_NWK_CMD_NWK_LINK_PWR_DELTA_TYPE_MASK 0x03 |