diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-21 12:04:16 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-22 11:45:56 +0000 |
| commit | 86fe2be4dc2f5f5ff09e0d6c00277d7a9bf09ffd (patch) | |
| tree | 4aca52419f6ee7dc9a58ca8e4cd79fbeaa8d3387 /epan/dissectors/packet-ldp.c | |
| parent | 9eda98dec91931588a003a6f707c4e2097369ba1 (diff) | |
Use address functions instead of ADDRESS macros in asn1 and epan
Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the asn1 and epan directories.
Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4
Reviewed-on: https://code.wireshark.org/review/11200
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ldp.c')
| -rw-r--r-- | epan/dissectors/packet-ldp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 46ac08a862..036ac57d05 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -1042,7 +1042,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre if ( prefix_len % 8 ) addr[ax-1] = addr[ax-1]&(0xFF<<(8-prefix_len%8)); - SET_ADDRESS(&addr_str, addr_type, addr_size, addr); + set_address(&addr_str, addr_type, addr_size, addr); str = address_to_str(wmem_packet_scope(), &addr_str); proto_tree_add_string_format(fec_tree, hf_ldp_tlv_fec_pfval, tvb, offset, prefix_len_octets, str, "Prefix: %s", str); @@ -1115,7 +1115,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre for(ax=0; ax+1 <= host_len; ax++) addr[ax]=tvb_get_guint8(tvb, offset+ax); - SET_ADDRESS(&addr_str, addr_type, addr_size, addr); + set_address(&addr_str, addr_type, addr_size, addr); str = address_to_str(wmem_packet_scope(), &addr_str); proto_tree_add_string_format(fec_tree, hf_ldp_tlv_fec_hoval, tvb, offset, host_len, str, "Address: %s", str); @@ -1403,7 +1403,7 @@ dissect_tlv_address_list(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_ == NULL) break; - SET_ADDRESS(&addr_str, addr_type, addr_size, addr); + set_address(&addr_str, addr_type, addr_size, addr); str = address_to_str(wmem_packet_scope(), &addr_str); proto_tree_add_string_format(val_tree, hf_ldp_tlv_addrl_addr, tvb, offset, addr_size, str, |