diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-03 15:05:13 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-04 00:03:34 +0000 |
| commit | 32f9f92487f797bcaef6d3cbf92b7fb802a6079e (patch) | |
| tree | bf558a353d296a429f8bfa50db4d653c40e4bf0b /epan/dissectors/packet-isis-lsp.c | |
| parent | fa7cf8737cd913a3217971d7fa8008efb4f0dd87 (diff) | |
Rename ipv4_addr and ipv6_addr to indicate their full contents.
They're not just addresses, they also include a mask length for IPv4 and
a prefix length for IPv6. Rename them appropriately.
Rename the old ipv4_addr_and_mask() and ipv6_addr_and_mask() to reflect
that 1) they fetch data from a tvbuff and 2) *don't* fetch the mask
length or prefix length, those lengths are passed as arguments to
indicate how many bytes worth of address to fetch.
Change-Id: I4cad5a186ad7bfcb60022a91dbe8bc8479e6471f
Reviewed-on: https://code.wireshark.org/review/13035
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-isis-lsp.c')
| -rw-r--r-- | epan/dissectors/packet-isis-lsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index 2d4d7bac7c..62c7abf825 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -817,7 +817,7 @@ dissect_lsp_ext_ip_reachability_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tre while (length > 0) { ctrl_info = tvb_get_guint8(tvb, offset+4); bit_length = ctrl_info & 0x3f; - byte_length = ipv4_addr_and_mask(tvb, offset+5, prefix, bit_length); + byte_length = tvb_get_ipv4_addr_with_prefix_len(tvb, offset+5, prefix, bit_length); if (byte_length == -1) { proto_tree_add_expert_format(tree, pinfo, &ei_isis_lsp_short_packet, tvb, offset, -1, "IPv4 prefix has an invalid length: %d bits", bit_length ); @@ -1447,7 +1447,7 @@ dissect_lsp_ipv6_reachability_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree while (length > 0) { ctrl_info = tvb_get_guint8(tvb, offset+4); bit_length = tvb_get_guint8(tvb, offset+5); - byte_length = ipv6_addr_and_mask(tvb, offset+6, &prefix, bit_length); + byte_length = tvb_get_ipv6_addr_with_prefix_len(tvb, offset+6, &prefix, bit_length); if (byte_length == -1) { proto_tree_add_expert_format(tree, pinfo, &ei_isis_lsp_short_packet, tvb, offset, -1, "IPv6 prefix has an invalid length: %d bits", bit_length ); |