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/addr_and_mask.h | |
| parent | fa7cf8737cd913a3217971d7fa8008efb4f0dd87 (diff) | |
| download | wireshark-32f9f92487f797bcaef6d3cbf92b7fb802a6079e.tar.gz | |
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/addr_and_mask.h')
| -rw-r--r-- | epan/addr_and_mask.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/addr_and_mask.h b/epan/addr_and_mask.h index a0c1369a13..f37ae17d59 100644 --- a/epan/addr_and_mask.h +++ b/epan/addr_and_mask.h @@ -38,10 +38,10 @@ extern "C" { #define PREFIX_LEN_TOO_LONG 1 #define PREFIX_LEN_ZERO 2 -extern int ipv4_addr_and_mask(tvbuff_t *tvb, int offset, guint8 *addr, - guint32 prefix_len); +extern int tvb_get_ipv4_addr_with_prefix_len(tvbuff_t *tvb, int offset, + guint8 *addr, guint32 prefix_len); -extern int ipv6_addr_and_mask(tvbuff_t *tvb, int offset, +extern int tvb_get_ipv6_addr_with_prefix_len(tvbuff_t *tvb, int offset, struct e_in6_addr *addr, guint32 prefix_len); guint32 ip_get_subnet_mask(const guint32 mask_length); |