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/ftypes/ftypes.h | |
| 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/ftypes/ftypes.h')
| -rw-r--r-- | epan/ftypes/ftypes.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h index 60ee74048d..5e363af3ca 100644 --- a/epan/ftypes/ftypes.h +++ b/epan/ftypes/ftypes.h @@ -201,23 +201,23 @@ typedef struct _fvalue_t { ftype_t *ftype; union { /* Put a few basic types in here */ - guint32 uinteger; - gint32 sinteger; - guint64 integer64; - guint64 uinteger64; - gint64 sinteger64; - gdouble floating; - gchar *string; - guchar *ustring; - GByteArray *bytes; - ipv4_addr ipv4; - ipv6_addr ipv6; - e_guid_t guid; - nstime_t time; - tvbuff_t *tvb; - GRegex *re; - guint16 sfloat_ieee_11073; - guint32 float_ieee_11073; + guint32 uinteger; + gint32 sinteger; + guint64 integer64; + guint64 uinteger64; + gint64 sinteger64; + gdouble floating; + gchar *string; + guchar *ustring; + GByteArray *bytes; + ipv4_addr_and_mask ipv4; + ipv6_addr_and_prefix ipv6; + e_guid_t guid; + nstime_t time; + tvbuff_t *tvb; + GRegex *re; + guint16 sfloat_ieee_11073; + guint32 float_ieee_11073; } value; /* The following is provided for private use |