aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-01-27 19:02:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-01-27 19:02:38 +0000
commit8193bbe59a74d34d6a26d4a8cb857b1952905314 (patch)
treeea7319fb6ab7501c5401ce677b86142b1cf22d00
parent156a6e799914faefbf9935d9eb5309b2283d2e23 (diff)
downloadupstream-8193bbe59a74d34d6a26d4a8cb857b1952905314.tar.gz
upstream-8193bbe59a74d34d6a26d4a8cb857b1952905314.tar.bz2
upstream-8193bbe59a74d34d6a26d4a8cb857b1952905314.zip
netfilter: add support for flushing conntrack via /proc
SVN-Revision: 35330
-rw-r--r--target/linux/generic/patches-3.3/604-netfilter_conntrack_flush.patch46
-rw-r--r--target/linux/generic/patches-3.6/604-netfilter_conntrack_flush.patch46
-rw-r--r--target/linux/generic/patches-3.7/604-netfilter_conntrack_flush.patch46
-rw-r--r--target/linux/generic/patches-3.8/604-netfilter_conntrack_flush.patch46
4 files changed, 184 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.3/604-netfilter_conntrack_flush.patch b/target/linux/generic/patches-3.3/604-netfilter_conntrack_flush.patch
new file mode 100644
index 0000000000..cbcd29ac39
--- /dev/null
+++ b/target/linux/generic/patches-3.3/604-netfilter_conntrack_flush.patch
@@ -0,0 +1,46 @@
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -267,10 +267,34 @@ static int ct_open(struct inode *inode,
+ sizeof(struct ct_iter_state));
+ }
+
++static int kill_all(struct nf_conn *i, void *data)
++{
++ return 1;
++}
++
++static ssize_t ct_file_write(struct file *file, const char __user *buf,
++ size_t count, loff_t *ppos)
++{
++ struct seq_file *seq = file->private_data;
++ struct net *net = seq_file_net(seq);
++
++ if (count) {
++ char c;
++
++ if (get_user(c, buf))
++ return -EFAULT;
++
++ if (c == 'f')
++ nf_ct_iterate_cleanup(net, kill_all, NULL);
++ }
++ return count;
++}
++
+ static const struct file_operations ct_file_ops = {
+ .owner = THIS_MODULE,
+ .open = ct_open,
+ .read = seq_read,
++ .write = ct_file_write,
+ .llseek = seq_lseek,
+ .release = seq_release_net,
+ };
+@@ -372,7 +396,7 @@ static int nf_conntrack_standalone_init_
+ {
+ struct proc_dir_entry *pde;
+
+- pde = proc_net_fops_create(net, "nf_conntrack", 0440, &ct_file_ops);
++ pde = proc_net_fops_create(net, "nf_conntrack", 0660, &ct_file_ops);
+ if (!pde)
+ goto out_nf_conntrack;
+
diff --git a/target/linux/generic/patches-3.6/604-netfilter_conntrack_flush.patch b/target/linux/generic/patches-3.6/604-netfilter_conntrack_flush.patch
new file mode 100644
index 0000000000..cbcd29ac39
--- /dev/null
+++ b/target/linux/generic/patches-3.6/604-netfilter_conntrack_flush.patch
@@ -0,0 +1,46 @@
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -267,10 +267,34 @@ static int ct_open(struct inode *inode,
+ sizeof(struct ct_iter_state));
+ }
+
++static int kill_all(struct nf_conn *i, void *data)
++{
++ return 1;
++}
++
++static ssize_t ct_file_write(struct file *file, const char __user *buf,
++ size_t count, loff_t *ppos)
++{
++ struct seq_file *seq = file->private_data;
++ struct net *net = seq_file_net(seq);
++
++ if (count) {
++ char c;
++
++ if (get_user(c, buf))
++ return -EFAULT;
++
++ if (c == 'f')
++ nf_ct_iterate_cleanup(net, kill_all, NULL);
++ }
++ return count;
++}
++
+ static const struct file_operations ct_file_ops = {
+ .owner = THIS_MODULE,
+ .open = ct_open,
+ .read = seq_read,
++ .write = ct_file_write,
+ .llseek = seq_lseek,
+ .release = seq_release_net,
+ };
+@@ -372,7 +396,7 @@ static int nf_conntrack_standalone_init_
+ {
+ struct proc_dir_entry *pde;
+
+- pde = proc_net_fops_create(net, "nf_conntrack", 0440, &ct_file_ops);
++ pde = proc_net_fops_create(net, "nf_conntrack", 0660, &ct_file_ops);
+ if (!pde)
+ goto out_nf_conntrack;
+
diff --git a/target/linux/generic/patches-3.7/604-netfilter_conntrack_flush.patch b/target/linux/generic/patches-3.7/604-netfilter_conntrack_flush.patch
new file mode 100644
index 0000000000..cbcd29ac39
--- /dev/null
+++ b/target/linux/generic/patches-3.7/604-netfilter_conntrack_flush.patch
@@ -0,0 +1,46 @@
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -267,10 +267,34 @@ static int ct_open(struct inode *inode,
+ sizeof(struct ct_iter_state));
+ }
+
++static int kill_all(struct nf_conn *i, void *data)
++{
++ return 1;
++}
++
++static ssize_t ct_file_write(struct file *file, const char __user *buf,
++ size_t count, loff_t *ppos)
++{
++ struct seq_file *seq = file->private_data;
++ struct net *net = seq_file_net(seq);
++
++ if (count) {
++ char c;
++
++ if (get_user(c, buf))
++ return -EFAULT;
++
++ if (c == 'f')
++ nf_ct_iterate_cleanup(net, kill_all, NULL);
++ }
++ return count;
++}
++
+ static const struct file_operations ct_file_ops = {
+ .owner = THIS_MODULE,
+ .open = ct_open,
+ .read = seq_read,
++ .write = ct_file_write,
+ .llseek = seq_lseek,
+ .release = seq_release_net,
+ };
+@@ -372,7 +396,7 @@ static int nf_conntrack_standalone_init_
+ {
+ struct proc_dir_entry *pde;
+
+- pde = proc_net_fops_create(net, "nf_conntrack", 0440, &ct_file_ops);
++ pde = proc_net_fops_create(net, "nf_conntrack", 0660, &ct_file_ops);
+ if (!pde)
+ goto out_nf_conntrack;
+
diff --git a/target/linux/generic/patches-3.8/604-netfilter_conntrack_flush.patch b/target/linux/generic/patches-3.8/604-netfilter_conntrack_flush.patch
new file mode 100644
index 0000000000..d7f1bd4947
--- /dev/null
+++ b/target/linux/generic/patches-3.8/604-netfilter_conntrack_flush.patch
@@ -0,0 +1,46 @@
+--- a/net/netfilter/nf_conntrack_standalone.c
++++ b/net/netfilter/nf_conntrack_standalone.c
+@@ -261,10 +261,34 @@ static int ct_open(struct inode *inode,
+ sizeof(struct ct_iter_state));
+ }
+
++static int kill_all(struct nf_conn *i, void *data)
++{
++ return 1;
++}
++
++static ssize_t ct_file_write(struct file *file, const char __user *buf,
++ size_t count, loff_t *ppos)
++{
++ struct seq_file *seq = file->private_data;
++ struct net *net = seq_file_net(seq);
++
++ if (count) {
++ char c;
++
++ if (get_user(c, buf))
++ return -EFAULT;
++
++ if (c == 'f')
++ nf_ct_iterate_cleanup(net, kill_all, NULL);
++ }
++ return count;
++}
++
+ static const struct file_operations ct_file_ops = {
+ .owner = THIS_MODULE,
+ .open = ct_open,
+ .read = seq_read,
++ .write = ct_file_write,
+ .llseek = seq_lseek,
+ .release = seq_release_net,
+ };
+@@ -366,7 +390,7 @@ static int nf_conntrack_standalone_init_
+ {
+ struct proc_dir_entry *pde;
+
+- pde = proc_net_fops_create(net, "nf_conntrack", 0440, &ct_file_ops);
++ pde = proc_net_fops_create(net, "nf_conntrack", 0660, &ct_file_ops);
+ if (!pde)
+ goto out_nf_conntrack;
+