summaryrefslogtreecommitdiffstats
path: root/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c
diff options
context:
space:
mode:
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
commitea5ae395bef0188a0f3d85444e9ae7abb611e051 (patch)
treea470a02a019a7f3f5a887e7e5a9726a280abf957 /src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c
parent7f9112dc9b40a7cb952d2d5927cae12cbb35960a (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/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c')
-rw-r--r--src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c
index b0c7a3f..1b6b909 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;
@@ -97,7 +97,7 @@ static int compare(struct nfct_conntrack *ct1,
return 1;
}
-static struct nfct_l3proto ipv6 = {
+struct nfct_l3proto ipv6 = {
.name = "ipv6",
.protonum = AF_INET6,
.parse_proto = parse_proto,
@@ -106,10 +106,3 @@ static struct nfct_l3proto ipv6 = {
.compare = compare,
.version = VERSION
};
-
-static void __attribute__ ((constructor)) init(void);
-
-static void init(void)
-{
- nfct_register_l3proto(&ipv6);
-}