diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-10-26 01:50:00 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-10-26 08:50:34 +0000 |
| commit | 458c3c026ed03d17ec7803c61981274ee4574f89 (patch) | |
| tree | 9564e9336b594296e9048893ba917025444f4d52 /epan/proto.c | |
| parent | 0a99d3ef31611db7020d062216c856923ed29fac (diff) | |
Add a ws_in6_addr typedef for struct e_in6_addr.
That allows a parallel typedef of ws_in4_addr for guint32.
Change-Id: I03b230247065e0e3840eb87635315a8e523ef562
Reviewed-on: https://code.wireshark.org/review/24073
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/proto.c b/epan/proto.c index 56fd690594..61a8dc7abf 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -3909,7 +3909,7 @@ proto_tree_set_ipv4(field_info *fi, guint32 value) /* Add a FT_IPv6 to a proto_tree */ proto_item * proto_tree_add_ipv6(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start, - gint length, const struct e_in6_addr *value_ptr) + gint length, const ws_in6_addr *value_ptr) { proto_item *pi; header_field_info *hfinfo; @@ -3929,7 +3929,7 @@ proto_tree_add_ipv6(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start, proto_item * proto_tree_add_ipv6_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start, gint length, - const struct e_in6_addr *value_ptr, + const ws_in6_addr *value_ptr, const char *format, ...) { proto_item *pi; @@ -3948,7 +3948,7 @@ proto_tree_add_ipv6_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb, proto_item * proto_tree_add_ipv6_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start, gint length, - const struct e_in6_addr *value_ptr, + const ws_in6_addr *value_ptr, const char *format, ...) { proto_item *pi; @@ -5623,7 +5623,7 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, guint64 number64; guint8 *bytes; ipv4_addr_and_mask *ipv4; - struct e_in6_addr *ipv6; + ws_in6_addr *ipv6; address addr; guint32 n_addr; /* network-order IPv4 address */ @@ -5952,8 +5952,8 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, break; case FT_IPv6: - ipv6 = (struct e_in6_addr *)fvalue_get(&finfo->value); - set_address (&addr, AT_IPv6, sizeof(struct e_in6_addr), ipv6); + ipv6 = (ws_in6_addr *)fvalue_get(&finfo->value); + set_address (&addr, AT_IPv6, sizeof(ws_in6_addr), ipv6); address_to_str_buf(&addr, result+offset_r, size-offset_r); offset_r = (int)strlen(result); break; |