diff options
Diffstat (limited to 'epan/dissectors/packet-zbee-zdp-binding.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zdp-binding.c | 198 |
1 files changed, 99 insertions, 99 deletions
diff --git a/epan/dissectors/packet-zbee-zdp-binding.c b/epan/dissectors/packet-zbee-zdp-binding.c index bcf8944c..b6559b8c 100644 --- a/epan/dissectors/packet-zbee-zdp-binding.c +++ b/epan/dissectors/packet-zbee-zdp-binding.c @@ -32,13 +32,13 @@ *@param tree pointer to data tree Wireshark uses to display packet. */ void -zdp_parse_bind_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint8 version) +zdp_parse_bind_table_entry(proto_tree *tree, tvbuff_t *tvb, unsigned *offset, uint8_t version) { proto_tree *bind_tree; proto_item *ti; - guint len = 0; + unsigned len = 0; - guint8 mode; + uint8_t mode; /* Add the source address. */ bind_tree = proto_tree_add_subtree(tree, tvb, *offset, 0, ett_zbee_zdp_bind_entry, &ti, "Bind"); @@ -61,7 +61,7 @@ zdp_parse_bind_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint /* Get the destination address mode. */ if (version >= ZBEE_VERSION_2007) { - mode = tvb_get_guint8(tvb, *offset + len); + mode = tvb_get_uint8(tvb, *offset + len); proto_tree_add_item(bind_tree, hf_zbee_zdp_addr_mode, tvb, *offset + len, 1, ENC_LITTLE_ENDIAN); len += 1; } @@ -98,21 +98,21 @@ zdp_parse_bind_table_entry(proto_tree *tree, tvbuff_t *tvb, guint *offset, guint *@param tree pointer to data tree Wireshark uses to display packet. */ void -dissect_zbee_zdp_req_end_device_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version) +dissect_zbee_zdp_req_end_device_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint8_t version) { - guint sizeof_cluster = (version >= ZBEE_VERSION_2007)?(int)sizeof(guint16):(int)sizeof(guint8); - guint i; + unsigned sizeof_cluster = (version >= ZBEE_VERSION_2007)?(int)sizeof(uint16_t):(int)sizeof(uint8_t); + unsigned i; proto_tree *field_tree = NULL; - guint offset = 0; - guint32 target, in_count, out_count; - guint64 ext_addr = 0; + unsigned offset = 0; + uint32_t target, in_count, out_count; + uint64_t ext_addr = 0; proto_tree_add_item_ret_uint(tree, hf_zbee_zdp_target, tvb, offset, 2, ENC_LITTLE_ENDIAN, &target); offset += 2; if (version >= ZBEE_VERSION_2007) { /* Extended address present on ZigBee 2006 & later. */ - ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, (guint)sizeof(guint64), NULL); + ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, (unsigned)sizeof(uint64_t), NULL); } proto_tree_add_item(tree, hf_zbee_zdp_endpoint, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; @@ -156,17 +156,17 @@ dissect_zbee_zdp_req_end_device_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tr *@param tree pointer to data tree Wireshark uses to display packet. */ void -dissect_zbee_zdp_req_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version) +dissect_zbee_zdp_req_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint8_t version) { proto_item *ti; - guint sizeof_cluster = ZBEE_HAS_2006(version)?(int)sizeof(guint16):(int)sizeof(guint8); - guint offset = 0; - guint64 src64; - guint32 cluster, dst_mode, dst; - guint64 dst64 = 0; - /*guint8 dst_ep;*/ - - src64 = zbee_parse_eui64(tree, hf_zbee_zdp_bind_src64, tvb, &offset, (int)sizeof(guint64), NULL); + unsigned sizeof_cluster = ZBEE_HAS_2006(version)?(int)sizeof(uint16_t):(int)sizeof(uint8_t); + unsigned offset = 0; + uint64_t src64; + uint32_t cluster, dst_mode, dst; + uint64_t dst64 = 0; + /*uint8_t dst_ep;*/ + + src64 = zbee_parse_eui64(tree, hf_zbee_zdp_bind_src64, tvb, &offset, (int)sizeof(uint64_t), NULL); proto_tree_add_item(tree, hf_zbee_zdp_bind_src_ep, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; ti = proto_tree_add_item_ret_uint(tree, hf_zbee_zdp_cluster, tvb, offset, sizeof_cluster, ENC_LITTLE_ENDIAN, &cluster); @@ -187,7 +187,7 @@ dissect_zbee_zdp_req_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g offset += 2; } else if (dst_mode == ZBEE_ZDP_ADDR_MODE_UNICAST) { - dst64 = zbee_parse_eui64(tree, hf_zbee_zdp_bind_dst64, tvb, &offset, (int)sizeof(guint64), NULL); + dst64 = zbee_parse_eui64(tree, hf_zbee_zdp_bind_dst64, tvb, &offset, (int)sizeof(uint64_t), NULL); proto_tree_add_item(tree, hf_zbee_zdp_bind_dst_ep, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; } @@ -218,18 +218,18 @@ dissect_zbee_zdp_req_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g *@param tree pointer to data tree Wireshark uses to display packet. */ void -dissect_zbee_zdp_req_unbind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version) +dissect_zbee_zdp_req_unbind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint8_t version) { proto_item *ti; - guint sizeof_cluster = (version >= ZBEE_VERSION_2007)?(int)sizeof(guint16):(int)sizeof(guint8); - guint offset = 0; - guint64 src64; - /*guint8 src_ep;*/ - guint32 cluster, dst_mode, dst = 0; - guint64 dst64 = 0; - /*guint8 dst_ep;*/ - - src64 = zbee_parse_eui64(tree, hf_zbee_zdp_bind_src64, tvb, &offset, (int)sizeof(guint64), NULL); + unsigned sizeof_cluster = (version >= ZBEE_VERSION_2007)?(int)sizeof(uint16_t):(int)sizeof(uint8_t); + unsigned offset = 0; + uint64_t src64; + /*uint8_t src_ep;*/ + uint32_t cluster, dst_mode, dst = 0; + uint64_t dst64 = 0; + /*uint8_t dst_ep;*/ + + src64 = zbee_parse_eui64(tree, hf_zbee_zdp_bind_src64, tvb, &offset, (int)sizeof(uint64_t), NULL); proto_tree_add_item(tree, hf_zbee_zdp_bind_src_ep, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; ti = proto_tree_add_item_ret_uint(tree, hf_zbee_zdp_cluster, tvb, offset, sizeof_cluster, ENC_LITTLE_ENDIAN, &cluster); @@ -250,7 +250,7 @@ dissect_zbee_zdp_req_unbind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 2; } else if (dst_mode == ZBEE_ZDP_ADDR_MODE_UNICAST) { - dst64 = zbee_parse_eui64(tree, hf_zbee_zdp_bind_dst64, tvb, &offset, (int)sizeof(guint64), NULL); + dst64 = zbee_parse_eui64(tree, hf_zbee_zdp_bind_dst64, tvb, &offset, (int)sizeof(uint64_t), NULL); proto_tree_add_item(tree, hf_zbee_zdp_bind_dst_ep, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; } @@ -283,10 +283,10 @@ dissect_zbee_zdp_req_unbind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void dissect_zbee_zdp_req_bind_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - guint64 ext_addr; + unsigned offset = 0; + uint64_t ext_addr; - ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, (int)sizeof(guint64), NULL); + ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, (int)sizeof(uint64_t), NULL); zbee_append_info(tree, pinfo, ", Device: %s", eui64_to_display(pinfo->pool, ext_addr)); @@ -304,14 +304,14 @@ dissect_zbee_zdp_req_bind_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree void dissect_zbee_zdp_req_replace_device(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - guint64 ext_addr; - guint64 new_addr; + unsigned offset = 0; + uint64_t ext_addr; + uint64_t new_addr; - ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, (int)sizeof(guint64), NULL); + ext_addr = zbee_parse_eui64(tree, hf_zbee_zdp_ext_addr, tvb, &offset, (int)sizeof(uint64_t), NULL); proto_tree_add_item(tree, hf_zbee_zdp_endpoint, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; - new_addr = zbee_parse_eui64(tree, hf_zbee_zdp_replacement, tvb, &offset, (int)sizeof(guint64), NULL); + new_addr = zbee_parse_eui64(tree, hf_zbee_zdp_replacement, tvb, &offset, (int)sizeof(uint64_t), NULL); proto_tree_add_item(tree, hf_zbee_zdp_replacement_ep, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; @@ -330,16 +330,16 @@ dissect_zbee_zdp_req_replace_device(tvbuff_t *tvb, packet_info *pinfo, proto_tre *@param tree pointer to data tree Wireshark uses to display packet. */ void -dissect_zbee_zdp_req_store_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version) +dissect_zbee_zdp_req_store_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint8_t version) { proto_item *ti; - guint sizeof_cluster = (version >= ZBEE_VERSION_2007)?(int)sizeof(guint16):(int)sizeof(guint8); - guint offset = 0; - guint64 src64; - guint32 src_ep, cluster, dst_mode; + unsigned sizeof_cluster = (version >= ZBEE_VERSION_2007)?(int)sizeof(uint16_t):(int)sizeof(uint8_t); + unsigned offset = 0; + uint64_t src64; + uint32_t src_ep, cluster, dst_mode; - src64 = zbee_parse_eui64(tree, hf_zbee_zdp_bind_src64, tvb, &offset, (int)sizeof(guint64), NULL); + src64 = zbee_parse_eui64(tree, hf_zbee_zdp_bind_src64, tvb, &offset, (int)sizeof(uint64_t), NULL); proto_tree_add_item_ret_uint(tree, hf_zbee_zdp_bind_src_ep, tvb, offset, 1, ENC_LITTLE_ENDIAN, &src_ep); offset += 1; ti = proto_tree_add_item_ret_uint(tree, hf_zbee_zdp_cluster, tvb, offset, sizeof_cluster, ENC_LITTLE_ENDIAN, &cluster); @@ -353,9 +353,9 @@ dissect_zbee_zdp_req_store_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, pro offset += 2; } else if (dst_mode == ZBEE_ZDP_ADDR_MODE_UNICAST) { - /*guint64 dst64;*/ - /*guint8 dst_ep;*/ - /*dst64 =*/ zbee_parse_eui64(tree, hf_zbee_zdp_bind_dst64, tvb, &offset, (int)sizeof(guint64), NULL); + /*uint64_t dst64;*/ + /*uint8_t dst_ep;*/ + /*dst64 =*/ zbee_parse_eui64(tree, hf_zbee_zdp_bind_dst64, tvb, &offset, (int)sizeof(uint64_t), NULL); proto_tree_add_item(tree, hf_zbee_zdp_bind_dst_ep, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; } @@ -376,16 +376,16 @@ dissect_zbee_zdp_req_store_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, pro *@param tree pointer to data tree Wireshark uses to display packet. */ void -dissect_zbee_zdp_req_remove_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version) +dissect_zbee_zdp_req_remove_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint8_t version) { proto_item *ti; - guint sizeof_cluster = (version >= ZBEE_VERSION_2007)?(int)sizeof(guint16):(int)sizeof(guint8); - guint offset = 0; - guint64 src64; - guint32 src_ep, cluster, dst_mode; + unsigned sizeof_cluster = (version >= ZBEE_VERSION_2007)?(int)sizeof(uint16_t):(int)sizeof(uint8_t); + unsigned offset = 0; + uint64_t src64; + uint32_t src_ep, cluster, dst_mode; - src64 = zbee_parse_eui64(tree, hf_zbee_zdp_bind_src64, tvb, &offset, (int)sizeof(guint64), NULL); + src64 = zbee_parse_eui64(tree, hf_zbee_zdp_bind_src64, tvb, &offset, (int)sizeof(uint64_t), NULL); proto_tree_add_item_ret_uint(tree, hf_zbee_zdp_bind_src_ep, tvb, offset, 1, ENC_LITTLE_ENDIAN, &src_ep); offset += 1; ti = proto_tree_add_item_ret_uint(tree, hf_zbee_zdp_cluster, tvb, offset, sizeof_cluster, ENC_LITTLE_ENDIAN, &cluster); @@ -399,9 +399,9 @@ dissect_zbee_zdp_req_remove_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, pr offset += 2; } else if (dst_mode == ZBEE_ZDP_ADDR_MODE_UNICAST) { - /*guint64 dst64;*/ - /*guint8 dst_ep;*/ - /*dst64 =*/ zbee_parse_eui64(tree, hf_zbee_zdp_bind_dst64, tvb, &offset, (int)sizeof(guint64), NULL); + /*uint64_t dst64;*/ + /*uint8_t dst_ep;*/ + /*dst64 =*/ zbee_parse_eui64(tree, hf_zbee_zdp_bind_dst64, tvb, &offset, (int)sizeof(uint64_t), NULL); proto_tree_add_item(tree, hf_zbee_zdp_bind_dst_ep, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset += 1; } @@ -422,12 +422,12 @@ dissect_zbee_zdp_req_remove_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, pr *@param tree pointer to data tree Wireshark uses to display packet. */ void -dissect_zbee_zdp_req_backup_bind_table(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version) +dissect_zbee_zdp_req_backup_bind_table(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint8_t version) { proto_tree *field_tree; - guint offset = 0; - guint32 i, table_count; + unsigned offset = 0; + uint32_t i, table_count; proto_tree_add_item(tree, hf_zbee_zdp_table_size, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; @@ -456,7 +456,7 @@ dissect_zbee_zdp_req_backup_bind_table(tvbuff_t *tvb, packet_info *pinfo, proto_ void dissect_zbee_zdp_req_recover_bind_table(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; + unsigned offset = 0; proto_tree_add_item(tree, hf_zbee_zdp_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; @@ -477,8 +477,8 @@ dissect_zbee_zdp_req_backup_source_bind(tvbuff_t *tvb, packet_info *pinfo, proto { proto_tree *field_tree; - guint offset = 0; - guint32 i, table_count; + unsigned offset = 0; + uint32_t i, table_count; proto_tree_add_item(tree, hf_zbee_zdp_table_size, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; @@ -487,10 +487,10 @@ dissect_zbee_zdp_req_backup_source_bind(tvbuff_t *tvb, packet_info *pinfo, proto proto_tree_add_item_ret_uint(tree, hf_zbee_zdp_table_count, tvb, offset, 2, ENC_LITTLE_ENDIAN, &table_count); offset += 2; - field_tree = proto_tree_add_subtree(tree, tvb, offset, table_count*(int)sizeof(guint64), + field_tree = proto_tree_add_subtree(tree, tvb, offset, table_count*(int)sizeof(uint64_t), ett_zbee_zdp_bind_source, NULL, "Source Table"); - for (i=0; i<table_count; i++) zbee_parse_eui64(field_tree, hf_zbee_zdp_bind_src64, tvb, &offset, (int)sizeof(guint64), NULL); + for (i=0; i<table_count; i++) zbee_parse_eui64(field_tree, hf_zbee_zdp_bind_src64, tvb, &offset, (int)sizeof(uint64_t), NULL); /* Dump any leftover bytes. */ zdp_dump_excess(tvb, offset, pinfo, tree); @@ -506,7 +506,7 @@ dissect_zbee_zdp_req_backup_source_bind(tvbuff_t *tvb, packet_info *pinfo, proto void dissect_zbee_zdp_req_recover_source_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; + unsigned offset = 0; proto_tree_add_item(tree, hf_zbee_zdp_index, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; @@ -525,7 +525,7 @@ dissect_zbee_zdp_req_recover_source_bind(tvbuff_t *tvb, packet_info *pinfo, prot void dissect_zbee_zdp_req_clear_all_bindings(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; + unsigned offset = 0; offset = dissect_zbee_tlvs(tvb, pinfo, tree, offset, NULL, ZBEE_TLV_SRC_TYPE_ZBEE_ZDP, ZBEE_ZDP_REQ_CLEAR_ALL_BINDINGS); @@ -543,8 +543,8 @@ dissect_zbee_zdp_req_clear_all_bindings(tvbuff_t *tvb, packet_info *pinfo, proto void dissect_zbee_zdp_rsp_clear_all_bindings(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - guint8 status; + unsigned offset = 0; + uint8_t status; status = zdp_parse_status(tree, tvb, &offset); zbee_append_info(tree, pinfo, ", Status: %s", zdp_status_name(status)); @@ -567,8 +567,8 @@ dissect_zbee_zdp_rsp_clear_all_bindings(tvbuff_t *tvb, packet_info *pinfo, proto void dissect_zbee_zdp_rsp_end_device_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - guint8 status; + unsigned offset = 0; + uint8_t status; status = zdp_parse_status(tree, tvb, &offset); @@ -588,8 +588,8 @@ dissect_zbee_zdp_rsp_end_device_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tr void dissect_zbee_zdp_rsp_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - guint8 status; + unsigned offset = 0; + uint8_t status; status = zdp_parse_status(tree, tvb, &offset); @@ -609,8 +609,8 @@ dissect_zbee_zdp_rsp_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void dissect_zbee_zdp_rsp_unbind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - guint8 status; + unsigned offset = 0; + uint8_t status; status = zdp_parse_status(tree, tvb, &offset); @@ -628,13 +628,13 @@ dissect_zbee_zdp_rsp_unbind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) *@param tree pointer to data tree Wireshark uses to display packet. */ void -dissect_zbee_zdp_rsp_bind_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version) +dissect_zbee_zdp_rsp_bind_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint8_t version) { proto_tree *field_tree = NULL; - guint offset = 0; + unsigned offset = 0; - guint8 status; - guint32 i, table_count; + uint8_t status; + uint32_t i, table_count; status = zdp_parse_status(tree, tvb, &offset); @@ -668,8 +668,8 @@ dissect_zbee_zdp_rsp_bind_register(tvbuff_t *tvb, packet_info *pinfo, proto_tree void dissect_zbee_zdp_rsp_replace_device(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - guint8 status; + unsigned offset = 0; + uint8_t status; status = zdp_parse_status(tree, tvb, &offset); @@ -689,8 +689,8 @@ dissect_zbee_zdp_rsp_replace_device(tvbuff_t *tvb, packet_info *pinfo, proto_tre void dissect_zbee_zdp_rsp_store_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - guint8 status; + unsigned offset = 0; + uint8_t status; status = zdp_parse_status(tree, tvb, &offset); @@ -710,8 +710,8 @@ dissect_zbee_zdp_rsp_store_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, pro void dissect_zbee_zdp_rsp_remove_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - guint8 status; + unsigned offset = 0; + uint8_t status; status = zdp_parse_status(tree, tvb, &offset); @@ -731,8 +731,8 @@ dissect_zbee_zdp_rsp_remove_bak_bind_entry(tvbuff_t *tvb, packet_info *pinfo, pr void dissect_zbee_zdp_rsp_backup_bind_table(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - guint8 status; + unsigned offset = 0; + uint8_t status; status = zdp_parse_status(tree, tvb, &offset); if ((status == ZBEE_ZDP_STATUS_SUCCESS) || (tvb_bytes_exist(tvb, offset, 2))) { @@ -754,12 +754,12 @@ dissect_zbee_zdp_rsp_backup_bind_table(tvbuff_t *tvb, packet_info *pinfo, proto_ *@param tree pointer to data tree Wireshark uses to display packet. */ void -dissect_zbee_zdp_rsp_recover_bind_table(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 version) +dissect_zbee_zdp_rsp_recover_bind_table(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint8_t version) { proto_tree *field_tree = NULL; - guint offset = 0; - guint8 status; - guint32 i, table_count; + unsigned offset = 0; + uint8_t status; + uint32_t i, table_count; status = zdp_parse_status(tree, tvb, &offset); if ((status == ZBEE_ZDP_STATUS_SUCCESS) || (tvb_bytes_exist(tvb, offset, 2))) { @@ -794,8 +794,8 @@ dissect_zbee_zdp_rsp_recover_bind_table(tvbuff_t *tvb, packet_info *pinfo, proto void dissect_zbee_zdp_rsp_backup_source_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - guint offset = 0; - guint8 status; + unsigned offset = 0; + uint8_t status; status = zdp_parse_status(tree, tvb, &offset); @@ -816,10 +816,10 @@ void dissect_zbee_zdp_rsp_recover_source_bind(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *field_tree = NULL; - guint offset = 0; + unsigned offset = 0; - guint8 status; - guint32 i, table_count; + uint8_t status; + uint32_t i, table_count; status = zdp_parse_status(tree, tvb, &offset); @@ -832,12 +832,12 @@ dissect_zbee_zdp_rsp_recover_source_bind(tvbuff_t *tvb, packet_info *pinfo, prot offset += 2; if (tree && table_count) { - field_tree = proto_tree_add_subtree(tree, tvb, offset, table_count * (int)sizeof(guint64), + field_tree = proto_tree_add_subtree(tree, tvb, offset, table_count * (int)sizeof(uint64_t), ett_zbee_zdp_bind_source, NULL, "Source Table"); } for (i=0; i<table_count; i++) { - (void)zbee_parse_eui64(field_tree, hf_zbee_zdp_bind_src64, tvb, &offset, (int)sizeof(guint64), NULL); + (void)zbee_parse_eui64(field_tree, hf_zbee_zdp_bind_src64, tvb, &offset, (int)sizeof(uint64_t), NULL); } /* for */ } |