Changeset 12420

Timestamp:

06/30/2009 05:16:49 PM (4 months ago)

Author:

BrainSlayer

Message:

conntrack flush for 2.6

Files:

• src/linux/rt2880/linux-2.6.23/net/ipv4/netfilter/ip_tables.c (modified) (6 diffs)
• src/linux/rt2880/linux-2.6.23/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c (modified) (4 diffs)

src/linux/rt2880/linux-2.6.23/net/ipv4/netfilter/ip_tables.c

@@ -87 +87 @@
-#define FWINV(bool,invflg) ((bool) ^ !!(ipinfo->invflags & invflg))
-
-        if (ipinfo->flags & IPT_F_NO_DEF_MATCH)
-                return true;
-
-        if (FWINV((ip->saddr&ipinfo->smsk.s_addr) != ipinfo->src.s_addr,
-                  IPT_INV_SRCIP)
@@ -152 +149 @@
-                return 0;
-        }
-#undef FWINV
-
-        return 1;
@@ -158 +154 @@
-
-static inline bool
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                duprintf("Unknown flag bits set: %08X\n",
-                         ip->flags & ~IPT_F_MASK);
@@ -191 +166 @@
-                return false;
-        }
-#undef FWINV
-        return true;
-}
@@ -357 +331 @@
-        struct xt_table_info *private;
-
+        /* Initialization */
-        ip = ip_hdr(*pskb);
-
-        read_lock_bh(&table->lock);
-        IP_NF_ASSERT(table->valid_hooks & (1 << hook));
-        private = table->private;
-        table_base = (void *)private->entries[smp_processor_id()];
-        e = get_entry(table_base, private->hook_entry[hook]);
-        if (e->target_offset <= sizeof(struct ipt_entry) &&
-                (e->ip.flags & IPT_F_NO_DEF_MATCH)) {
-                        struct ipt_entry_target *t = ipt_get_target(e);
-                        if (!t->u.kernel.target->target) {
-                                int v = ((struct ipt_standard_target *)t)->verdict;
-                                if ((v < 0) && (v != IPT_RETURN)) {
-                                        ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1);
-                                        read_unlock_bh(&table->lock);
-                                        return (unsigned)(-v) - 1;
-                                }
-                        }
-        }
-
-        /* Initialization */
-        datalen = (*pskb)->len - ip->ihl * 4;
-        indev = in ? in->name : nulldevname;
@@ -389 +344 @@
-        offset = ntohs(ip->frag_off) & IP_OFFSET;
-
-/*
+
-        IP_NF_ASSERT(table->valid_hooks & (1 << hook));
-        private = table->private;
-        table_base = (void *)private->entries[smp_processor_id()];
-        e = get_entry(table_base, private->hook_entry[hook]);
-
+
-        /* For return from builtin chain */
-        back = get_entry(table_base, private->underflow[hook]);

src/linux/rt2880/linux-2.6.23/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c

@@ -199 +199 @@
-        .release = seq_release_private,
-};
+
+
-
-/* expects */
@@ -405 +407 @@
-};
-
+static int conntrack_flush(char *buffer, char **start, off_t offset, int length)
+{
+        nf_conntrack_flush();
+        return 0;
+}
+
-int __init nf_conntrack_ipv4_compat_init(void)
-{
@@ -410 +418 @@
-
-        proc = proc_net_fops_create("ip_conntrack", 0440, &ct_file_ops);
+        if (!proc)
+                goto err1;
+
+        proc = proc_net_create("ip_conntrack_flush", 0440, conntrack_flush);
-        if (!proc)
-                goto err1;
@@ -430 +442 @@
-        proc_net_remove("ip_conntrack_expect");
-err2:
+        proc_net_remove("ip_conntrack_flush");
-        proc_net_remove("ip_conntrack");
-err1: