diff options
Diffstat (limited to 'epan/dissectors/packet-zbee-zdp-discovery.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zdp-discovery.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/epan/dissectors/packet-zbee-zdp-discovery.c b/epan/dissectors/packet-zbee-zdp-discovery.c index 576c57064e..5e366a8475 100644 --- a/epan/dissectors/packet-zbee-zdp-discovery.c +++ b/epan/dissectors/packet-zbee-zdp-discovery.c @@ -33,6 +33,7 @@ #include <glib.h> #include <gmodule.h> #include <epan/packet.h> +#include <epan/addr_resolv.h> #include "packet-zbee.h" #include "packet-zbee-zdp.h" @@ -68,7 +69,7 @@ dissect_zbee_zdp_req_nwk_addr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre req_type = zbee_parse_uint(tree, hf_zbee_zdp_req_type, tvb, &offset, sizeof(guint8), NULL); idx = zbee_parse_uint(tree, hf_zbee_zdp_index, tvb, &offset, sizeof(guint8), NULL); - zbee_append_info(tree, pinfo, ", Device: %s", print_eui64_oui(ext_addr)); + zbee_append_info(tree, pinfo, ", Device: %s", get_eui64_name(ext_addr)); /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); @@ -353,7 +354,7 @@ dissect_zbee_zdp_req_discovery_cache(tvbuff_t *tvb, packet_info *pinfo, proto_tr device = zbee_parse_uint(tree, hf_zbee_zdp_device, tvb, &offset, sizeof(guint16), NULL); ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, sizeof(guint64), NULL); - zbee_append_info(tree, pinfo, ", Device: %s", print_eui64_oui(ext_addr)); + zbee_append_info(tree, pinfo, ", Device: %s", get_eui64_name(ext_addr)); /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); @@ -385,7 +386,7 @@ dissect_zbee_zdp_device_annce(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, sizeof(guint64), NULL); capability = zdp_parse_cinfo(tree, ett_zbee_zdp_cinfo, tvb, &offset); - zbee_append_info(tree, pinfo, ", Device: %s", print_eui64_oui(ext_addr)); + zbee_append_info(tree, pinfo, ", Device: %s", get_eui64_name(ext_addr)); /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); @@ -505,7 +506,7 @@ dissect_zbee_zdp_req_store_discovery(tvbuff_t *tvb, packet_info *pinfo, proto_tr zbee_parse_uint(field_tree, hf_zbee_zdp_disc_simple_size, tvb, &offset, sizeof(guint8), NULL); } - zbee_append_info(tree, pinfo, ", Device: %s", print_eui64_oui(ext_addr)); + zbee_append_info(tree, pinfo, ", Device: %s", get_eui64_name(ext_addr)); /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); @@ -536,7 +537,7 @@ dissect_zbee_zdp_req_store_node_desc(tvbuff_t *tvb, packet_info *pinfo, proto_tr ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, sizeof(guint64), NULL); zdp_parse_node_desc(tree, ett_zbee_zdp_node, tvb, &offset, pinfo); - zbee_append_info(tree, pinfo, ", Device: %s", print_eui64_oui(ext_addr)); + zbee_append_info(tree, pinfo, ", Device: %s", get_eui64_name(ext_addr)); /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); @@ -567,7 +568,7 @@ dissect_zbee_zdp_req_store_power_desc(tvbuff_t *tvb, packet_info *pinfo, proto_t ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, sizeof(guint64), NULL); zdp_parse_power_desc(tree, ett_zbee_zdp_power, tvb, &offset); - zbee_append_info(tree, pinfo, ", Device: %s", print_eui64_oui(ext_addr)); + zbee_append_info(tree, pinfo, ", Device: %s", get_eui64_name(ext_addr)); /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); @@ -611,7 +612,7 @@ dissect_zbee_zdp_req_store_active_ep(tvbuff_t *tvb, packet_info *pinfo, proto_tr (void)zbee_parse_uint(field_tree, hf_zbee_zdp_endpoint, tvb, &offset, sizeof(guint8), NULL); } - zbee_append_info(tree, pinfo, ", Device: %s", print_eui64_oui(ext_addr)); + zbee_append_info(tree, pinfo, ", Device: %s", get_eui64_name(ext_addr)); /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); @@ -644,7 +645,7 @@ dissect_zbee_zdp_req_store_simple_desc(tvbuff_t *tvb, packet_info *pinfo, proto_ simple_len = zbee_parse_uint(tree, hf_zbee_zdp_simple_length, tvb, &offset, sizeof(guint8), NULL); zdp_parse_simple_desc(tree, ett_zbee_zdp_simple, tvb, &offset, pinfo); - zbee_append_info(tree, pinfo, ", Device: %s", print_eui64_oui(ext_addr)); + zbee_append_info(tree, pinfo, ", Device: %s", get_eui64_name(ext_addr)); /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); @@ -674,7 +675,7 @@ dissect_zbee_zdp_req_remove_node_cache(tvbuff_t *tvb, packet_info *pinfo, proto_ device = zbee_parse_uint(tree, hf_zbee_zdp_device, tvb, &offset, sizeof(guint16), NULL); ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, sizeof(guint64), NULL); - zbee_append_info(tree, pinfo, ", Device: %s", print_eui64_oui(ext_addr)); + zbee_append_info(tree, pinfo, ", Device: %s", get_eui64_name(ext_addr)); /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); @@ -704,7 +705,7 @@ dissect_zbee_zdp_req_find_node_cache(tvbuff_t *tvb, packet_info *pinfo, proto_tr device = zbee_parse_uint(tree, hf_zbee_zdp_device, tvb, &offset, sizeof(guint16), NULL); ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, sizeof(guint64), NULL); - zbee_append_info(tree, pinfo, ", Device: %s", print_eui64_oui(ext_addr)); + zbee_append_info(tree, pinfo, ", Device: %s", get_eui64_name(ext_addr)); /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); @@ -824,7 +825,7 @@ dissect_zbee_zdp_rsp_nwk_addr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre zbee_append_info(tree, pinfo, ", Status: %s", zdp_status_name(status)); if (status == ZBEE_ZDP_STATUS_SUCCESS) { - zbee_append_info(tree, pinfo, ", Device: %s = 0x%04x", print_eui64_oui(ext_addr), device); + zbee_append_info(tree, pinfo, ", Device: %s = 0x%04x", get_eui64_name(ext_addr), device); } /* Dump any leftover bytes. */ @@ -879,7 +880,7 @@ dissect_zbee_zdp_rsp_ext_addr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre zbee_append_info(tree, pinfo, ", Status: %s", zdp_status_name(status)); if (status == ZBEE_ZDP_STATUS_SUCCESS) { - zbee_append_info(tree, pinfo, ", Device: 0x%04x = %s", device, print_eui64_oui(ext_addr)); + zbee_append_info(tree, pinfo, ", Device: 0x%04x = %s", device, get_eui64_name(ext_addr)); } /* Dump any leftover bytes. */ |