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 /wiretap | |
| 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 'wiretap')
| -rw-r--r-- | wiretap/netmon.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap_opttypes.c | 6 | ||||
| -rw-r--r-- | wiretap/wtap_opttypes.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 7015c7669f..3eac8007a8 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -138,7 +138,7 @@ struct netmonrec_comment_header { union ip_address { guint32 ipv4; - struct e_in6_addr ipv6; + ws_in6_addr ipv6; }; struct netmonrec_process_info { diff --git a/wiretap/wtap_opttypes.c b/wiretap/wtap_opttypes.c index 0eff117002..d46eca113c 100644 --- a/wiretap/wtap_opttypes.c +++ b/wiretap/wtap_opttypes.c @@ -583,7 +583,7 @@ wtap_block_get_ipv4_option_value(wtap_block_t block, guint option_id, guint32* v } wtap_opttype_return_val -wtap_block_add_ipv6_option(wtap_block_t block, guint option_id, struct e_in6_addr *value) +wtap_block_add_ipv6_option(wtap_block_t block, guint option_id, ws_in6_addr *value) { wtap_opttype_return_val ret; wtap_option_t *opt; @@ -596,7 +596,7 @@ wtap_block_add_ipv6_option(wtap_block_t block, guint option_id, struct e_in6_add } wtap_opttype_return_val -wtap_block_set_ipv6_option_value(wtap_block_t block, guint option_id, struct e_in6_addr *value) +wtap_block_set_ipv6_option_value(wtap_block_t block, guint option_id, ws_in6_addr *value) { wtap_opttype_return_val ret; wtap_optval_t *optval; @@ -609,7 +609,7 @@ wtap_block_set_ipv6_option_value(wtap_block_t block, guint option_id, struct e_i } wtap_opttype_return_val -wtap_block_get_ipv6_option_value(wtap_block_t block, guint option_id, struct e_in6_addr* value) +wtap_block_get_ipv6_option_value(wtap_block_t block, guint option_id, ws_in6_addr* value) { wtap_opttype_return_val ret; wtap_optval_t *optval; diff --git a/wiretap/wtap_opttypes.h b/wiretap/wtap_opttypes.h index 2b859da7ef..0fce102aa2 100644 --- a/wiretap/wtap_opttypes.h +++ b/wiretap/wtap_opttypes.h @@ -170,7 +170,7 @@ typedef union { guint8 uint8val; guint64 uint64val; guint32 ipv4val; /* network byte order */ - struct e_in6_addr ipv6val; + ws_in6_addr ipv6val; char *stringval; struct wtap_opttype_custom customval; } wtap_optval_t; @@ -339,7 +339,7 @@ wtap_block_get_ipv4_option_value(wtap_block_t block, guint option_id, guint32* v * error code otherwise */ WS_DLL_PUBLIC wtap_opttype_return_val -wtap_block_add_ipv6_option(wtap_block_t block, guint option_id, struct e_in6_addr *value); +wtap_block_add_ipv6_option(wtap_block_t block, guint option_id, ws_in6_addr *value); /** Set IPv6 option value in a block * @@ -350,7 +350,7 @@ wtap_block_add_ipv6_option(wtap_block_t block, guint option_id, struct e_in6_add * error code otherwise */ WS_DLL_PUBLIC wtap_opttype_return_val -wtap_block_set_ipv6_option_value(wtap_block_t block, guint option_id, struct e_in6_addr *value); +wtap_block_set_ipv6_option_value(wtap_block_t block, guint option_id, ws_in6_addr *value); /** Get IPv6 option value from a block * @@ -361,7 +361,7 @@ wtap_block_set_ipv6_option_value(wtap_block_t block, guint option_id, struct e_i * error code otherwise */ WS_DLL_PUBLIC wtap_opttype_return_val -wtap_block_get_ipv6_option_value(wtap_block_t block, guint option_id, struct e_in6_addr* value) G_GNUC_WARN_UNUSED_RESULT; +wtap_block_get_ipv6_option_value(wtap_block_t block, guint option_id, ws_in6_addr* value) G_GNUC_WARN_UNUSED_RESULT; /** Add a string option to a block * |