diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2021-02-17 15:49:59 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-02-18 04:57:40 +0000 |
| commit | 43ffb5436c01dc8efa672a03c21b2f9d79b3d7b0 (patch) | |
| tree | 6bc36254e1a311b29c4d20aa07bc2a4b40e377a1 | |
| parent | e106fa9e74600e7dcd70d100d9598b890b028fcd (diff) | |
btbnep: use the define for ethernet address length
Use FT_ETHER_LEN instead of the numeric value when we parse FT_ETHER items.
| -rw-r--r-- | epan/dissectors/packet-btbnep.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index deb4f3221c..bc1a2796f3 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.c @@ -216,11 +216,11 @@ dissect_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) offset += 2; for (i_item = 0; i_item + 12 > i_item && i_item < list_length; i_item += 12) { - proto_tree_add_item(tree, hf_btbnep_multicast_address_start, tvb, offset, 6, ENC_NA); - offset += 6; + proto_tree_add_item(tree, hf_btbnep_multicast_address_start, tvb, offset, FT_ETHER_LEN, ENC_NA); + offset += FT_ETHER_LEN; - proto_tree_add_item(tree, hf_btbnep_multicast_address_end, tvb, offset, 6, ENC_NA); - offset += 6; + proto_tree_add_item(tree, hf_btbnep_multicast_address_end, tvb, offset, FT_ETHER_LEN, ENC_NA); + offset += FT_ETHER_LEN; } break; case 0x06: /* Filter Multi Addr Response */ @@ -312,28 +312,28 @@ dissect_btbnep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ set_address_tvb(&pinfo->dl_dst, AT_ETHER, 6, tvb, offset); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); - addr_item = proto_tree_add_item(btbnep_tree, hf_btbnep_dst, tvb, offset, 6, ENC_NA); + addr_item = proto_tree_add_item(btbnep_tree, hf_btbnep_dst, tvb, offset, FT_ETHER_LEN, ENC_NA); addr_tree = proto_item_add_subtree(addr_item, ett_addr); - proto_tree_add_item(addr_tree, hf_btbnep_addr, tvb, offset, 6, ENC_NA); + proto_tree_add_item(addr_tree, hf_btbnep_addr, tvb, offset, FT_ETHER_LEN, ENC_NA); proto_tree_add_item(addr_tree, hf_btbnep_lg, tvb, offset, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_btbnep_ig, tvb, offset, 3, ENC_BIG_ENDIAN); - offset += 6; + offset += FT_ETHER_LEN; } if (bnep_type == BNEP_TYPE_GENERAL_ETHERNET || bnep_type == BNEP_TYPE_COMPRESSED_ETHERNET_SOURCE_ONLY) { set_address_tvb(&pinfo->dl_src, AT_ETHER, 6, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->dl_src); - addr_item = proto_tree_add_item(btbnep_tree, hf_btbnep_src, tvb, offset, 6, ENC_NA); + addr_item = proto_tree_add_item(btbnep_tree, hf_btbnep_src, tvb, offset, FT_ETHER_LEN, ENC_NA); addr_tree = proto_item_add_subtree(addr_item, ett_addr); if (tvb_get_guint8(tvb, offset) & 0x01) { expert_add_info(pinfo, addr_item, &ei_btbnep_src_not_group_address); } - proto_tree_add_item(addr_tree, hf_btbnep_addr, tvb, offset, 6, ENC_NA); + proto_tree_add_item(addr_tree, hf_btbnep_addr, tvb, offset, FT_ETHER_LEN, ENC_NA); proto_tree_add_item(addr_tree, hf_btbnep_lg, tvb, offset, 3, ENC_BIG_ENDIAN); proto_tree_add_item(addr_tree, hf_btbnep_ig, tvb, offset, 3, ENC_BIG_ENDIAN); - offset += 6; + offset += FT_ETHER_LEN; } if (bnep_type != BNEP_TYPE_CONTROL) { |