44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
diff --git a/src/conntrack/snprintf_default.c b/src/conntrack/snprintf_default.c
|
|
index e129218..675be7a 100644
|
|
--- a/src/conntrack/snprintf_default.c
|
|
+++ b/src/conntrack/snprintf_default.c
|
|
@@ -93,8 +93,8 @@ int __snprintf_address_ipv6(char *buf,
|
|
struct in6_addr dst;
|
|
char tmp[INET6_ADDRSTRLEN];
|
|
|
|
- memcpy(&src.in6_u, &tuple->src.v6, sizeof(struct in6_addr));
|
|
- memcpy(&dst.in6_u, &tuple->dst.v6, sizeof(struct in6_addr));
|
|
+ memcpy(&src, &tuple->src.v6, sizeof(struct in6_addr));
|
|
+ memcpy(&dst, &tuple->dst.v6, sizeof(struct in6_addr));
|
|
|
|
if (!inet_ntop(AF_INET6, &src, tmp, sizeof(tmp)))
|
|
return -1;
|
|
diff --git a/src/conntrack/snprintf_xml.c b/src/conntrack/snprintf_xml.c
|
|
index 9f7f388..0bd4443 100644
|
|
--- a/src/conntrack/snprintf_xml.c
|
|
+++ b/src/conntrack/snprintf_xml.c
|
|
@@ -100,7 +100,7 @@ static int __snprintf_ipv6_xml(char *buf,
|
|
static char tmp[INET6_ADDRSTRLEN];
|
|
const void *p = (type == __ADDR_SRC) ? &tuple->src.v6 : &tuple->dst.v6;
|
|
|
|
- memcpy(&addr.in6_u, p, sizeof(struct in6_addr));
|
|
+ memcpy(&addr, p, sizeof(struct in6_addr));
|
|
|
|
if (!inet_ntop(AF_INET6, &addr, tmp, sizeof(tmp)))
|
|
return -1;
|
|
diff --git a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c
|
|
index b0c7a3f..5f173f3 100644
|
|
--- a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c
|
|
+++ b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c
|
|
@@ -48,8 +48,8 @@ static int print_proto(char *buf, struct nfct_tuple *tuple)
|
|
char tmp[INET6_ADDRSTRLEN];
|
|
int size;
|
|
|
|
- memcpy(&src.in6_u, tuple->src.v6, sizeof(struct in6_addr));
|
|
- memcpy(&dst.in6_u, tuple->dst.v6, sizeof(struct in6_addr));
|
|
+ memcpy(&src, tuple->src.v6, sizeof(struct in6_addr));
|
|
+ memcpy(&dst, tuple->dst.v6, sizeof(struct in6_addr));
|
|
|
|
if (!inet_ntop(AF_INET6, &src, tmp, sizeof(tmp)))
|
|
return 0;
|