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>

41 files changed, 87 insertions, 87 deletions

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,