rename death_by_timeout to ip_ct_death_by_timeout (1/4)
Subsystems (2)
PATCH 1/1 rename death_by_timeout to ip_ct_death_by_timeout (1/4)
Hi,
I changed the timer-update code in ip_ct_refresh() and then I found out that the pptp helper abuses it to kill a conntrack which won't work with my changes, the solution: change the pptp helper to do it correctly.
This first patch renames death_by_timeout to ip_ct_death_by_timeout and exports it in the core conntrack files. The pptp change will be included in the next patch.
Signature · 4 lines
/Martin Never argue with an idiot. They drag you down to their level, then beat you with experience.
include/linux/netfilter_ipv4/ip_conntrack.h renamed from include/linux/netfilter_ipv4/ip_conntrack.h.orig +3 -0
@@ -226,6 +226,9 @@extern void ip_ct_refresh (struct ip_conntrack *ct,unsigned long extra_jiffies); +/* Kill conntrack */ +extern void ip_ct_death_by_timeout (unsigned long ul_conntrack); +/* These are for NAT. Icky. */ /* Call me when a conntrack is destroyed. */ extern void (*ip_conntrack_destroyed)(struct ip_conntrack *conntrack);
net/ipv4/netfilter/ip_conntrack_core.c renamed from net/ipv4/netfilter/ip_conntrack_core.c.orig +4 -4
@@ -267,7 +267,7 @@atomic_dec (&ip_conntrack_count); } -static void death_by_timeout (unsigned long ul_conntrack) +void ip_ct_death_by_timeout (unsigned long ul_conntrack) {struct ip_conntrack *ct = (void *)ul_conntrack;
@@ -527,7 +527,7 @@return dropped;if (del_timer (&h->ctrack->timeout)) { -death_by_timeout ((unsigned long )h->ctrack); +ip_ct_death_by_timeout ((unsigned long )h->ctrack); dropped =1 ; }ip_conntrack_put (h->ctrack);
@@ -617,7 +617,7 @@/* Don't set timer yet: wait for confirmation */ init_timer (&conntrack->timeout); conntrack->timeout.data = (unsigned long )conntrack; - conntrack->timeout.function = death_by_timeout; + conntrack->timeout.function = ip_ct_death_by_timeout;INIT_LIST_HEAD (&conntrack->sibling_list);
@@ -1198,7 +1189,7 @@while ((h =get_next_corpse (kill, data)) !=NULL ) {/* Time to push up daises... */ if (del_timer (&h->ctrack->timeout)) -death_by_timeout ((unsigned long )h->ctrack); +ip_ct_death_by_timeout ((unsigned long )h->ctrack);/* ... else the timer will get him soon. */ ip_conntrack_put (h->ctrack);
net/ipv4/netfilter/ip_conntrack_standalone.c renamed from net/ipv4/netfilter/ip_conntrack_standalone.c.orig +1 -0
@@ -362,6 +362,7 @@EXPORT_SYMBOL (ip_conntrack_helper_unregister);EXPORT_SYMBOL (ip_ct_selective_cleanup);EXPORT_SYMBOL (ip_ct_refresh); +EXPORT_SYMBOL (ip_ct_death_by_timeout);EXPORT_SYMBOL (ip_ct_find_proto);EXPORT_SYMBOL (ip_ct_find_helper);EXPORT_SYMBOL (ip_conntrack_expect_related);