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-02 04:35:05 +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-02 04:35:05 +0000 |
| commit | 6f7bc84fb819e87a9145394b0e08fd194b1497da (patch) | |
| tree | 01148959534277e1135231e08676c822f709c3df /include | |
| parent | c66ed8fdb8b64fcb8973f6b60a9696b59ba29ee6 (diff) | |
| download | conntrack-tools-6f7bc84fb819e87a9145394b0e08fd194b1497da.tar.gz conntrack-tools-6f7bc84fb819e87a9145394b0e08fd194b1497da.zip | |
add IPv6 support to conntrackd
Diffstat (limited to 'include')
| -rw-r--r-- | include/cache.h | 2 | ||||
| -rw-r--r-- | include/ignore.h | 5 | ||||
| -rw-r--r-- | include/mcast.h | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/cache.h b/include/cache.h index a2b2005..f5afbe5 100644 --- a/include/cache.h +++ b/include/cache.h @@ -75,7 +75,7 @@ struct cache_extra { struct nf_conntrack; -struct cache *cache_create(const char *name, unsigned int features, uint8_t proto, struct cache_extra *extra); +struct cache *cache_create(const char *name, unsigned int features, struct cache_extra *extra); void cache_destroy(struct cache *e); struct us_conntrack *cache_add(struct cache *c, struct nf_conntrack *ct); diff --git a/include/ignore.h b/include/ignore.h index efb375d..e5e96ff 100644 --- a/include/ignore.h +++ b/include/ignore.h @@ -7,11 +7,12 @@ struct nf_conntrack; struct ignore_pool { struct hashtable *h; + struct hashtable *h6; }; -struct ignore_pool *ignore_pool_create(uint8_t family); +struct ignore_pool *ignore_pool_create(void); void ignore_pool_destroy(struct ignore_pool *ip); -int ignore_pool_add(struct ignore_pool *ip, void *data); +int ignore_pool_add(struct ignore_pool *ip, void *data, uint8_t family); int ignore_pool_test(struct ignore_pool *ip, struct nf_conntrack *ct); #endif diff --git a/include/mcast.h b/include/mcast.h index 4e89c72..c2fd3ec 100644 --- a/include/mcast.h +++ b/include/mcast.h @@ -16,7 +16,7 @@ struct mcast_conf { } in; union { struct in_addr interface_addr; - struct in6_addr interface_addr6; + unsigned int interface_index6; } ifa; int mtu; char iface[IFNAMSIZ]; @@ -34,6 +34,7 @@ struct mcast_sock { struct sockaddr_in ipv4; struct sockaddr_in6 ipv6; } addr; + socklen_t sockaddr_len; struct mcast_stats stats; }; |