diff options
| author | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2008-02-22 22:59:18 +0000 |
|---|---|---|
| committer | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2008-02-22 22:59:18 +0000 |
| commit | ea5ae395bef0188a0f3d85444e9ae7abb611e051 (patch) | |
| tree | a470a02a019a7f3f5a887e7e5a9726a280abf957 /src/conntrack | |
| parent | 7f9112dc9b40a7cb952d2d5927cae12cbb35960a (diff) | |
- fix broken 'deprecated backward compatibility'svn_t_libnetfilter_conntrack-0.0.89
- fix glibc 2.7.20 compilation (based on patch from Paul P. Konkoff)
Diffstat (limited to 'src/conntrack')
| -rw-r--r-- | src/conntrack/snprintf_default.c | 4 | ||||
| -rw-r--r-- | src/conntrack/snprintf_xml.c | 2 |
2 files changed, 3 insertions, 3 deletions
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; |