aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-10-26 01:50:00 -0700
committerGuy Harris <guy@alum.mit.edu>2017-10-26 08:50:34 +0000
commit458c3c026ed03d17ec7803c61981274ee4574f89 (patch)
tree9564e9336b594296e9048893ba917025444f4d52
parent0a99d3ef31611db7020d062216c856923ed29fac (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>
-rw-r--r--capchild/capture_ifinfo.c2
-rw-r--r--epan/addr_and_mask.c2
-rw-r--r--epan/addr_and_mask.h2
-rw-r--r--epan/addr_resolv.c34
-rw-r--r--epan/addr_resolv.h6
-rw-r--r--epan/address.h8
-rw-r--r--epan/address_types.c4
-rw-r--r--epan/dissectors/asn1/h225/packet-h225-template.c4
-rw-r--r--epan/dissectors/packet-6lowpan.c16
-rw-r--r--epan/dissectors/packet-6lowpan.h2
-rw-r--r--epan/dissectors/packet-ansi_a.c2
-rw-r--r--epan/dissectors/packet-bgp.c6
-rw-r--r--epan/dissectors/packet-cops.c2
-rw-r--r--epan/dissectors/packet-corosync-totemsrp.c8
-rw-r--r--epan/dissectors/packet-cql.c2
-rw-r--r--epan/dissectors/packet-dcerpc.c2
-rw-r--r--epan/dissectors/packet-dhcpv6.c2
-rw-r--r--epan/dissectors/packet-diameter.c2
-rw-r--r--epan/dissectors/packet-dns.c8
-rw-r--r--epan/dissectors/packet-eigrp.c2
-rw-r--r--epan/dissectors/packet-enip.c2
-rw-r--r--epan/dissectors/packet-fc00.c2
-rw-r--r--epan/dissectors/packet-ftp.c4
-rw-r--r--epan/dissectors/packet-gsm_a_bssmap.c2
-rw-r--r--epan/dissectors/packet-gtp.c4
-rw-r--r--epan/dissectors/packet-h225.c4
-rw-r--r--epan/dissectors/packet-icmpv6.c12
-rw-r--r--epan/dissectors/packet-infiniband.c4
-rw-r--r--epan/dissectors/packet-ipv6.c26
-rw-r--r--epan/dissectors/packet-isis-clv.c2
-rw-r--r--epan/dissectors/packet-isis-lsp.c2
-rw-r--r--epan/dissectors/packet-nfs.c2
-rw-r--r--epan/dissectors/packet-nsip.c2
-rw-r--r--epan/dissectors/packet-ospf.c2
-rw-r--r--epan/dissectors/packet-packetbb.c2
-rw-r--r--epan/dissectors/packet-pim.c2
-rw-r--r--epan/dissectors/packet-ppp.c4
-rw-r--r--epan/dissectors/packet-radius.c2
-rw-r--r--epan/dissectors/packet-rtpproxy.c8
-rw-r--r--epan/dissectors/packet-sap.c2
-rw-r--r--epan/dissectors/packet-sasp.c2
-rw-r--r--epan/dissectors/packet-sdp.c2
-rw-r--r--epan/dissectors/packet-socks.c2
-rw-r--r--epan/dissectors/packet-stun.c4
-rw-r--r--epan/dissectors/packet-thread.c4
-rw-r--r--epan/dissectors/packet-wccp.c8
-rw-r--r--epan/dissectors/packet-wsp.c2
-rw-r--r--epan/dissectors/packet-zebra.c2
-rw-r--r--epan/follow.h2
-rw-r--r--epan/geoip_db.c4
-rw-r--r--epan/geoip_db.h2
-rw-r--r--epan/ipv6.h2
-rw-r--r--epan/proto.c12
-rw-r--r--epan/proto.h6
-rw-r--r--epan/to_str.c2
-rw-r--r--epan/to_str.h2
-rw-r--r--epan/tvbparse.c2
-rw-r--r--epan/tvbuff.c2
-rw-r--r--epan/tvbuff.h2
-rw-r--r--epan/wslua/wslua_address.c2
-rw-r--r--epan/wslua/wslua_capture_info.c2
-rw-r--r--epan/wslua/wslua_tree.c2
-rw-r--r--plugins/wimaxasncp/packet-wimaxasncp.c2
-rw-r--r--sharkd_session.c2
-rw-r--r--text2pcap.c18
-rw-r--r--ui/cli/tap-follow.c2
-rw-r--r--ui/gtk/hostlist_table.c2
-rw-r--r--ui/qt/endpoint_dialog.cpp2
-rw-r--r--ui/traffic_table_ui.c2
-rw-r--r--wiretap/netmon.c2
-rw-r--r--wiretap/wtap_opttypes.c6
-rw-r--r--wiretap/wtap_opttypes.h8
-rw-r--r--wsutil/inet_addr.c2
-rw-r--r--wsutil/inet_addr.h2
-rw-r--r--wsutil/inet_ipv6.h16
75 files changed, 171 insertions, 171 deletions
diff --git a/capchild/capture_ifinfo.c b/capchild/capture_ifinfo.c
index d158cabe81..0fd61a0dba 100644
--- a/capchild/capture_ifinfo.c
+++ b/capchild/capture_ifinfo.c
@@ -184,7 +184,7 @@ capture_interface_list(int *err, char **err_str, void (*update_cb)(void))
if_addr = g_new0(if_addr_t,1);
if (ws_inet_pton4(addr_parts[j], &if_addr->addr.ip4_addr)) {
if_addr->ifat_type = IF_AT_IPv4;
- } else if (ws_inet_pton6(addr_parts[j], (struct e_in6_addr *)&if_addr->addr.ip6_addr)) {
+ } else if (ws_inet_pton6(addr_parts[j], (ws_in6_addr *)&if_addr->addr.ip6_addr)) {
if_addr->ifat_type = IF_AT_IPv6;
} else {
g_free(if_addr);
diff --git a/epan/addr_and_mask.c b/epan/addr_and_mask.c
index c87bfb7c50..3b7a29feb7 100644
--- a/epan/addr_and_mask.c
+++ b/epan/addr_and_mask.c
@@ -73,7 +73,7 @@ tvb_get_ipv4_addr_with_prefix_len(tvbuff_t *tvb, int offset, guint8 *addr,
}
int
-tvb_get_ipv6_addr_with_prefix_len(tvbuff_t *tvb, int offset, struct e_in6_addr *addr,
+tvb_get_ipv6_addr_with_prefix_len(tvbuff_t *tvb, int offset, ws_in6_addr *addr,
guint32 prefix_len)
{
guint32 addr_len;
diff --git a/epan/addr_and_mask.h b/epan/addr_and_mask.h
index f37ae17d59..fd75b42251 100644
--- a/epan/addr_and_mask.h
+++ b/epan/addr_and_mask.h
@@ -42,7 +42,7 @@ extern int tvb_get_ipv4_addr_with_prefix_len(tvbuff_t *tvb, int offset,
guint8 *addr, guint32 prefix_len);
extern int tvb_get_ipv6_addr_with_prefix_len(tvbuff_t *tvb, int offset,
- struct e_in6_addr *addr, guint32 prefix_len);
+ ws_in6_addr *addr, guint32 prefix_len);
guint32 ip_get_subnet_mask(const guint32 mask_length);
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index df7a7ff015..77df65c036 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -226,7 +226,7 @@ typedef struct _resolved_ipv4
typedef struct _resolved_ipv6
{
- struct e_in6_addr ip6_addr;
+ ws_in6_addr ip6_addr;
char name[MAXNAMELEN];
} resolved_ipv6_t;
@@ -282,7 +282,7 @@ static gboolean
ipv6_equal(gconstpointer v1, gconstpointer v2)
{
- if (memcmp(v1, v2, sizeof (struct e_in6_addr)) == 0) {
+ if (memcmp(v1, v2, sizeof (ws_in6_addr)) == 0) {
return TRUE;
}
@@ -339,7 +339,7 @@ typedef struct _async_dns_queue_msg
{
union {
guint32 ip4;
- struct e_in6_addr ip6;
+ ws_in6_addr ip6;
} addr;
int family;
} async_dns_queue_msg_t;
@@ -910,7 +910,7 @@ host_lookup(const guint addr)
/* --------------- */
static hashipv6_t *
-new_ipv6(const struct e_in6_addr *addr)
+new_ipv6(const ws_in6_addr *addr)
{
hashipv6_t *tp = wmem_new(wmem_epan_scope(), hashipv6_t);
memcpy(tp->addr, addr->bytes, sizeof tp->addr);
@@ -922,7 +922,7 @@ new_ipv6(const struct e_in6_addr *addr)
/* ------------------------------------ */
static hashipv6_t *
-host_lookup6(const struct e_in6_addr *addr)
+host_lookup6(const ws_in6_addr *addr)
{
hashipv6_t * volatile tp;
#ifdef HAVE_C_ARES
@@ -935,9 +935,9 @@ host_lookup6(const struct e_in6_addr *addr)
* We don't already have an entry for this host name; create one,
* and then try to resolve it.
*/
- struct e_in6_addr *addr_key;
+ ws_in6_addr *addr_key;
- addr_key = wmem_new(wmem_epan_scope(), struct e_in6_addr);
+ addr_key = wmem_new(wmem_epan_scope(), ws_in6_addr);
tp = new_ipv6(addr);
memcpy(addr_key, addr, 16);
fill_dummy_ip6(tp);
@@ -1938,7 +1938,7 @@ read_hosts_file (const char *hostspath, gboolean store_entries)
gchar *cp;
union {
guint32 ip4_addr;
- struct e_in6_addr ip6_addr;
+ ws_in6_addr ip6_addr;
} host_addr;
gboolean is_ipv6, entry_found = FALSE;
@@ -2013,7 +2013,7 @@ add_ip_name_from_string (const char *addr, const char *name)
{
union {
guint32 ip4_addr;
- struct e_in6_addr ip6_addr;
+ ws_in6_addr ip6_addr;
} host_addr;
gboolean is_ipv6;
resolved_ipv4_t *resolved_ipv4_entry;
@@ -2546,7 +2546,7 @@ host_name_lookup_process(void) {
c_ares_ghba_cb, caqm);
async_dns_in_flight++;
} else if (caqm->family == AF_INET6) {
- ares_gethostbyaddr(ghba_chan, &caqm->addr.ip6, sizeof(struct e_in6_addr),
+ ares_gethostbyaddr(ghba_chan, &caqm->addr.ip6, sizeof(ws_in6_addr),
AF_INET6, c_ares_ghba_cb, caqm);
async_dns_in_flight++;
}
@@ -2619,7 +2619,7 @@ get_hostname(const guint addr)
/* -------------------------- */
const gchar *
-get_hostname6(const struct e_in6_addr *addr)
+get_hostname6(const ws_in6_addr *addr)
{
/* XXX why do we call this if we're not resolving? To create hash entries?
* Why?
@@ -2662,7 +2662,7 @@ add_ipv4_name(const guint addr, const gchar *name)
/* -------------------------- */
void
-add_ipv6_name(const struct e_in6_addr *addrp, const gchar *name)
+add_ipv6_name(const ws_in6_addr *addrp, const gchar *name)
{
hashipv6_t *tp;
@@ -2675,9 +2675,9 @@ add_ipv6_name(const struct e_in6_addr *addrp, const gchar *name)
tp = (hashipv6_t *)wmem_map_lookup(ipv6_hash_table, addrp);
if (!tp) {
- struct e_in6_addr *addr_key;
+ ws_in6_addr *addr_key;
- addr_key = wmem_new(wmem_epan_scope(), struct e_in6_addr);
+ addr_key = wmem_new(wmem_epan_scope(), ws_in6_addr);
tp = new_ipv6(addrp);
memcpy(addr_key, addrp, 16);
wmem_map_insert(ipv6_hash_table, addr_key, tp);
@@ -3179,7 +3179,7 @@ get_host_ipaddr(const char *host, guint32 *addrp)
* return FALSE if we fail.
*/
gboolean
-get_host_ipaddr6(const char *host, struct e_in6_addr *addrp)
+get_host_ipaddr6(const char *host, ws_in6_addr *addrp)
{
#ifdef HAVE_C_ARES
struct timeval tv = { 0, GHI_TIMEOUT }, *tvp;
@@ -3212,7 +3212,7 @@ get_host_ipaddr6(const char *host, struct e_in6_addr *addrp)
if (!async_dns_initialized || name_resolve_concurrency < 1) {
return FALSE;
}
- ahe.addr_size = (int) sizeof (struct e_in6_addr);
+ ahe.addr_size = (int) sizeof (ws_in6_addr);
ahe.copied = 0;
ahe.addrp = addrp;
ares_gethostbyname(ghbn_chan, host, AF_INET6, c_ares_ghi_cb, &ahe);
@@ -3318,7 +3318,7 @@ str_to_ip(const char *str, void *dst)
gboolean
str_to_ip6(const char *str, void *dst)
{
- return ws_inet_pton6(str, (struct e_in6_addr *)dst);
+ return ws_inet_pton6(str, (ws_in6_addr *)dst);
}
/*
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index 8a76e2684c..f9a98b4cbc 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -205,7 +205,7 @@ WS_DLL_PUBLIC gboolean host_name_lookup_process(void);
WS_DLL_PUBLIC const gchar *get_hostname(const guint addr);
/* get_hostname6 returns the host name, or numeric addr if not found */
-WS_DLL_PUBLIC const gchar *get_hostname6(const struct e_in6_addr *ad);
+WS_DLL_PUBLIC const gchar *get_hostname6(const ws_in6_addr *ad);
/* get_ether_name returns the logical name if found in ethers files else
"<vendor>_%02x:%02x:%02x" if the vendor code is known else
@@ -281,7 +281,7 @@ WS_DLL_PUBLIC char* get_hash_manuf_resolved_name(hashmanuf_t* manuf);
WS_DLL_PUBLIC void add_ipv4_name(const guint addr, const gchar *name);
/* adds a hostname/IPv6 in the hash table */
-WS_DLL_PUBLIC void add_ipv6_name(const struct e_in6_addr *addr, const gchar *name);
+WS_DLL_PUBLIC void add_ipv6_name(const ws_in6_addr *addr, const gchar *name);
/** Add an additional "hosts" file for IPv4 and IPv6 name resolution.
*
@@ -335,7 +335,7 @@ gboolean get_host_ipaddr(const char *host, guint32 *addrp);
* @return TRUE on success, FALSE on failure or timeout.
*/
WS_DLL_PUBLIC
-gboolean get_host_ipaddr6(const char *host, struct e_in6_addr *addrp);
+gboolean get_host_ipaddr6(const char *host, ws_in6_addr *addrp);
WS_DLL_PUBLIC
wmem_map_t *get_manuf_hashtable(void);
diff --git a/epan/address.h b/epan/address.h
index 05c6a0909f..b8bcb2944a 100644
--- a/epan/address.h
+++ b/epan/address.h
@@ -82,7 +82,7 @@ clear_address(address *addr)
* @param addr [in,out] The address to initialize.
* @param addr_type [in] Address type.
* @param addr_len [in] The length in bytes of the address data. For example, 4 for
- * AT_IPv4 or sizeof(struct e_in6_addr) for AT_IPv6.
+ * AT_IPv4 or sizeof(ws_in6_addr) for AT_IPv6.
* @param addr_data [in] Pointer to the address data.
*/
static inline void
@@ -115,7 +115,7 @@ set_address(address *addr, int addr_type, int addr_len, const void *addr_data) {
* @param tvb [in] Pointer to the TVB.
* @param offset [in] Offset within the TVB.
* @param addr_len [in] The length in bytes of the address data. For example, 4 for
- * AT_IPv4 or sizeof(struct e_in6_addr) for AT_IPv6.
+ * AT_IPv4 or sizeof(ws_in6_addr) for AT_IPv6.
*/
static inline void
set_address_tvb(address *addr, int addr_type, int addr_len, tvbuff_t *tvb, int offset) {
@@ -137,7 +137,7 @@ set_address_tvb(address *addr, int addr_type, int addr_len, tvbuff_t *tvb, int o
* @param addr [in,out] The address to initialize.
* @param addr_type [in] Address type.
* @param addr_len [in] The length in bytes of the address data. For example, 4 for
- * AT_IPv4 or sizeof(struct e_in6_addr) for AT_IPv6.
+ * AT_IPv4 or sizeof(ws_in6_addr) for AT_IPv6.
* @param addr_data [in] Pointer to the address data.
*/
static inline void
@@ -168,7 +168,7 @@ alloc_address_wmem(wmem_allocator_t *scope, address *addr,
* @param addr [in,out] The address to initialize.
* @param addr_type [in] Address type.
* @param addr_len [in] The length in bytes of the address data. For example, 4 for
- * AT_IPv4 or sizeof(struct e_in6_addr) for AT_IPv6.
+ * AT_IPv4 or sizeof(ws_in6_addr) for AT_IPv6.
* @param tvb [in] Pointer to the TVB.
* @param offset [in] Offset within the TVB.
*/
diff --git a/epan/address_types.c b/epan/address_types.c
index 2441e278a4..d6be4e63cf 100644
--- a/epan/address_types.c
+++ b/epan/address_types.c
@@ -247,7 +247,7 @@ static int ipv4_name_res_len(void)
******************************************************************************/
static int ipv6_to_str(const address* addr, gchar *buf, int buf_len)
{
- ip6_to_str_buf((const struct e_in6_addr *)addr->data, buf, buf_len);
+ ip6_to_str_buf((const ws_in6_addr *)addr->data, buf, buf_len);
return (int)(strlen(buf)+1);
}
@@ -271,7 +271,7 @@ static int ipv6_len(void)
static const gchar* ipv6_name_res_str(const address* addr)
{
- struct e_in6_addr ip6_addr;
+ ws_in6_addr ip6_addr;
memcpy(&ip6_addr.bytes, addr->data, sizeof ip6_addr.bytes);
return get_hostname6(&ip6_addr);
}
diff --git a/epan/dissectors/asn1/h225/packet-h225-template.c b/epan/dissectors/asn1/h225/packet-h225-template.c
index 782d86007f..4299246da4 100644
--- a/epan/dissectors/asn1/h225/packet-h225-template.c
+++ b/epan/dissectors/asn1/h225/packet-h225-template.c
@@ -138,8 +138,8 @@ static gboolean h225_tp_in_tree = TRUE;
/* Global variables */
static guint32 ipv4_address;
-static struct e_in6_addr ipv6_address;
-static struct e_in6_addr ipv6_address_zeros = {{0}};
+static ws_in6_addr ipv6_address;
+static ws_in6_addr ipv6_address_zeros = {{0}};
static guint32 ip_port;
static gboolean contains_faststart = FALSE;
static e_guid_t *call_id_guid;
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c
index f9774f2879..bf6a9d3f6b 100644
--- a/epan/dissectors/packet-6lowpan.c
+++ b/epan/dissectors/packet-6lowpan.c
@@ -548,7 +548,7 @@ typedef struct {
typedef struct {
guint frame; /* Frame where the context was discovered. */
guint8 plen; /* Prefix length. */
- struct e_in6_addr prefix; /* Compression context. */
+ ws_in6_addr prefix; /* Compression context. */
} lowpan_context_data;
/* 6LoWPAN contexts. */
@@ -733,7 +733,7 @@ lowpan_context_find(guint8 cid, guint16 pan)
*---------------------------------------------------------------
*/
void
-lowpan_context_insert(guint8 cid, guint16 pan, guint8 plen, struct e_in6_addr *prefix, guint frame)
+lowpan_context_insert(guint8 cid, guint16 pan, guint8 plen, ws_in6_addr *prefix, guint frame)
{
lowpan_context_key key;
lowpan_context_data *data;
@@ -762,7 +762,7 @@ lowpan_context_insert(guint8 cid, guint16 pan, guint8 plen, struct e_in6_addr *p
data = wmem_new(NULL, lowpan_context_data);
data->frame = frame;
data->plen = plen;
- memset(&data->prefix, 0, sizeof(struct e_in6_addr)); /* Ensure zero paddeding */
+ memset(&data->prefix, 0, sizeof(ws_in6_addr)); /* Ensure zero paddeding */
lowpan_pfxcpy(&data->prefix, prefix, plen);
g_hash_table_insert(lowpan_context_table, pkey, data);
} /* lowpan_context_insert */
@@ -2498,16 +2498,16 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi
if ((udp_flags & LOWPAN_NHC_UDP_CHECKSUM) && tvb_bytes_exist(tvb, offset, length)) {
vec_t cksum_vec[3];
struct {
- struct e_in6_addr src;
- struct e_in6_addr dst;
+ ws_in6_addr src;
+ ws_in6_addr dst;
guint32 length;
guint8 zero[3];
guint8 proto;
} cksum_phdr;
/* Fill in the pseudo-header. */
- memcpy(&cksum_phdr.src, pinfo->src.data, sizeof(struct e_in6_addr));
- memcpy(&cksum_phdr.dst, pinfo->dst.data, sizeof(struct e_in6_addr));
+ memcpy(&cksum_phdr.src, pinfo->src.data, sizeof(ws_in6_addr));
+ memcpy(&cksum_phdr.dst, pinfo->dst.data, sizeof(ws_in6_addr));
cksum_phdr.length = g_htonl(length + (int)sizeof(struct udp_hdr));
memset(cksum_phdr.zero, 0, sizeof(cksum_phdr.zero));
cksum_phdr.proto = IP_PROTO_UDP;
@@ -3381,7 +3381,7 @@ void
prefs_6lowpan_apply(void)
{
int i;
- struct e_in6_addr prefix;
+ ws_in6_addr prefix;
gchar *prefix_str;
gchar *prefix_len_str;
guint32 prefix_len;
diff --git a/epan/dissectors/packet-6lowpan.h b/epan/dissectors/packet-6lowpan.h
index 35c96b4030..afae06f9b7 100644
--- a/epan/dissectors/packet-6lowpan.h
+++ b/epan/dissectors/packet-6lowpan.h
@@ -24,6 +24,6 @@
* discovery protocol, so the ICMPv6 dissector needs to call this routine.
*/
extern void lowpan_context_insert(guint8 cid, guint16 pan, guint8 plen,
- struct e_in6_addr *prefix, guint frame);
+ ws_in6_addr *prefix, guint frame);
#endif /* __PACKET_6LOWPAN_H__ */
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index 37823d85fb..0301a00846 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -1405,7 +1405,7 @@ typedef struct ansi_a_shared_data_t
address rtp_src_addr;
guint32 rtp_ipv4_addr;
- struct e_in6_addr rtp_ipv6_addr;
+ ws_in6_addr rtp_ipv6_addr;
guint16 rtp_port;
gboolean meid_configured;
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index 29b903ac46..c83649aaf6 100644
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -2326,7 +2326,7 @@ decode_prefix6(proto_tree *tree, packet_info *pinfo, int hf_addr, tvbuff_t *tvb,
guint16 tlen, const char *tag)
{
proto_tree *prefix_tree;
- struct e_in6_addr addr; /* IPv6 address */
+ ws_in6_addr addr; /* IPv6 address */
address addr_str;
int plen; /* prefix length */
int length; /* number of octets needed for prefix */
@@ -2356,7 +2356,7 @@ decode_fspec_match_prefix6(proto_tree *tree, proto_item *parent_item, int hf_add
tvbuff_t *tvb, gint offset, guint16 tlen, packet_info *pinfo)
{
proto_tree *prefix_tree;
- struct e_in6_addr addr; /* IPv6 address */
+ ws_in6_addr addr; /* IPv6 address */
address addr_str;
int plen; /* prefix length */
int length; /* number of octets needed for prefix */
@@ -4910,7 +4910,7 @@ decode_prefix_MP(proto_tree *tree, int hf_addr4, int hf_addr6,
guint32 addr;
} ip4addr; /* IPv4 address */
address addr;
- struct e_in6_addr ip6addr; /* IPv6 address */
+ ws_in6_addr ip6addr; /* IPv6 address */
guint16 rd_type; /* Route Distinguisher type */
guint16 nlri_type; /* NLRI Type */
guint16 tmp16;
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index 5cb4ef941b..e8a73c2f93 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -1330,7 +1330,7 @@ static void dissect_cops_object_data(tvbuff_t *tvb, packet_info *pinfo, guint32
guint16 r_type, m_type, reason, reason_sub, cmd_code, cmd_flags, error, error_sub,
tcp_port, katimer, accttimer;
guint32 ifindex;
- struct e_in6_addr ipv6addr;
+ ws_in6_addr ipv6addr;
oid_info_t* oid_info = NULL;
guint32* pprid_subids = NULL;
guint pprid_subids_len = 0;
diff --git a/epan/dissectors/packet-corosync-totemsrp.c b/epan/dissectors/packet-corosync-totemsrp.c
index b50db3ef68..ee726abfd3 100644
--- a/epan/dissectors/packet-corosync-totemsrp.c
+++ b/epan/dissectors/packet-corosync-totemsrp.c
@@ -279,21 +279,21 @@ dissect_corosync_totemsrp_ip_address(tvbuff_t *tvb,
case LINUX_AF_INET6:
case SOLARIS_AF_INET6:
case WINSOCK_AF_INET6:
- len = sizeof(struct e_in6_addr);
+ len = sizeof(ws_in6_addr);
proto_tree_add_item(tree, hf_corosync_totemsrp_ip_address_addr6, tvb, offset, len, ENC_NA);
break;
default:
- len = sizeof(struct e_in6_addr);
+ len = sizeof(ws_in6_addr);
proto_tree_add_item(tree, hf_corosync_totemsrp_ip_address_addr, tvb, offset, len, ENC_NA);
break;
}
offset += len;
- if (len != sizeof(struct e_in6_addr)) {
+ if (len != sizeof(ws_in6_addr)) {
gint padding_len;
- padding_len = (gint)(sizeof(struct e_in6_addr) - len);
+ padding_len = (gint)(sizeof(ws_in6_addr) - len);
proto_tree_add_item (tree, hf_corosync_totemsrp_ip_address_addr4_padding,
tvb, offset, padding_len, ENC_NA);
offset += padding_len;
diff --git a/epan/dissectors/packet-cql.c b/epan/dissectors/packet-cql.c
index 5f61007206..8966b5da76 100644
--- a/epan/dissectors/packet-cql.c
+++ b/epan/dissectors/packet-cql.c
@@ -702,7 +702,7 @@ static int parse_value(proto_tree* columns_subtree, packet_info *pinfo, tvbuff_t
gint32 j = 0;
gint offset_metadata_backup = 0;
guint32 addr4;
- struct e_in6_addr addr6;
+ ws_in6_addr addr6;
guint32 port_number;
proto_tree_add_item_ret_int(columns_subtree, hf_cql_bytes_length, tvb, offset, 4, ENC_BIG_ENDIAN, &bytes_length);
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index d958bbcc9e..b8b5296c3b 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -5158,7 +5158,7 @@ dissect_dcerpc_cn_rts(tvbuff_t *tvb, gint offset, packet_info *pinfo,
offset += 4;
} break;
case RTS_IPV6: {
- struct e_in6_addr addr6;
+ ws_in6_addr addr6;
tvb_get_ipv6(tvb, offset, &addr6);
proto_tree_add_ipv6_format_value(cn_rts_command_tree, hf_dcerpc_cmd_client_ipv6, tvb, offset, 16, &addr6, "%s", get_hostname6(&addr6));
offset += 16;
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index be669d81c2..173521ad6e 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -2329,7 +2329,7 @@ static int dissect_dhcpv6_s46_ipv6_prefix(tvbuff_t *tvb, int hf, int offset, int
{
int bytes_to_process;
- struct e_in6_addr prefix;
+ ws_in6_addr prefix;
bytes_to_process = (((prefix_length + 7) & 0xf8) >> 3);
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index 2c0a10ad02..b8e965796d 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -523,7 +523,7 @@ dissect_diameter_base_framed_ipv6_prefix(tvbuff_t *tvb, packet_info *pinfo, prot
if (prefix_len_bytes == 16) {
proto_tree_add_item(tree, hf_framed_ipv6_prefix_ipv6, tvb, 2, prefix_len_bytes, ENC_NA);
} else if (prefix_len_bytes < 16) {
- struct e_in6_addr value;
+ ws_in6_addr value;
address addr;
memset(&value.bytes, 0, sizeof(value));
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 776a78ea38..2b184e2193 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -2387,7 +2387,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
if (gbl_resolv_flags.dns_pkt_addr_resolution && (dns_class & 0x7f) == C_IN &&
!PINFO_FD_VISITED(pinfo)) {
- struct e_in6_addr addr_in6;
+ ws_in6_addr addr_in6;
tvb_memcpy(tvb, &addr_in6, cur_offset, sizeof(addr_in6));
add_ipv6_name(&addr_in6, name);
}
@@ -2588,7 +2588,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
int pname_len;
int a6_offset;
int suf_offset;
- struct e_in6_addr suffix;
+ ws_in6_addr suffix;
address suffix_addr;
a6_offset = cur_offset;
@@ -2749,7 +2749,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
case AFNUM_INET6:
{
proto_tree_add_ipv6(rropt_tree, hf_dns_opt_client_addr6, tvb,
- cur_offset, addr_len, (struct e_in6_addr *)&ip_addr);
+ cur_offset, addr_len, (ws_in6_addr *)&ip_addr);
}
break;
@@ -2848,7 +2848,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
} else if (afamily == AFNUM_INET6 && afdpart_len <= 16) {
addr_copy = (guint8 *)wmem_alloc0(wmem_packet_scope(), 16);
tvb_memcpy(tvb, (guint8 *)addr_copy, cur_offset, afdpart_len);
- proto_tree_add_ipv6(rr_tree, hf_dns_apl_afdpart_ipv6, tvb, cur_offset, afdpart_len, (struct e_in6_addr *)addr_copy);
+ proto_tree_add_ipv6(rr_tree, hf_dns_apl_afdpart_ipv6, tvb, cur_offset, afdpart_len, (ws_in6_addr *)addr_copy);
} else { /* Other... */
proto_tree_add_item(rr_tree, hf_dns_apl_afdpart_data, tvb, cur_offset, afdpart_len, ENC_NA);
}
diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c
index 0685b40eae..adaabd734c 100644
--- a/epan/dissectors/packet-eigrp.c
+++ b/epan/dissectors/packet-eigrp.c
@@ -1164,7 +1164,7 @@ dissect_eigrp_ipv6_addrs (proto_item *ti, proto_tree *tree, tvbuff_t *tvb,
{
guint8 length;
int addr_len;
- struct e_in6_addr addr;
+ ws_in6_addr addr;
address addr_str;
proto_item *ti_prefixlen, *ti_dst;
int first = TRUE;
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index f6e8f57166..0b1515a4ba 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -1062,7 +1062,7 @@ enip_open_cip_connection( packet_info *pinfo, cip_conn_info_t* connInfo)
conversation_t *conversation, *conversationTO;
enip_conv_info_t *enip_info;
address dest_address;
- struct e_in6_addr ipv6_zero;
+ ws_in6_addr ipv6_zero;
if (pinfo->fd->flags.visited)
return;
diff --git a/epan/dissectors/packet-fc00.c b/epan/dissectors/packet-fc00.c
index 5ea01b9d8c..67c86cd63b 100644
--- a/epan/dissectors/packet-fc00.c
+++ b/epan/dissectors/packet-fc00.c
@@ -163,7 +163,7 @@ dissect_cryptoauth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
key_tree = proto_item_add_subtree(ti, ett_fc00_key);
- proto_tree_add_ipv6(key_tree, hf_fc00_ip_address, tvb, PUBLIC_KEY_OFF, PUBLIC_KEY_LEN, (struct e_in6_addr*)ip_buf);
+ proto_tree_add_ipv6(key_tree, hf_fc00_ip_address, tvb, PUBLIC_KEY_OFF, PUBLIC_KEY_LEN, (ws_in6_addr*)ip_buf);
}
#else
proto_tree_add_expert(fc00_tree, pinfo, &ei_fc00_chksum_unsupported, tvb, PUBLIC_KEY_OFF, PUBLIC_KEY_LEN);
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c
index 5be912421d..3056afd585 100644
--- a/epan/dissectors/packet-ftp.c
+++ b/epan/dissectors/packet-ftp.c
@@ -1157,7 +1157,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
}
else if (eprt_af == EPRT_AF_IPv6) {
proto_tree_add_ipv6(reqresp_tree, hf_ftp_eprt_ipv6,
- tvb, eprt_offset, eprt_ip_len, (const struct e_in6_addr *)eprt_ipv6);
+ tvb, eprt_offset, eprt_ip_len, (const ws_in6_addr *)eprt_ipv6);
set_address(&ftp_ip_address, AT_IPv6, 16, eprt_ipv6);
}
eprt_offset += eprt_ip_len + 1; /* addr, 3rd delimiter */
@@ -1199,7 +1199,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
else if (ftp_ip_address.type == AT_IPv6) {
addr_it = proto_tree_add_ipv6(reqresp_tree,
hf_ftp_epsv_ipv6, tvb, 0, 0,
- (const struct e_in6_addr *)ftp_ip_address.data);
+ (const ws_in6_addr *)ftp_ip_address.data);
PROTO_ITEM_SET_GENERATED(addr_it);
}
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index 8ab732fc0c..5f3c305097 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -3658,7 +3658,7 @@ be_aoip_trans_lay_add(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint
guint32 rtp_ipv4_address;
guint16 rtp_port;
address rtp_dst_addr;
- struct e_in6_addr rtp_addr_ipv6;
+ ws_in6_addr rtp_addr_ipv6;
curr_offset = offset;
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index a061851de8..4efc098a42 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -4324,8 +4324,8 @@ decode_gtp_user_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_
break;
case 0x8d:
if (length == 6) {
- struct e_in6_addr ipv6;
- memset(&ipv6, 0, sizeof(struct e_in6_addr));
+ ws_in6_addr ipv6;
+ memset(&ipv6, 0, sizeof(ws_in6_addr));
proto_tree_add_item(ext_tree_user, hf_gtp_user_ipv4, tvb, offset + 5, 4, ENC_BIG_ENDIAN);
proto_tree_add_ipv6_format_value(ext_tree_user, hf_gtp_user_ipv6, tvb, offset + 9, 0, &ipv6, "dynamic");
proto_item_append_text(te, " : %s / dynamic", tvb_ip_to_str(tvb, offset + 5));
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index b9ea301116..d0adb1481b 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -1166,8 +1166,8 @@ static gboolean h225_tp_in_tree = TRUE;
/* Global variables */
static guint32 ipv4_address;
-static struct e_in6_addr ipv6_address;
-static struct e_in6_addr ipv6_address_zeros = {{0}};
+static ws_in6_addr ipv6_address;
+static ws_in6_addr ipv6_address_zeros = {{0}};
static guint32 ip_port;
static gboolean contains_faststart = FALSE;
static e_guid_t *call_id_guid;
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 5a948727c1..a6c6baefee 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -1437,7 +1437,7 @@ static icmp_transaction_t *transaction_start(packet_info *pinfo, proto_tree *tre
if (icmpv6_trans == NULL) {
if (pinfo->dst.type == AT_IPv6 &&
- in6_is_addr_multicast((const struct e_in6_addr *)pinfo->dst.data)) {
+ in6_is_addr_multicast((const ws_in6_addr *)pinfo->dst.data)) {
/* XXX We should support multicast echo requests, but we don't currently */
/* Note the multicast destination and skip transaction tracking */
col_append_str(pinfo->cinfo, COL_INFO, " (multicast)");
@@ -2081,7 +2081,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
/* RFC 4191 */
guint8 prefix_len;
guint8 route_preference;
- struct e_in6_addr prefix;
+ ws_in6_addr prefix;
address prefix_addr;
static const int * route_flags[] = {
&hf_icmpv6_opt_route_info_flag_route_preference,
@@ -2359,7 +2359,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
/* 6lowpan-ND */
guint8 context_id;
guint8 context_len;
- struct e_in6_addr context_prefix;
+ ws_in6_addr context_prefix;
address context_prefix_addr;
static const int * _6lowpan_context_flags[] = {
&hf_icmpv6_opt_6co_flag_c,
@@ -2685,7 +2685,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
}
case RPL_OPT_ROUTING: {
guint8 prefix_len;
- struct e_in6_addr prefix;
+ ws_in6_addr prefix;
address prefix_addr;
static const int * rpl_flags[] = {
&hf_icmpv6_rpl_opt_route_pref,
@@ -2782,7 +2782,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
}
case RPL_OPT_TARGET: {
guint8 prefix_len;
- struct e_in6_addr target_prefix;
+ ws_in6_addr target_prefix;
address target_prefix_addr;
/* Flag */
@@ -3021,7 +3021,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
while (num_of_addr--) {
memset(addr, 0, sizeof(addr));
tvb_memcpy(tvb, addr + compr, opt_offset, addr_len);
- proto_tree_add_ipv6(flag_tree, hf_icmpv6_rpl_opt_route_discovery_addr_vec_addr, tvb, opt_offset, addr_len, (struct e_in6_addr *)addr);
+ proto_tree_add_ipv6(flag_tree, hf_icmpv6_rpl_opt_route_discovery_addr_vec_addr, tvb, opt_offset, addr_len, (ws_in6_addr *)addr);
opt_offset += addr_len;
}
diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c
index 68a5ed4f1c..681334f7e4 100644
--- a/epan/dissectors/packet-infiniband.c
+++ b/epan/dissectors/packet-infiniband.c
@@ -3361,12 +3361,12 @@ static void parse_CM_Req(proto_tree *top_tree, packet_info *pinfo, tvbuff_t *tvb
} else {
local_gid = (guint8 *)wmem_alloc(wmem_packet_scope(), GID_SIZE);
proto_tree_add_item(CM_header_tree, hf_cm_req_primary_local_gid, tvb, local_offset, 16, ENC_NA);
- tvb_get_ipv6(tvb, local_offset, (struct e_in6_addr*)local_gid);
+ tvb_get_ipv6(tvb, local_offset, (ws_in6_addr*)local_gid);
local_offset += 16;
remote_gid = (guint8 *)wmem_alloc(wmem_packet_scope(), GID_SIZE);
proto_tree_add_item(CM_header_tree, hf_cm_req_primary_remote_gid, tvb, local_offset, 16, ENC_NA);
- tvb_get_ipv6(tvb, local_offset, (struct e_in6_addr*)remote_gid);
+ tvb_get_ipv6(tvb, local_offset, (ws_in6_addr*)remote_gid);
}
local_offset += 16;
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 0a4cfe27bf..fccc4593c5 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -364,9 +364,9 @@ static dissector_handle_t ipv6_handle;
#define alloc_address_tvb_ipv6(scope, dst, tvb, offset) \
alloc_address_tvb((scope), (dst), AT_IPv6, IPv6_ADDR_SIZE, (tvb), (offset))
-extern const struct e_in6_addr *tvb_get_ptr_ipv6(tvbuff_t tvb, int offset);
+extern const ws_in6_addr *tvb_get_ptr_ipv6(tvbuff_t tvb, int offset);
#define tvb_get_ptr_ipv6(tvb, offset) \
- ((const struct e_in6_addr *)tvb_get_ptr(tvb, offset, IPv6_ADDR_SIZE))
+ ((const ws_in6_addr *)tvb_get_ptr(tvb, offset, IPv6_ADDR_SIZE))
ipv6_pinfo_t *p_get_ipv6_pinfo(packet_info *pinfo)
{
@@ -723,7 +723,7 @@ capture_ipv6_exthdr(const guchar *pd, int offset, int len, capture_packet_info_t
#ifdef HAVE_GEOIP_V6
static void
-add_geoip_info_entry(proto_tree *geoip_info_tree, proto_item *geoip_info_item, tvbuff_t *tvb, gint offset, const struct e_in6_addr *ip, int isdst)
+add_geoip_info_entry(proto_tree *geoip_info_tree, proto_item *geoip_info_item, tvbuff_t *tvb, gint offset, const ws_in6_addr *ip, int isdst)
{
guint num_dbs = geoip_db_num_dbs();
guint item_cnt = 0;
@@ -803,7 +803,7 @@ add_geoip_info_entry(proto_tree *geoip_info_tree, proto_item *geoip_info_item, t
}
static void
-add_geoip_info(proto_tree *tree, tvbuff_t *tvb, gint offset, const struct e_in6_addr *src, const struct e_in6_addr *dst)
+add_geoip_info(proto_tree *tree, tvbuff_t *tvb, gint offset, const ws_in6_addr *src, const ws_in6_addr *dst)
{
guint num_dbs;
proto_item *geoip_info_item;
@@ -865,7 +865,7 @@ ipv6_reassemble_do(tvbuff_t **tvb_ptr, gint *offset_ptr, packet_info *pinfo, pro
static proto_item *
_proto_tree_add_ipv6_vector_address(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
- gint length, const struct e_in6_addr *value_ptr, int idx)
+ gint length, const ws_in6_addr *value_ptr, int idx)
{
address addr;
gchar *str;
@@ -885,7 +885,7 @@ dissect_routing6_rt0(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
int offset = 0;
gint idx;
gint rt0_addr_count;
- const struct e_in6_addr *addr = NULL;
+ const ws_in6_addr *addr = NULL;
proto_tree_add_item(tree, hf_ipv6_routing_src_reserved, tvb, offset, 4, ENC_NA);
offset += 4;
@@ -925,7 +925,7 @@ dissect_routing6_mipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
struct ws_rthdr *rt = (struct ws_rthdr *)data;
proto_item *ti;
int offset = 0;
- const struct e_in6_addr *addr;
+ const ws_in6_addr *addr;
proto_tree_add_item(tree, hf_ipv6_routing_mipv6_reserved, tvb, offset, 4, ENC_NA);
offset += 4;
@@ -964,8 +964,8 @@ dissect_routing6_rpl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
guint32 reserved;
gint idx;
gint rpl_addr_count;
- struct e_in6_addr rpl_fulladdr;
- const struct e_in6_addr *ip6_dst_addr, *ip6_src_addr;
+ ws_in6_addr rpl_fulladdr;
+ const ws_in6_addr *ip6_dst_addr, *ip6_src_addr;
wmem_array_t *rpl_addr_vector = NULL;
guint i;
@@ -974,9 +974,9 @@ dissect_routing6_rpl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
return 0;
/* IPv6 destination address used for elided bytes */
- ip6_dst_addr = (const struct e_in6_addr *)pinfo->dst.data;
+ ip6_dst_addr = (const ws_in6_addr *)pinfo->dst.data;
/* IPv6 source address used for strict checking */
- ip6_src_addr = (const struct e_in6_addr *)pinfo->src.data;
+ ip6_src_addr = (const ws_in6_addr *)pinfo->src.data;
/* from RFC6554: Multicast addresses MUST NOT appear in the IPv6 Destination Address field */
if (in6_is_addr_multicast(ip6_dst_addr)) {
@@ -1094,7 +1094,7 @@ dissect_routing6_srh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *
gint offlim, offstart;
gint idx;
gint srh_first_seg, srh_addr_count;
- const struct e_in6_addr *addr;
+ const ws_in6_addr *addr;
proto_tree *rthdr_srh_addr_tree;
static const int *srh_flags[] = {
&hf_ipv6_routing_srh_flag_unused1,
@@ -2237,7 +2237,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
proto_item *ti_ipv6_plen = NULL, *ti_ipv6_version;
guint8 ip6_tcls, ip6_nxt, ip6_hlim;
guint32 ip6_flow;
- const struct e_in6_addr *ip6_src, *ip6_dst;
+ const ws_in6_addr *ip6_src, *ip6_dst;
guint32 plen;
int offset;
guint reported_plen;
diff --git a/epan/dissectors/packet-isis-clv.c b/epan/dissectors/packet-isis-clv.c
index a78f14a210..0ade2cfb2a 100644
--- a/epan/dissectors/packet-isis-clv.c
+++ b/epan/dissectors/packet-isis-clv.c
@@ -371,7 +371,7 @@ void
isis_dissect_ipv6_int_clv(proto_tree *tree, packet_info* pinfo, tvbuff_t *tvb, expert_field* expert,
int offset, int length, int tree_id)
{
- struct e_in6_addr addr;
+ ws_in6_addr addr;
if ( length <= 0 ) {
return;
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index 6bff46b261..f078122385 100644
--- a/epan/dissectors/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
@@ -1445,7 +1445,7 @@ dissect_lsp_ipv6_reachability_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree
guint8 ctrl_info;
guint bit_length;
int byte_length;
- struct e_in6_addr prefix;
+ ws_in6_addr prefix;
address prefix_addr;
guint len,i;
guint subclvs_len;
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index b34753cc3b..f0bd580c3e 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -7390,7 +7390,7 @@ dissect_nfs4_clientaddr(tvbuff_t *tvb, int offset, proto_tree *tree)
guint16 port;
int addr_offset;
guint32 ipv4;
- struct e_in6_addr ipv6;
+ ws_in6_addr ipv6;
address addr;
proto_item* ti;
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c
index 703407ef9f..5eec7098de 100644
--- a/epan/dissectors/packet-nsip.c
+++ b/epan/dissectors/packet-nsip.c
@@ -523,7 +523,7 @@ static void
decode_iei_ip_address(nsip_ie_t *ie, build_info_t *bi, int ie_start_offset) {
guint8 addr_type;
guint32 ip4_addr;
- struct e_in6_addr ip6_addr;
+ ws_in6_addr ip6_addr;
addr_type = tvb_get_guint8(bi->tvb, bi->offset);
proto_tree_add_item(bi->nsip_tree, hf_nsip_ip_address_type,
diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c
index 12701c54fd..bd770a0f7b 100644
--- a/epan/dissectors/packet-ospf.c
+++ b/epan/dissectors/packet-ospf.c
@@ -3144,7 +3144,7 @@ static void dissect_ospf_v3_address_prefix(tvbuff_t *tvb, packet_info *pinfo, in
{
int bytes_to_process;
- struct e_in6_addr prefix;
+ ws_in6_addr prefix;
bytes_to_process=((prefix_length+31)/32)*4;
diff --git a/epan/dissectors/packet-packetbb.c b/epan/dissectors/packet-packetbb.c
index f013b80e33..34870d6b73 100644
--- a/epan/dissectors/packet-packetbb.c
+++ b/epan/dissectors/packet-packetbb.c
@@ -707,7 +707,7 @@ static int dissect_pbb_addressblock(tvbuff_t *tvb, packet_info *pinfo, proto_tre
break;
case 1:
addrValue_item = proto_tree_add_ipv6(addr_tree, hf_packetbb_addr_value[addressType],
- tvb, mid_index, block_index + block_length - mid_index, (struct e_in6_addr *)addr);
+ tvb, mid_index, block_index + block_length - mid_index, (ws_in6_addr *)addr);
break;
case 2:
addrValue_item = proto_tree_add_ether(addr_tree, hf_packetbb_addr_value[addressType],
diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c
index 52e3592e99..ff55e5c0da 100644
--- a/epan/dissectors/packet-pim.c
+++ b/epan/dissectors/packet-pim.c
@@ -640,7 +640,7 @@ static gboolean
dissect_pim_addr(proto_tree* tree, tvbuff_t *tvb, int offset, enum pimv2_addrtype at,
const char* label, proto_item** ret_item, int hf_ip4, int hf_ip6, int *advance) {
guint8 af, et, flags, mask_len;
- struct e_in6_addr ipv6;
+ ws_in6_addr ipv6;
guint32 ipv4;
proto_item* ti = NULL;
int len = 0;
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 10f09e11fc..09ba2e147d 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -4417,7 +4417,7 @@ dissect_vsncp_pdnaddress_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
case 2:
{
- struct e_in6_addr *ad = wmem_new0(wmem_packet_scope(),struct e_in6_addr);
+ ws_in6_addr *ad = wmem_new0(wmem_packet_scope(),ws_in6_addr);
address addr;
tvb_memcpy(tvb, &ad->bytes[8], offset + 3, 8);
@@ -4430,7 +4430,7 @@ dissect_vsncp_pdnaddress_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
case 3:
{
- struct e_in6_addr *ad = wmem_new0(wmem_packet_scope(), struct e_in6_addr);
+ ws_in6_addr *ad = wmem_new0(wmem_packet_scope(), ws_in6_addr);
address addr;
tvb_memcpy(tvb, &ad->bytes[8], offset + 3, 8);
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 8530b26d64..40736d957b 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -1135,7 +1135,7 @@ radius_ipv6addr(radius_attr_info_t *a, proto_tree *tree, packet_info *pinfo _U_,
void
radius_ipv6prefix(radius_attr_info_t *a, proto_tree *tree, packet_info *pinfo _U_, tvbuff_t *tvb, int offset, int len, proto_item *avp_item)
{
- struct e_in6_addr ipv6_buff;
+ ws_in6_addr ipv6_buff;
gchar txtbuf[256];
guint8 n;
diff --git a/epan/dissectors/packet-rtpproxy.c b/epan/dissectors/packet-rtpproxy.c
index fad315cd21..048841ac54 100644
--- a/epan/dissectors/packet-rtpproxy.c
+++ b/epan/dissectors/packet-rtpproxy.c
@@ -494,7 +494,7 @@ rtpproxy_add_notify_addr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy
/* We have ip:port */
if(ipv6){
if(str_to_ip6((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, begin, offset - begin, ENC_ASCII), ipaddr))
- proto_tree_add_ipv6(rtpproxy_tree, hf_rtpproxy_notify_ipv6, tvb, begin, offset - begin, (const struct e_in6_addr*)ipaddr);
+ proto_tree_add_ipv6(rtpproxy_tree, hf_rtpproxy_notify_ipv6, tvb, begin, offset - begin, (const ws_in6_addr*)ipaddr);
else
proto_tree_add_expert(rtpproxy_tree, pinfo, &ei_rtpproxy_bad_ipv6, tvb, begin, offset - begin);
}
@@ -513,7 +513,7 @@ rtpproxy_add_notify_addr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtpproxy
if (pinfo->src.type == AT_IPv4)
ti = proto_tree_add_ipv4(rtpproxy_tree, hf_rtpproxy_notify_ipv4, tvb, begin, 0, *(const guint32*)(pinfo->src.data));
else
- ti = proto_tree_add_ipv6(rtpproxy_tree, hf_rtpproxy_notify_ipv6, tvb, begin, 0, (const struct e_in6_addr *)(pinfo->src.data));
+ ti = proto_tree_add_ipv6(rtpproxy_tree, hf_rtpproxy_notify_ipv6, tvb, begin, 0, (const ws_in6_addr *)(pinfo->src.data));
PROTO_ITEM_SET_GENERATED(ti);
proto_tree_add_uint(rtpproxy_tree, hf_rtpproxy_notify_port, tvb, begin, end - begin,
(guint16) g_ascii_strtoull((gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, begin, end - begin, ENC_ASCII), NULL, 10));
@@ -703,7 +703,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
}
else{
if(str_to_ip6((char*)tvb_get_string_enc(wmem_packet_scope(), tvb, offset, new_offset - offset, ENC_ASCII), ipaddr))
- proto_tree_add_ipv6(rtpproxy_tree, hf_rtpproxy_ipv6, tvb, offset, new_offset - offset, (const struct e_in6_addr *)ipaddr);
+ proto_tree_add_ipv6(rtpproxy_tree, hf_rtpproxy_ipv6, tvb, offset, new_offset - offset, (const ws_in6_addr *)ipaddr);
else
proto_tree_add_expert(rtpproxy_tree, pinfo, &ei_rtpproxy_bad_ipv6, tvb, offset, new_offset - offset);
}
@@ -872,7 +872,7 @@ dissect_rtpproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
addr.type = AT_IPv6;
addr.len = 16;
addr.data = wmem_memdup(wmem_packet_scope(), ipaddr, 16);
- proto_tree_add_ipv6(rtpproxy_tree, hf_rtpproxy_ipv6, tvb, offset, tmp, (const struct e_in6_addr *)ipaddr);
+ proto_tree_add_ipv6(rtpproxy_tree, hf_rtpproxy_ipv6, tvb, offset, tmp, (const ws_in6_addr *)ipaddr);
}
else
proto_tree_add_expert(rtpproxy_tree, pinfo, &ei_rtpproxy_bad_ipv6, tvb, offset, tmp);
diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c
index 6dc2c036e1..5030e92c62 100644
--- a/epan/dissectors/packet-sap.c
+++ b/epan/dissectors/packet-sap.c
@@ -138,7 +138,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
is_comp = vers_flags&MCAST_SAP_BIT_C;
sap_version = (vers_flags&MCAST_SAP_VERSION_MASK)>>MCAST_SAP_VERSION_SHIFT;
- addr_len = (is_ipv6) ? (int)sizeof(struct e_in6_addr) : 4;
+ addr_len = (is_ipv6) ? (int)sizeof(ws_in6_addr) : 4;
col_add_fstr(pinfo->cinfo, COL_INFO, "%s (v%u)",
(is_del) ? "Deletion" : "Announcement", sap_version);
diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c
index b611295c10..da9be7d9eb 100644
--- a/epan/dissectors/packet-sasp.c
+++ b/epan/dissectors/packet-sasp.c
@@ -650,7 +650,7 @@ static guint32 dissect_memdatacomp(tvbuff_t *tvb, proto_tree *pay_load, guint32
proto_tree *memdatacomp_tree;
guint8 lab_len;
const gchar *ip_str;
- struct e_in6_addr ipv6_address;
+ ws_in6_addr ipv6_address;
tvb_get_ipv6(tvb, offset+7, &ipv6_address);
ip_str = tvb_ip6_to_str(tvb, offset+7);
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 44616d7e5b..00b6ee15e0 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -511,7 +511,7 @@ parse_sdp_connection_address(const char *connection_type, const char *connection
alloc_address_wmem(allocator, conn_addr, AT_IPv4, 4, &ip4_addr);
}
} else if (strcmp(connection_type, "IP6") == 0) {
- struct e_in6_addr ip6_addr;
+ ws_in6_addr ip6_addr;
if (str_to_ip6(connection_address, &ip6_addr)) {
/* connection_address could be converted to a valid ipv6 address*/
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index 4c26125612..1eba1e2c3c 100644
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -1116,7 +1116,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) {
PROTO_ITEM_SET_GENERATED(ti);
} else if (hash_info->dst_addr.type == AT_IPv6) {
ti = proto_tree_add_ipv6( socks_tree, hf_socks_ip6_dst, tvb,
- offset, 0, (const struct e_in6_addr *)hash_info->dst_addr.data);
+ offset, 0, (const ws_in6_addr *)hash_info->dst_addr.data);
PROTO_ITEM_SET_GENERATED(ti);
}
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c
index 06a0cd5114..a0729403ba 100644
--- a/epan/dissectors/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
@@ -1092,13 +1092,13 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole
proto_tree_add_item(att_tree, hf_stun_att_xor_ipv6, tvb, offset+4, 16, ENC_NA);
{
guint32 IPv6[4];
- tvb_get_ipv6(tvb, offset+4, (struct e_in6_addr *)IPv6);
+ tvb_get_ipv6(tvb, offset+4, (ws_in6_addr *)IPv6);
IPv6[0] = IPv6[0] ^ g_htonl(magic_cookie_first_word);
IPv6[1] = IPv6[1] ^ g_htonl(transaction_id[0]);
IPv6[2] = IPv6[2] ^ g_htonl(transaction_id[1]);
IPv6[3] = IPv6[3] ^ g_htonl(transaction_id[2]);
ti = proto_tree_add_ipv6(att_tree, hf_stun_att_ipv6, tvb, offset+4, 16,
- (const struct e_in6_addr *)IPv6);
+ (const ws_in6_addr *)IPv6);
PROTO_ITEM_SET_GENERATED(ti);
}
diff --git a/epan/dissectors/packet-thread.c b/epan/dissectors/packet-thread.c
index d4749b7042..7a5df00c5e 100644
--- a/epan/dissectors/packet-thread.c
+++ b/epan/dissectors/packet-thread.c
@@ -1385,7 +1385,7 @@ dissect_thread_mc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat
expert_add_info(pinfo, proto_root, &ei_thread_mc_len_size_mismatch);
proto_tree_add_item(tlv_tree, hf_thread_mc_tlv_unknown, tvb, offset, tlv_len, ENC_NA);
} else {
- struct e_in6_addr prefix;
+ ws_in6_addr prefix;
memset(&prefix, 0, sizeof(prefix));
tvb_memcpy(tvb, (guint8 *)&prefix.bytes, offset, tlv_len);
@@ -1947,7 +1947,7 @@ dissect_thread_nwd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
{
guint8 prefix_len;
guint8 prefix_byte_len;
- struct e_in6_addr prefix;
+ ws_in6_addr prefix;
address prefix_addr;
/* Domain ID */
diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c
index ebd69f4db6..b500e16810 100644
--- a/epan/dissectors/packet-wccp.c
+++ b/epan/dissectors/packet-wccp.c
@@ -443,7 +443,7 @@ typedef struct wccp_address_table {
gint16 version;
guint16 table_length;
guint32 *table_ipv4;
- struct e_in6_addr *table_ipv6;
+ ws_in6_addr *table_ipv6;
} wccp_address_table;
static int wccp_bucket_info(guint8 bucket_info, proto_tree *bucket_tree,
@@ -635,7 +635,7 @@ static proto_item* wccp_add_ipaddress_item(proto_tree* tree, int hf_index, int h
int offset, gint length, wccp_address_table* addr_table)
{
guint32 host_addr;
- struct e_in6_addr ipv6_zero;
+ ws_in6_addr ipv6_zero;
guint16 reserv, addr_index;
/* are we using an address table? */
@@ -1498,8 +1498,8 @@ dissect_wccp2r1_address_table_info(tvbuff_t *tvb, int offset, int length,
break;
case 2:
if (wccp_wccp_address_table->table_ipv6 == NULL)
- wccp_wccp_address_table->table_ipv6 = (struct e_in6_addr *)
- wmem_alloc0(pinfo->pool, wccp_wccp_address_table->table_length * sizeof(struct e_in6_addr));
+ wccp_wccp_address_table->table_ipv6 = (ws_in6_addr *)
+ wmem_alloc0(pinfo->pool, wccp_wccp_address_table->table_length * sizeof(ws_in6_addr));
if (address_length != 16) {
expert_add_info_format(pinfo, tf, &ei_wccp_length_bad,
"The Address length must be 16, but I found %d for IPv6 addresses. Correcting this.",
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index bbfa4e7a24..c0bae2d830 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -3884,7 +3884,7 @@ dissect_redirect(tvbuff_t *tvb, int offset, packet_info *pinfo,
int address_len;
guint16 port_num;
guint32 address_ipv4;
- struct e_in6_addr address_ipv6;
+ ws_in6_addr address_ipv6;
address redir_address;
conversation_t *conv;
guint32 idx = 0; /* Address index */
diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c
index e650e4890a..e08e69af74 100644
--- a/epan/dissectors/packet-zebra.c
+++ b/epan/dissectors/packet-zebra.c
@@ -370,7 +370,7 @@ zebra_route(proto_tree *tree, tvbuff_t *tvb, int offset, guint16 len,
tvb_memcpy(tvb, buffer6, offset,
MIN((unsigned) PSIZE(prefixlen), sizeof buffer6));
proto_tree_add_ipv6(tree, hf_zebra_prefix6,
- tvb, offset, PSIZE(prefixlen), (struct e_in6_addr *)buffer6);
+ tvb, offset, PSIZE(prefixlen), (ws_in6_addr *)buffer6);
}else {
prefix4 = 0;
tvb_memcpy(tvb, (guint8 *)&prefix4, offset,
diff --git a/epan/follow.h b/epan/follow.h
index a147b63d49..21ce19a7c9 100644
--- a/epan/follow.h
+++ b/epan/follow.h
@@ -78,7 +78,7 @@ typedef enum {
typedef union _stream_addr {
guint32 ipv4;
- struct e_in6_addr ipv6;
+ ws_in6_addr ipv6;
} stream_addr;
struct _follow_info;
diff --git a/epan/geoip_db.c b/epan/geoip_db.c
index 65a728dac2..923a4fb2ae 100644
--- a/epan/geoip_db.c
+++ b/epan/geoip_db.c
@@ -462,7 +462,7 @@ geoip_db_lookup_latlon6(geoipv6_t addr _U_, float *lat _U_, float *lon _U_) {
#endif /* NUM_DB_TYPES */
char *
-geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, const char *not_found) {
+geoip_db_lookup_ipv6(guint dbnum, ws_in6_addr addr, const char *not_found) {
GeoIP *gi;
geoipv6_t gaddr;
char *name;
@@ -560,7 +560,7 @@ geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, const char *not_found)
#else /* HAVE_GEOIP_V6 */
char *
-geoip_db_lookup_ipv6(guint dbnum _U_, struct e_in6_addr addr _U_, const char *not_found) {
+geoip_db_lookup_ipv6(guint dbnum _U_, ws_in6_addr addr _U_, const char *not_found) {
if (not_found == NULL)
return NULL;
diff --git a/epan/geoip_db.h b/epan/geoip_db.h
index 5cb1be6e48..c9e3551bc0 100644
--- a/epan/geoip_db.h
+++ b/epan/geoip_db.h
@@ -87,7 +87,7 @@ WS_DLL_PUBLIC char *geoip_db_lookup_ipv4(guint dbnum, guint32 addr, const char *
*
* @return The database entry if found, else not_found. Return value must be freed with wmem_free.
*/
-WS_DLL_PUBLIC char *geoip_db_lookup_ipv6(guint dbnum, struct e_in6_addr addr, const char *not_found);
+WS_DLL_PUBLIC char *geoip_db_lookup_ipv6(guint dbnum, ws_in6_addr addr, const char *not_found);
/**
* Get all configured paths
diff --git a/epan/ipv6.h b/epan/ipv6.h
index 33bc72c179..8efded747f 100644
--- a/epan/ipv6.h
+++ b/epan/ipv6.h
@@ -32,7 +32,7 @@
#include <wsutil/inet_ipv6.h>
typedef struct {
- struct e_in6_addr addr;
+ ws_in6_addr addr;
guint32 prefix;
} ipv6_addr_and_prefix;
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;
diff --git a/epan/proto.h b/epan/proto.h
index e749979b8e..cf42174486 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -1580,7 +1580,7 @@ proto_tree_add_ipv4_format(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint st
@return the newly created item */
WS_DLL_PUBLIC 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);
/** Add a formatted FT_IPv6 to a proto_tree, with the format generating
the string for the value and with the field name being included
@@ -1596,7 +1596,7 @@ proto_tree_add_ipv6(proto_tree *tree, int hfindex, tvbuff_t *tvb, gint start,
@return the newly created item */
WS_DLL_PUBLIC 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 char *format,
+ gint start, gint length, const ws_in6_addr *value_ptr, const char *format,
...) G_GNUC_PRINTF(7,8);
/** Add a formatted FT_IPv6 to a proto_tree, with the format generating
@@ -1612,7 +1612,7 @@ proto_tree_add_ipv6_format_value(proto_tree *tree, int hfindex, tvbuff_t *tvb,
@return the newly created item */
WS_DLL_PUBLIC 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 char *format, ...) G_GNUC_PRINTF(7,8);
+ gint length, const ws_in6_addr *value_ptr, const char *format, ...) G_GNUC_PRINTF(7,8);
/** Add a FT_ETHER to a proto_tree.
@param tree the tree to append this item to
diff --git a/epan/to_str.c b/epan/to_str.c
index 94d6eb0c13..3785256156 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -1044,7 +1044,7 @@ ip_to_str_buf(const guint8 *ad, gchar *buf, const int buf_len)
}
void
-ip6_to_str_buf(const struct e_in6_addr *ad, gchar *buf, int buf_len)
+ip6_to_str_buf(const ws_in6_addr *ad, gchar *buf, int buf_len)
{
if (buf_len < WS_INET6_ADDRSTRLEN) {
g_strlcpy(buf, BUF_TOO_SMALL_ERR, buf_len); /* Let the unexpected value alert user */
diff --git a/epan/to_str.h b/epan/to_str.h
index 3fa71f2f52..9c58533784 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -92,7 +92,7 @@ WS_DLL_PUBLIC void address_to_str_buf(const address *addr, gchar *buf, int b
#define tvb_eui64_to_str(tvb, offset) tvb_address_to_str(wmem_packet_scope(), tvb, AT_EUI64, offset)
void ip_to_str_buf(const guint8 *ad, gchar *buf, const int buf_len);
-void ip6_to_str_buf(const struct e_in6_addr *, gchar *, int buf_len);
+void ip6_to_str_buf(const ws_in6_addr *, gchar *, int buf_len);
extern gchar* ipxnet_to_str_punct(wmem_allocator_t *scope, const guint32 ad, const char punct);
WS_DLL_PUBLIC gchar* eui64_to_str(wmem_allocator_t *scope, const guint64 ad);
diff --git a/epan/tvbparse.c b/epan/tvbparse.c
index ddb9294b03..ec233c3d06 100644
--- a/epan/tvbparse.c
+++ b/epan/tvbparse.c
@@ -874,7 +874,7 @@ static int cond_ft(tvbparse_t* tt, int offset, const tvbparse_wanted_t * wanted,
}
}
-gint ft_lens[] = {-1,-1,-1, 1, 2, 3, 4, 8, 1, 2, 3, 4, 8, 4, 8,-1,-1,-1, 0, -1, 6, -1, -1, 4, sizeof(struct e_in6_addr), -1, -1, -1, -1 };
+gint ft_lens[] = {-1,-1,-1, 1, 2, 3, 4, 8, 1, 2, 3, 4, 8, 4, 8,-1,-1,-1, 0, -1, 6, -1, -1, 4, sizeof(ws_in6_addr), -1, -1, -1, -1 };
tvbparse_wanted_t* tvbparse_ft(int id,
const void* data,
diff --git a/epan/tvbuff.c b/epan/tvbuff.c
index 6693a88fef..edd0f049a4 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -1664,7 +1664,7 @@ tvb_get_ipv4(tvbuff_t *tvb, const gint offset)
/* Fetch an IPv6 address. */
void
-tvb_get_ipv6(tvbuff_t *tvb, const gint offset, struct e_in6_addr *addr)
+tvb_get_ipv6(tvbuff_t *tvb, const gint offset, ws_in6_addr *addr)
{
const guint8 *ptr;
diff --git a/epan/tvbuff.h b/epan/tvbuff.h
index fee28c7f98..8e9057e92f 100644
--- a/epan/tvbuff.h
+++ b/epan/tvbuff.h
@@ -398,7 +398,7 @@ WS_DLL_PUBLIC guint32 tvb_get_ipv4(tvbuff_t *tvb, const gint offset);
/* Fetch an IPv6 address. */
WS_DLL_PUBLIC void tvb_get_ipv6(tvbuff_t *tvb, const gint offset,
- struct e_in6_addr *addr);
+ ws_in6_addr *addr);
/* Fetch a GUID. */
WS_DLL_PUBLIC void tvb_get_ntohguid(tvbuff_t *tvb, const gint offset,
diff --git a/epan/wslua/wslua_address.c b/epan/wslua/wslua_address.c
index 5524eb2800..008f3c769b 100644
--- a/epan/wslua/wslua_address.c
+++ b/epan/wslua/wslua_address.c
@@ -60,7 +60,7 @@ WSLUA_CONSTRUCTOR Address_ipv6(lua_State* L) {
#define WSLUA_ARG_Address_ipv6_HOSTNAME 1 /* The address or name of the IP host. */
Address addr = (Address)g_malloc(sizeof(address));
- struct e_in6_addr ip_addr;
+ ws_in6_addr ip_addr;
const gchar* name = luaL_checkstring(L,WSLUA_ARG_Address_ipv6_HOSTNAME);
if (!get_host_ipaddr6(name, &ip_addr)) {
diff --git a/epan/wslua/wslua_capture_info.c b/epan/wslua/wslua_capture_info.c
index 323ca8079c..b984b674b4 100644
--- a/epan/wslua/wslua_capture_info.c
+++ b/epan/wslua/wslua_capture_info.c
@@ -156,7 +156,7 @@ static int CaptureInfo_set_hosts(lua_State* L) {
size_t addr_len = 0;
size_t name_len = 0;
guint32 v4_addr = 0;
- struct e_in6_addr v6_addr = { {0} };
+ ws_in6_addr v6_addr = { {0} };
if (!wth->add_new_ipv4 || !wth->add_new_ipv6) {
return luaL_error(L, "CaptureInfo wtap has no IPv4 or IPv6 name resolution");
diff --git a/epan/wslua/wslua_tree.c b/epan/wslua/wslua_tree.c
index 09392d8f12..2536dbc96c 100644
--- a/epan/wslua/wslua_tree.c
+++ b/epan/wslua/wslua_tree.c
@@ -425,7 +425,7 @@ static int TreeItem_add_item_any(lua_State *L, gboolean little_endian) {
return 0;
}
- item = proto_tree_add_ipv6(tree_item->tree, hfid, tvbr->tvb->ws_tvb, tvbr->offset, tvbr->len, (struct e_in6_addr *)addr->data);
+ item = proto_tree_add_ipv6(tree_item->tree, hfid, tvbr->tvb->ws_tvb, tvbr->offset, tvbr->len, (ws_in6_addr *)addr->data);
}
break;
case FT_ETHER:
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c
index d8ce7c917a..ebf248cdfd 100644
--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/wimaxasncp/packet-wimaxasncp.c
@@ -616,7 +616,7 @@ static void wimaxasncp_proto_tree_add_tlv_ipv6_value(
const wimaxasncp_dict_tlv_t *tlv_info)
{
int hf_value;
- struct e_in6_addr ip;
+ ws_in6_addr ip;
const gchar *addr_res;
if (tlv_info->hf_ipv4 != -1)
diff --git a/sharkd_session.c b/sharkd_session.c
index 08cf739e85..258cc71dea 100644
--- a/sharkd_session.c
+++ b/sharkd_session.c
@@ -1243,7 +1243,7 @@ sharkd_session_geoip_addr(address *addr, const char *suffix)
#ifdef HAVE_GEOIP_V6
if (addr->type == AT_IPv6)
{
- const struct e_in6_addr *ip6 = (const struct e_in6_addr *) addr->data;
+ const ws_in6_addr *ip6 = (const ws_in6_addr *) addr->data;
guint num_dbs = geoip_db_num_dbs();
guint dbnum;
diff --git a/text2pcap.c b/text2pcap.c
index e55fc046a3..659ffe51de 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -169,9 +169,9 @@ static long hdr_ip_proto = 0;
/* Destination and source addresses for IP header */
static guint32 hdr_ip_dest_addr = 0;
static guint32 hdr_ip_src_addr = 0;
-static struct e_in6_addr hdr_ipv6_dest_addr = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
-static struct e_in6_addr hdr_ipv6_src_addr = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
-static struct e_in6_addr NO_IPv6_ADDRESS = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
+static ws_in6_addr hdr_ipv6_dest_addr = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
+static ws_in6_addr hdr_ipv6_src_addr = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
+static ws_in6_addr NO_IPv6_ADDRESS = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
/* Dummy UDP header */
static int hdr_udp = FALSE;
@@ -340,8 +340,8 @@ typedef struct {
} ip6_un1;
guint8 ip6_un2_vfc; /* 4 bits version, 4 bits priority */
} ip6_ctlun;
- struct e_in6_addr ip6_src; /* source address */
- struct e_in6_addr ip6_dst; /* destination address */
+ ws_in6_addr ip6_src; /* source address */
+ ws_in6_addr ip6_dst; /* destination address */
} hdr_ipv6_t;
static hdr_ipv6_t HDR_IPv6;
@@ -676,10 +676,10 @@ write_current_packet (gboolean cont)
HDR_IP.hdr_checksum = in_checksum(&HDR_IP, sizeof(HDR_IP));
write_bytes((const char *)&HDR_IP, sizeof(HDR_IP));
} else if (hdr_ipv6) {
- if (memcmp(isInbound ? &hdr_ipv6_dest_addr : &hdr_ipv6_src_addr, &NO_IPv6_ADDRESS, sizeof(struct e_in6_addr)))
- memcpy(&HDR_IPv6.ip6_src, isInbound ? &hdr_ipv6_dest_addr : &hdr_ipv6_src_addr, sizeof(struct e_in6_addr));
- if (memcmp(isInbound ? &hdr_ipv6_src_addr : &hdr_ipv6_dest_addr, &NO_IPv6_ADDRESS, sizeof(struct e_in6_addr)))
- memcpy(&HDR_IPv6.ip6_dst, isInbound ? &hdr_ipv6_src_addr : &hdr_ipv6_dest_addr, sizeof(struct e_in6_addr));
+ if (memcmp(isInbound ? &hdr_ipv6_dest_addr : &hdr_ipv6_src_addr, &NO_IPv6_ADDRESS, sizeof(ws_in6_addr)))
+ memcpy(&HDR_IPv6.ip6_src, isInbound ? &hdr_ipv6_dest_addr : &hdr_ipv6_src_addr, sizeof(ws_in6_addr));
+ if (memcmp(isInbound ? &hdr_ipv6_src_addr : &hdr_ipv6_dest_addr, &NO_IPv6_ADDRESS, sizeof(ws_in6_addr)))
+ memcpy(&HDR_IPv6.ip6_dst, isInbound ? &hdr_ipv6_src_addr : &hdr_ipv6_dest_addr, sizeof(ws_in6_addr));
HDR_IPv6.ip6_ctlun.ip6_un2_vfc &= 0x0F;
HDR_IPv6.ip6_ctlun.ip6_un2_vfc |= (6<< 4);
diff --git a/ui/cli/tap-follow.c b/ui/cli/tap-follow.c
index 1bb4250319..e625092ff0 100644
--- a/ui/cli/tap-follow.c
+++ b/ui/cli/tap-follow.c
@@ -53,7 +53,7 @@ typedef struct _cli_follow_info {
address addr[2];
union {
guint32 addrBuf_v4;
- struct e_in6_addr addrBuf_v6;
+ ws_in6_addr addrBuf_v6;
} addrBuf[2];
} cli_follow_info_t;
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
index 48ab4530a9..9fc09f9989 100644
--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@@ -590,7 +590,7 @@ draw_hostlist_table_data(hostlist_table *hl)
wmem_free(NULL, name);
} else if (host->myaddress.type == AT_IPv6 && j < geoip_db_num_dbs()) {
guchar *name;
- const struct e_in6_addr *addr = (const struct e_in6_addr *) host->myaddress.data;
+ const ws_in6_addr *addr = (const ws_in6_addr *) host->myaddress.data;
name = geoip_db_lookup_ipv6(j, *addr, "-");
geoip[j] = g_strdup(name);
diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp
index bc871c6b82..3d388ce9f9 100644
--- a/ui/qt/endpoint_dialog.cpp
+++ b/ui/qt/endpoint_dialog.cpp
@@ -316,7 +316,7 @@ public:
if (endp_item->myaddress.type == AT_IPv4) {
geoip_str = geoip_db_lookup_ipv4(db, pntoh32(endp_item->myaddress.data), NULL);
} else if (endp_item->myaddress.type == AT_IPv6) {
- const struct e_in6_addr *addr = (const struct e_in6_addr *) endp_item->myaddress.data;
+ const ws_in6_addr *addr = (const ws_in6_addr *) endp_item->myaddress.data;
geoip_str = geoip_db_lookup_ipv6(db, *addr, NULL);
}
if (!geoip_str.isEmpty()) {
diff --git a/ui/traffic_table_ui.c b/ui/traffic_table_ui.c
index 6bbbdacecc..92943e97fe 100644
--- a/ui/traffic_table_ui.c
+++ b/ui/traffic_table_ui.c
@@ -203,7 +203,7 @@ create_endpoint_geoip_map(const GArray *endp_array, gchar **err_str) {
city = geoip_db_lookup_ipv4(db_city4, pntoh32(endp_item->myaddress.data), "-");
asn = geoip_db_lookup_ipv4(db_asn4, pntoh32(endp_item->myaddress.data), "-");
} else if (endp_item->myaddress.type == AT_IPv6) {
- const struct e_in6_addr *addr = (const struct e_in6_addr *) endp_item->myaddress.data;
+ const ws_in6_addr *addr = (const ws_in6_addr *) endp_item->myaddress.data;
lon = geoip_db_lookup_ipv6(db_lon, *addr, NULL);
lat = geoip_db_lookup_ipv6(db_lat, *addr, NULL);
country = geoip_db_lookup_ipv6(db_country6, *addr, "-");
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
*
diff --git a/wsutil/inet_addr.c b/wsutil/inet_addr.c
index d7f756031e..505d029c01 100644
--- a/wsutil/inet_addr.c
+++ b/wsutil/inet_addr.c
@@ -71,7 +71,7 @@ ws_inet_ntop6(gconstpointer src, gchar *dst, guint dst_size)
}
gboolean
-ws_inet_pton6(const gchar *src, struct e_in6_addr *dst)
+ws_inet_pton6(const gchar *src, ws_in6_addr *dst)
{
return _inet_pton(AF_INET6, src, dst);
}
diff --git a/wsutil/inet_addr.h b/wsutil/inet_addr.h
index f0e10db100..3fced32126 100644
--- a/wsutil/inet_addr.h
+++ b/wsutil/inet_addr.h
@@ -41,6 +41,6 @@ WS_DLL_PUBLIC const gchar *
ws_inet_ntop6(gconstpointer src, gchar *dst, guint dst_size);
WS_DLL_PUBLIC gboolean
-ws_inet_pton6(const gchar *src, struct e_in6_addr *dst);
+ws_inet_pton6(const gchar *src, ws_in6_addr *dst);
#endif
diff --git a/wsutil/inet_ipv6.h b/wsutil/inet_ipv6.h
index dc7183c08e..c3b37e7580 100644
--- a/wsutil/inet_ipv6.h
+++ b/wsutil/inet_ipv6.h
@@ -29,9 +29,9 @@
#define IPv6_HDR_SIZE 40
#define IPv6_FRAGMENT_HDR_SIZE 8
-struct e_in6_addr {
+typedef struct e_in6_addr {
guint8 bytes[16]; /* 128 bit IPv6 address */
-};
+} ws_in6_addr;
/*
* Definition for internet protocol version 6.
@@ -42,8 +42,8 @@ struct ws_ip6_hdr {
guint16 ip6h_plen; /* payload length */
guint8 ip6h_nxt; /* next header */
guint8 ip6h_hlim; /* hop limit */
- struct e_in6_addr ip6h_src; /* source address */
- struct e_in6_addr ip6h_dst; /* destination address */
+ ws_in6_addr ip6h_src; /* source address */
+ ws_in6_addr ip6h_dst; /* destination address */
};
/*
@@ -73,7 +73,7 @@ struct ip6_rthdr0 {
guint8 ip6r0_reserved; /* reserved field */
guint8 ip6r0_slmap[3]; /* strict/loose bit map */
/* followed by up to 127 addresses */
- struct e_in6_addr ip6r0_addr[1];
+ ws_in6_addr ip6r0_addr[1];
};
/* Fragment header */
@@ -93,12 +93,12 @@ struct ip6_frag {
* Unicast Scope
* Note that we must check topmost 10 bits only, not 16 bits (see RFC2373).
*/
-static inline gboolean in6_is_addr_linklocal(const struct e_in6_addr *a)
+static inline gboolean in6_is_addr_linklocal(const ws_in6_addr *a)
{
return (a->bytes[0] == 0xfe) && ((a->bytes[1] & 0xc0) == 0x80);
}
-static inline gboolean in6_is_addr_sitelocal(const struct e_in6_addr *a)
+static inline gboolean in6_is_addr_sitelocal(const ws_in6_addr *a)
{
return (a->bytes[0] == 0xfe) && ((a->bytes[1] & 0xc0) == 0xc0);
}
@@ -106,7 +106,7 @@ static inline gboolean in6_is_addr_sitelocal(const struct e_in6_addr *a)
/**
* Multicast
*/
-static inline gboolean in6_is_addr_multicast(const struct e_in6_addr *a)
+static inline gboolean in6_is_addr_multicast(const ws_in6_addr *a)
{
return a->bytes[0] == 0xff;
}