aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-zbee-zdp-discovery.c36
-rw-r--r--epan/dissectors/packet-zbee-zdp.c11
-rw-r--r--epan/dissectors/packet-zbee-zdp.h3
3 files changed, 48 insertions, 2 deletions
diff --git a/epan/dissectors/packet-zbee-zdp-discovery.c b/epan/dissectors/packet-zbee-zdp-discovery.c
index 9f6d6c3a88..6c1f5c882f 100644
--- a/epan/dissectors/packet-zbee-zdp-discovery.c
+++ b/epan/dissectors/packet-zbee-zdp-discovery.c
@@ -320,7 +320,7 @@ dissect_zbee_zdp_parent_annce(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
guint i;
guint64 ext_addr;
- n_children = zbee_parse_uint(tree, hf_zbee_zdp_device, tvb, &offset, (int)1, NULL);
+ n_children = zbee_parse_uint(tree, hf_zbee_zdp_number_of_children, tvb, &offset, (int)1, NULL);
zbee_append_info(tree, pinfo, ", # children %d :", n_children);
for (i = 0 ; i < n_children ; ++i)
{
@@ -335,6 +335,40 @@ dissect_zbee_zdp_parent_annce(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
zdp_dump_excess(tvb, offset, pinfo, tree);
} /* dissect_zbee_zdp_parent_annce */
+
+/**
+ *ZigBee Device Profile dissector for the parent announce rsp
+ *
+ *@param tvb pointer to buffer containing raw packet.
+ *@param pinfo pointer to packet information fields
+ *@param tree pointer to data tree Wireshark uses to display packet.
+*/
+void
+dissect_zbee_zdp_rsp_parent_annce(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ guint offset = 0;
+ guint n_children;
+ guint i;
+ guint64 ext_addr;
+ guint8 status;
+
+ status = zdp_parse_status(tree, tvb, &offset);
+ n_children = zbee_parse_uint(tree, hf_zbee_zdp_number_of_children, tvb, &offset, (int)1, NULL);
+ zbee_append_info(tree, pinfo, ", Status: %s", zdp_status_name(status));
+ zbee_append_info(tree, pinfo, ", # children %d :", n_children);
+ for (i = 0 ; i < n_children ; ++i)
+ {
+ ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, (int)sizeof(guint64), NULL);
+ if (i == 0)
+ {
+ zbee_append_info(tree, pinfo, n_children == 1 ? " %s" : " %s ...", eui64_to_display(wmem_packet_scope(), ext_addr));
+ }
+ }
+
+ /* Dump any leftover bytes. */
+ zdp_dump_excess(tvb, offset, pinfo, tree);
+} /* dissect_zbee_zdp_rsp_parent_annce */
+
/**
*ZigBee Device Profile dissector for the end set user
*
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c
index e36be76c0e..9c8582b4e4 100644
--- a/epan/dissectors/packet-zbee-zdp.c
+++ b/epan/dissectors/packet-zbee-zdp.c
@@ -194,6 +194,7 @@ static int hf_zbee_zdp_scan_channel = -1;
int hf_zbee_zdp_ieee_join_list_start = -1;
int hf_zbee_zdp_ieee_join_list_count = -1;
int hf_zbee_zdp_ieee_join_list_ieee = -1;
+ int hf_zbee_zdp_number_of_children = -1;
/* Routing Table */
int hf_zbee_zdp_rtg = -1;
@@ -202,6 +203,7 @@ static int hf_zbee_zdp_scan_channel = -1;
int hf_zbee_zdp_rtg_next_hop = -1;
int hf_zbee_zdp_rtg_status = -1;
+
/* Subtree indicies. */
static gint ett_zbee_zdp = -1;
gint ett_zbee_zdp_endpoint = -1;
@@ -295,7 +297,7 @@ const value_string zbee_zdp_cluster_names[] = {
{ ZBEE_ZDP_RSP_ACTIVE_EP, "Active Endpoint Response" },
{ ZBEE_ZDP_RSP_MATCH_DESC, "Match Descriptor Response" },
{ ZBEE_ZDP_RSP_COMPLEX_DESC, "Complex Descriptor Response" },
- { ZBEE_ZDP_RSP_USER_DESC, "User Descriptor Request" },
+ { ZBEE_ZDP_RSP_USER_DESC, "User Descriptor Response" },
{ ZBEE_ZDP_RSP_DISCOVERY_CACHE, "Discovery Cache Response" },
{ ZBEE_ZDP_RSP_CONF_USER_DESC, "Set User Descriptor Confirm" },
{ ZBEE_ZDP_RSP_SYSTEM_SERVER_DISC, "Server Discovery Response" },
@@ -308,6 +310,7 @@ const value_string zbee_zdp_cluster_names[] = {
{ ZBEE_ZDP_RSP_FIND_NODE_CACHE, "Find Node Cache Response" },
{ ZBEE_ZDP_RSP_EXT_SIMPLE_DESC, "Extended Simple Descriptor Response" },
{ ZBEE_ZDP_RSP_EXT_ACTIVE_EP, "Extended Active Endpoint Response" },
+ { ZBEE_ZDP_RSP_PARENT_ANNCE, "Parent Announce Response" },
{ ZBEE_ZDP_RSP_END_DEVICE_BIND, "End Device Bind Response" },
{ ZBEE_ZDP_RSP_BIND, "Bind Response" },
{ ZBEE_ZDP_RSP_UNBIND, "Unbind Response" },
@@ -1228,6 +1231,9 @@ dissect_zbee_zdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
case ZBEE_ZDP_RSP_EXT_ACTIVE_EP:
dissect_zbee_zdp_rsp_ext_active_ep(zdp_tvb, pinfo, zdp_tree);
break;
+ case ZBEE_ZDP_RSP_PARENT_ANNCE:
+ dissect_zbee_zdp_rsp_parent_annce(zdp_tvb, pinfo, zdp_tree);
+ break;
case ZBEE_ZDP_RSP_END_DEVICE_BIND:
dissect_zbee_zdp_rsp_end_device_bind(zdp_tvb, pinfo, zdp_tree);
break;
@@ -1821,6 +1827,9 @@ void proto_register_zbee_zdp(void)
{ "IEEE", "zbee_zdp.ieee_joining_list.ieee", FT_EUI64, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
+ { &hf_zbee_zdp_number_of_children,
+ { "NumberOfChildren", "zbee_zdp.n_children", FT_UINT8, BASE_DEC, NULL, 0x0,
+ NULL, HFILL }},
};
/* APS subtrees */
diff --git a/epan/dissectors/packet-zbee-zdp.h b/epan/dissectors/packet-zbee-zdp.h
index b580990909..9f98078391 100644
--- a/epan/dissectors/packet-zbee-zdp.h
+++ b/epan/dissectors/packet-zbee-zdp.h
@@ -96,6 +96,7 @@
#define ZBEE_ZDP_RSP_FIND_NODE_CACHE 0x801c /* ZigBee 2006 & later. */
#define ZBEE_ZDP_RSP_EXT_SIMPLE_DESC 0x801d /* ZigBee 2007 & later. */
#define ZBEE_ZDP_RSP_EXT_ACTIVE_EP 0x801e /* ZigBee 2007 & later. */
+#define ZBEE_ZDP_RSP_PARENT_ANNCE 0x801f /* r21 */
#define ZBEE_ZDP_RSP_END_DEVICE_BIND 0x8020
#define ZBEE_ZDP_RSP_BIND 0x8021
#define ZBEE_ZDP_RSP_UNBIND 0x8022
@@ -292,6 +293,7 @@ extern int hf_zbee_zdp_ieee_join_list_total;
extern int hf_zbee_zdp_ieee_join_list_start;
extern int hf_zbee_zdp_ieee_join_list_count;
extern int hf_zbee_zdp_ieee_join_list_ieee;
+extern int hf_zbee_zdp_number_of_children;
/* Routing Table */
extern int hf_zbee_zdp_rtg;
@@ -358,6 +360,7 @@ extern void dissect_zbee_zdp_req_user_desc (tvbuff_t *tvb, packet_i
extern void dissect_zbee_zdp_req_discovery_cache (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
extern void dissect_zbee_zdp_device_annce (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
extern void dissect_zbee_zdp_parent_annce (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+extern void dissect_zbee_zdp_rsp_parent_annce (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
extern void dissect_zbee_zdp_req_set_user_desc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version);
extern void dissect_zbee_zdp_req_system_server_disc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
extern void dissect_zbee_zdp_req_store_discovery (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 19:38:13 +0000