diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-08-10 10:17:03 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-08-10 10:17:03 +0000 |
| commit | 77989fe8ab8354477e8c366e9586c77d53964ac4 (patch) | |
| tree | bc68350185c345d0ea978ce2424f36536c74687d /target/linux/generic | |
| parent | 5ce79d130e5a457862df8e21bf694102635766d7 (diff) | |
| download | upstream-77989fe8ab8354477e8c366e9586c77d53964ac4.tar.gz upstream-77989fe8ab8354477e8c366e9586c77d53964ac4.tar.bz2 upstream-77989fe8ab8354477e8c366e9586c77d53964ac4.zip | |
BB: netfilter: consider reply direction on selective flushing
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Backport of r42095
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42096 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch b/target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch index 1b5e2abbec..dd31f999a2 100644 --- a/target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch +++ b/target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch @@ -8,7 +8,7 @@ #include <net/net_namespace.h> #ifdef CONFIG_SYSCTL #include <linux/sysctl.h> -@@ -268,10 +269,63 @@ static int ct_open(struct inode *inode, +@@ -268,10 +269,66 @@ static int ct_open(struct inode *inode, sizeof(struct ct_iter_state)); } @@ -20,16 +20,19 @@ +static int kill_matching(struct nf_conn *i, void *data) +{ + struct kill_request *kr = data; -+ struct nf_conntrack_tuple *t = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple; ++ struct nf_conntrack_tuple *t1 = &i->tuplehash[IP_CT_DIR_ORIGINAL].tuple; ++ struct nf_conntrack_tuple *t2 = &i->tuplehash[IP_CT_DIR_REPLY].tuple; + + if (!kr->family) + return 1; + -+ if (t->src.l3num != kr->family) ++ if (t1->src.l3num != kr->family) + return 0; + -+ return (nf_inet_addr_cmp(&kr->addr, &t->src.u3) || -+ nf_inet_addr_cmp(&kr->addr, &t->dst.u3)); ++ return (nf_inet_addr_cmp(&kr->addr, &t1->src.u3) || ++ nf_inet_addr_cmp(&kr->addr, &t1->dst.u3) || ++ nf_inet_addr_cmp(&kr->addr, &t2->src.u3) || ++ nf_inet_addr_cmp(&kr->addr, &t2->dst.u3)); +} + +static ssize_t ct_file_write(struct file *file, const char __user *buf, @@ -72,7 +75,7 @@ .llseek = seq_lseek, .release = seq_release_net, }; -@@ -373,7 +427,7 @@ static int nf_conntrack_standalone_init_ +@@ -373,7 +430,7 @@ static int nf_conntrack_standalone_init_ { struct proc_dir_entry *pde; |