diff options
Diffstat (limited to 'src/deprecated')
6 files changed, 8 insertions, 50 deletions
diff --git a/src/deprecated/extensions/libnetfilter_conntrack_icmp.c b/src/deprecated/extensions/libnetfilter_conntrack_icmp.c index 72a7eb0..ae8470a 100644 --- a/src/deprecated/extensions/libnetfilter_conntrack_icmp.c +++ b/src/deprecated/extensions/libnetfilter_conntrack_icmp.c @@ -72,7 +72,7 @@ static int compare(struct nfct_conntrack *ct1, return 1; } -static struct nfct_proto icmp = { +struct nfct_proto icmp = { .name = "icmp", .protonum = IPPROTO_ICMP, .parse_proto = parse_proto, @@ -81,10 +81,3 @@ static struct nfct_proto icmp = { .compare = compare, .version = VERSION }; - -static void __attribute__ ((constructor)) init(void); - -static void init(void) -{ - nfct_register_proto(&icmp); -} diff --git a/src/deprecated/extensions/libnetfilter_conntrack_sctp.c b/src/deprecated/extensions/libnetfilter_conntrack_sctp.c index 3785c2e..6225ca1 100644 --- a/src/deprecated/extensions/libnetfilter_conntrack_sctp.c +++ b/src/deprecated/extensions/libnetfilter_conntrack_sctp.c @@ -80,7 +80,7 @@ static int compare(struct nfct_conntrack *ct1, return 1; } -static struct nfct_proto sctp = { +struct nfct_proto sctp = { .name = "sctp", .protonum = IPPROTO_SCTP, .parse_proto = parse_proto, @@ -91,10 +91,3 @@ static struct nfct_proto sctp = { .compare = compare, .version = VERSION }; - -static void __attribute__ ((constructor)) init(void); - -static void init(void) -{ - nfct_register_proto(&sctp); -} diff --git a/src/deprecated/extensions/libnetfilter_conntrack_tcp.c b/src/deprecated/extensions/libnetfilter_conntrack_tcp.c index 9efdbb7..a7ce2ce 100644 --- a/src/deprecated/extensions/libnetfilter_conntrack_tcp.c +++ b/src/deprecated/extensions/libnetfilter_conntrack_tcp.c @@ -121,7 +121,7 @@ static int compare(struct nfct_conntrack *ct1, return 1; } -static struct nfct_proto tcp = { +struct nfct_proto tcp = { .name = "tcp", .protonum = IPPROTO_TCP, .parse_protoinfo = parse_protoinfo, @@ -133,10 +133,3 @@ static struct nfct_proto tcp = { .compare = compare, .version = VERSION }; - -static void __attribute__ ((constructor)) init(void); - -static void init(void) -{ - nfct_register_proto(&tcp); -} diff --git a/src/deprecated/extensions/libnetfilter_conntrack_udp.c b/src/deprecated/extensions/libnetfilter_conntrack_udp.c index c1d20c3..b20ba04 100644 --- a/src/deprecated/extensions/libnetfilter_conntrack_udp.c +++ b/src/deprecated/extensions/libnetfilter_conntrack_udp.c @@ -66,7 +66,7 @@ static int compare(struct nfct_conntrack *ct1, return 1; } -static struct nfct_proto udp = { +struct nfct_proto udp = { .name = "udp", .protonum = IPPROTO_UDP, .build_tuple_proto = build_tuple_proto, @@ -75,10 +75,3 @@ static struct nfct_proto udp = { .compare = compare, .version = VERSION, }; - -static void __attribute__ ((constructor)) init(void); - -static void init(void) -{ - nfct_register_proto(&udp); -} diff --git a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c index 727ea01..8e8c681 100644 --- a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c +++ b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c @@ -76,7 +76,7 @@ static int compare(struct nfct_conntrack *ct1, return 1; } -static struct nfct_l3proto ipv4 = { +struct nfct_l3proto ipv4 = { .name = "ipv4", .protonum = AF_INET, .parse_proto = parse_proto, @@ -85,10 +85,3 @@ static struct nfct_l3proto ipv4 = { .compare = compare, .version = VERSION }; - -static void __attribute__ ((constructor)) init(void); - -static void init(void) -{ - nfct_register_l3proto(&ipv4); -} 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); -} |