projects
/
lede.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
19233de
)
fix some netfilter extensions on 2.6.25
author
Gabor Juhos
<juhosg@openwrt.org>
Wed, 30 Apr 2008 15:09:56 +0000
(15:09 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Wed, 30 Apr 2008 15:09:56 +0000
(15:09 +0000)
SVN-Revision: 10991
target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
patch
|
blob
|
history
diff --git
a/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
b/target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
index a77f04c244b6625fd8fa393ea273ea73d84e95ef..e933bc601b7da3fb76cc5661e0ed8e5e2063d53a 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
+++ b/
target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
@@
-122,7
+122,7
@@
Index: linux-2.6.23-rc6/net/ipv4/netfilter/ipt_time.c
+
+ /* First, check that we are in the correct hooks */
+ if (hook_mask
+
+ /* First, check that we are in the correct hooks */
+ if (hook_mask
-+ & ~((1 << NF_I
P_PRE_ROUTING) | (1 << NF_IP_LOCAL_IN) | (1 << NF_IP_FORWARD) | (1 << NF_IP
_LOCAL_OUT)))
++ & ~((1 << NF_I
NET_PRE_ROUTING) | (1 << NF_INET_LOCAL_IN) | (1 << NF_INET_FORWARD) | (1 << NF_INET
_LOCAL_OUT)))
+ {
+ printk("ipt_time: error, only valid for PRE_ROUTING, LOCAL_IN, FORWARD and OUTPUT)\n");
+ return 0;
+ {
+ printk("ipt_time: error, only valid for PRE_ROUTING, LOCAL_IN, FORWARD and OUTPUT)\n");
+ return 0;
diff --git
a/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch
b/target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch
index 38b50004ebf939129b603782a166687969e53475..a5c42fc64163b8dc87248b3975763a8e6f420170 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch
+++ b/
target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch
@@
-271,7
+271,7
@@
Index: linux-2.6.24/net/netfilter/xt_CHAOS.c
+
+ /* TARPIT/DELUDE may not be called from the OUTPUT chain */
+ if (iph->protocol == IPPROTO_TCP &&
+
+ /* TARPIT/DELUDE may not be called from the OUTPUT chain */
+ if (iph->protocol == IPPROTO_TCP &&
-+ info->variant != XTCHAOS_NORMAL && hooknum != NF_I
P
_LOCAL_OUT)
++ info->variant != XTCHAOS_NORMAL && hooknum != NF_I
NET
_LOCAL_OUT)
+ xt_chaos_total(info, skb, in, out, hooknum);
+
+ return NF_DROP;
+ xt_chaos_total(info, skb, in, out, hooknum);
+
+ return NF_DROP;
@@
-300,8
+300,8
@@
Index: linux-2.6.24/net/netfilter/xt_CHAOS.c
+ .name = "CHAOS",
+ .family = AF_INET,
+ .table = "filter",
+ .name = "CHAOS",
+ .family = AF_INET,
+ .table = "filter",
-+ .hooks = (1 << NF_I
P_LOCAL_IN) | (1 << NF_IP
_FORWARD) |
-+ (1 << NF_I
P
_LOCAL_OUT),
++ .hooks = (1 << NF_I
NET_LOCAL_IN) | (1 << NF_INET
_FORWARD) |
++ (1 << NF_I
NET
_LOCAL_OUT),
+ .checkentry = chaos_tg_check,
+ .target = chaos_tg,
+ .targetsize = sizeof(struct xt_chaos_target_info),
+ .checkentry = chaos_tg_check,
+ .target = chaos_tg,
+ .targetsize = sizeof(struct xt_chaos_target_info),
@@
-507,10
+507,10
@@
Index: linux-2.6.24/net/netfilter/xt_DELUDE.c
+
+ addr_type = RTN_UNSPEC;
+#ifdef CONFIG_BRIDGE_NETFILTER
+
+ addr_type = RTN_UNSPEC;
+#ifdef CONFIG_BRIDGE_NETFILTER
-+ if (hook != NF_I
P
_FORWARD || (nskb->nf_bridge != NULL &&
++ if (hook != NF_I
NET
_FORWARD || (nskb->nf_bridge != NULL &&
+ nskb->nf_bridge->mask & BRNF_BRIDGED))
+#else
+ nskb->nf_bridge->mask & BRNF_BRIDGED))
+#else
-+ if (hook != NF_I
P
_FORWARD)
++ if (hook != NF_I
NET
_FORWARD)
+#endif
+ addr_type = RTN_LOCAL;
+
+#endif
+ addr_type = RTN_LOCAL;
+
@@
-532,7
+532,7
@@
Index: linux-2.6.24/net/netfilter/xt_DELUDE.c
+
+ nf_ct_attach(nskb, oldskb);
+
+
+ nf_ct_attach(nskb, oldskb);
+
-+ NF_HOOK(PF_INET, NF_I
P
_LOCAL_OUT, nskb, NULL, nskb->dst->dev,
++ NF_HOOK(PF_INET, NF_I
NET
_LOCAL_OUT, nskb, NULL, nskb->dst->dev,
+ dst_output);
+ return;
+
+ dst_output);
+ return;
+
@@
-555,7
+555,7
@@
Index: linux-2.6.24/net/netfilter/xt_DELUDE.c
+ .name = "DELUDE",
+ .family = AF_INET,
+ .table = "filter",
+ .name = "DELUDE",
+ .family = AF_INET,
+ .table = "filter",
-+ .hooks = (1 << NF_I
P_LOCAL_IN) | (1 << NF_IP
_FORWARD),
++ .hooks = (1 << NF_I
NET_LOCAL_IN) | (1 << NF_INET
_FORWARD),
+ .target = delude_tg,
+ .proto = IPPROTO_TCP,
+ .me = THIS_MODULE,
+ .target = delude_tg,
+ .proto = IPPROTO_TCP,
+ .me = THIS_MODULE,
diff --git
a/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
b/target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
index f5f5589ff4e32966019344026e3f3833865da8af..e08900a46b6626e365548dad6648c11db2a26146 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
+++ b/
target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
@@
-218,7
+218,7
@@
Index: linux-2.6.23/net/netfilter/xt_TARPIT.c
+ fl.nl_u.ip4_u.tos = RT_TOS(niph->tos) | RTO_CONN;
+ fl.oif = 0;
+
+ fl.nl_u.ip4_u.tos = RT_TOS(niph->tos) | RTO_CONN;
+ fl.oif = 0;
+
-+ if (ip_route_output_key(&nrt, &fl))
++ if (ip_route_output_key(&
init_net, &
nrt, &fl))
+ goto free_nskb;
+
+ dst_release(nskb->dst);
+ goto free_nskb;
+
+ dst_release(nskb->dst);
@@
-279,7
+279,7
@@
Index: linux-2.6.23/net/netfilter/xt_TARPIT.c
+ if (iph->frag_off & htons(IP_OFFSET))
+ return NF_DROP;
+
+ if (iph->frag_off & htons(IP_OFFSET))
+ return NF_DROP;
+
-+ tarpit_tcp(skb, rt, hooknum == NF_I
P
_LOCAL_IN);
++ tarpit_tcp(skb, rt, hooknum == NF_I
NET
_LOCAL_IN);
+ return NF_DROP;
+}
+
+ return NF_DROP;
+}
+
@@
-289,11
+289,11
@@
Index: linux-2.6.23/net/netfilter/xt_TARPIT.c
+{
+ bool invalid;
+
+{
+ bool invalid;
+
-+ if (strcmp(tablename, "raw") == 0 && hook_mask == NF_I
P
_PRE_ROUTING)
++ if (strcmp(tablename, "raw") == 0 && hook_mask == NF_I
NET
_PRE_ROUTING)
+ return true;
+ if (strcmp(tablename, "filter") != 0)
+ return false;
+ return true;
+ if (strcmp(tablename, "filter") != 0)
+ return false;
-+ invalid = hook_mask & ~((1 << NF_I
P_LOCAL_IN) | (1 << NF_IP
_FORWARD));
++ invalid = hook_mask & ~((1 << NF_I
NET_LOCAL_IN) | (1 << NF_INET
_FORWARD));
+ return !invalid;
+}
+
+ return !invalid;
+}
+
diff --git
a/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
b/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
index 56d0b7df25e8f888223fed0885899c247b9a309c..c5a3f67526175db6e0115ac7382980d73979f969 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
+++ b/
target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
@@
-1340,7
+1340,7
@@
Index: linux-2.6.23-rc9/net/ipv4/netfilter/nf_nat_rtsp.c
+ mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
+ mr.range[0].min_ip = mr.range[0].max_ip = newip;
+
+ mr.range[0].flags = IP_NAT_RANGE_MAP_IPS;
+ mr.range[0].min_ip = mr.range[0].max_ip = newip;
+
-+ nf_nat_setup_info(ct, &mr.range[0], NF_I
P
_PRE_ROUTING);
++ nf_nat_setup_info(ct, &mr.range[0], NF_I
NET
_PRE_ROUTING);
+}
+
+
+}
+
+