Author: pluto Date: Mon Sep 8 09:14:02 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- updated for 2.6.26.
---- Files affected:
SOURCES:
kernel-routes.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/kernel-routes.patch
diff -u SOURCES/kernel-routes.patch:1.1.2.1 SOURCES/kernel-routes.patch:1.1.2.2
--- SOURCES/kernel-routes.patch:1.1.2.1 Thu May 8 01:37:27 2008
+++ SOURCES/kernel-routes.patch Mon Sep 8 11:13:57 2008
@@ -1,7 +1,7 @@
-diff -urp v2.6.25/linux/include/linux/rtnetlink.h
linux/include/linux/rtnetlink.h
---- v2.6.25/linux/include/linux/rtnetlink.h 2008-04-17 09:58:08.000000000
+0300
-+++ linux/include/linux/rtnetlink.h 2008-04-19 18:30:04.000000000 +0300
-@@ -303,6 +303,8 @@ struct rtnexthop
+diff -urp v2.6.26/linux/include/linux/rtnetlink.h
linux/include/linux/rtnetlink.h
+--- v2.6.26/linux/include/linux/rtnetlink.h 2008-07-14 09:58:50.000000000
+0300
++++ linux/include/linux/rtnetlink.h 2008-07-16 09:15:57.000000000 +0300
+@@ -304,6 +304,8 @@ struct rtnexthop
#define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath)
*/
#define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */
#define RTNH_F_ONLINK 4 /* Gateway is forced on link */
@@ -10,9 +10,9 @@
/* Macros to handle hexthops */
-diff -urp v2.6.25/linux/include/net/flow.h linux/include/net/flow.h
---- v2.6.25/linux/include/net/flow.h 2008-04-17 09:58:08.000000000 +0300
-+++ linux/include/net/flow.h 2008-04-19 18:30:17.000000000 +0300
+diff -urp v2.6.26/linux/include/net/flow.h linux/include/net/flow.h
+--- v2.6.26/linux/include/net/flow.h 2008-04-17 09:58:08.000000000 +0300
++++ linux/include/net/flow.h 2008-07-16 09:16:29.000000000 +0300
@@ -19,6 +19,8 @@ struct flowi {
struct {
__be32 daddr;
@@ -31,9 +31,9 @@
#define fl4_tos nl_u.ip4_u.tos
#define fl4_scope nl_u.ip4_u.scope
-diff -urp v2.6.25/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
---- v2.6.25/linux/include/net/ip_fib.h 2008-04-17 09:58:08.000000000 +0300
-+++ linux/include/net/ip_fib.h 2008-04-19 18:30:04.000000000 +0300
+diff -urp v2.6.26/linux/include/net/ip_fib.h linux/include/net/ip_fib.h
+--- v2.6.26/linux/include/net/ip_fib.h 2008-04-17 09:58:08.000000000 +0300
++++ linux/include/net/ip_fib.h 2008-07-16 09:15:57.000000000 +0300
@@ -207,6 +207,8 @@ extern int fib_lookup(struct net *n, str
extern struct fib_table *fib_new_table(struct net *net, u32 id);
extern struct fib_table *fib_get_table(struct net *net, u32 id);
@@ -50,9 +50,9 @@
+extern rwlock_t fib_nhflags_lock;
+
#endif /* _NET_FIB_H */
-diff -urp v2.6.25/linux/include/net/netfilter/nf_nat.h
linux/include/net/netfilter/nf_nat.h
---- v2.6.25/linux/include/net/netfilter/nf_nat.h 2008-04-17
09:58:08.000000000 +0300
-+++ linux/include/net/netfilter/nf_nat.h 2008-04-19 18:30:17.000000000
+0300
+diff -urp v2.6.26/linux/include/net/netfilter/nf_nat.h
linux/include/net/netfilter/nf_nat.h
+--- v2.6.26/linux/include/net/netfilter/nf_nat.h 2008-04-17
09:58:08.000000000 +0300
++++ linux/include/net/netfilter/nf_nat.h 2008-07-16 09:16:29.000000000
+0300
@@ -77,6 +77,13 @@ struct nf_conn_nat
#endif
};
@@ -67,21 +67,21 @@
/* Set up the info structure to map into this range. */
extern unsigned int nf_nat_setup_info(struct nf_conn *ct,
const struct nf_nat_range *range,
-diff -urp v2.6.25/linux/include/net/route.h linux/include/net/route.h
---- v2.6.25/linux/include/net/route.h 2008-04-17 09:58:08.000000000 +0300
-+++ linux/include/net/route.h 2008-04-19 18:30:17.000000000 +0300
-@@ -117,6 +117,7 @@ extern int __ip_route_output_key(struct
+diff -urp v2.6.26/linux/include/net/route.h linux/include/net/route.h
+--- v2.6.26/linux/include/net/route.h 2008-07-14 09:58:50.000000000 +0300
++++ linux/include/net/route.h 2008-07-16 09:16:29.000000000 +0300
+@@ -116,6 +116,7 @@ extern int __ip_route_output_key(struct
extern int ip_route_output_key(struct net *, struct rtable **,
struct flowi *flp);
extern int ip_route_output_flow(struct net *, struct rtable **rp,
struct flowi *flp, struct sock *sk, int flags);
extern int ip_route_input(struct sk_buff*, __be32 dst, __be32 src,
u8 tos, struct net_device *devin);
+extern int ip_route_input_lookup(struct sk_buff*, __be32 dst,
__be32 src, u8 tos, struct net_device *devin, __be32 lsrc);
- extern unsigned short ip_rt_frag_needed(struct net *net, struct iphdr *iph,
unsigned short new_mtu);
+ extern unsigned short ip_rt_frag_needed(struct net *net, struct iphdr *iph,
unsigned short new_mtu, struct net_device *dev);
extern void ip_rt_send_redirect(struct sk_buff *skb);
-diff -urp v2.6.25/linux/net/bridge/br_netfilter.c
linux/net/bridge/br_netfilter.c
---- v2.6.25/linux/net/bridge/br_netfilter.c 2008-04-17 09:58:08.000000000
+0300
-+++ linux/net/bridge/br_netfilter.c 2008-04-19 18:30:17.000000000 +0300
-@@ -325,6 +325,10 @@ static int br_nf_pre_routing_finish(stru
+diff -urp v2.6.26/linux/net/bridge/br_netfilter.c
linux/net/bridge/br_netfilter.c
+--- v2.6.26/linux/net/bridge/br_netfilter.c 2008-07-14 09:58:50.000000000
+0300
++++ linux/net/bridge/br_netfilter.c 2008-07-16 09:16:29.000000000 +0300
+@@ -327,6 +327,10 @@ static int br_nf_pre_routing_finish(stru
struct nf_bridge_info *nf_bridge = skb->nf_bridge;
int err;
@@ -92,9 +92,9 @@
if (nf_bridge->mask & BRNF_PKT_TYPE) {
skb->pkt_type = PACKET_OTHERHOST;
nf_bridge->mask ^= BRNF_PKT_TYPE;
-diff -urp v2.6.25/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
---- v2.6.25/linux/net/ipv4/fib_frontend.c 2008-04-17 09:58:09.000000000
+0300
-+++ linux/net/ipv4/fib_frontend.c 2008-04-19 18:30:04.000000000 +0300
+diff -urp v2.6.26/linux/net/ipv4/fib_frontend.c linux/net/ipv4/fib_frontend.c
+--- v2.6.26/linux/net/ipv4/fib_frontend.c 2008-07-14 09:58:50.000000000
+0300
++++ linux/net/ipv4/fib_frontend.c 2008-07-16 09:15:57.000000000 +0300
@@ -49,6 +49,8 @@
#ifndef CONFIG_IP_MULTIPLE_TABLES
@@ -176,7 +176,7 @@
return ret;
last_resort:
-@@ -911,9 +923,7 @@ static int fib_inetaddr_event(struct not
+@@ -910,9 +922,7 @@ static int fib_inetaddr_event(struct not
switch (event) {
case NETDEV_UP:
fib_add_ifaddr(ifa);
@@ -186,7 +186,7 @@
rt_cache_flush(-1);
break;
case NETDEV_DOWN:
-@@ -949,9 +959,7 @@ static int fib_netdev_event(struct notif
+@@ -948,9 +958,7 @@ static int fib_netdev_event(struct notif
for_ifa(in_dev) {
fib_add_ifaddr(ifa);
} endfor_ifa(in_dev);
@@ -196,9 +196,9 @@
rt_cache_flush(-1);
break;
case NETDEV_DOWN:
-diff -urp v2.6.25/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
---- v2.6.25/linux/net/ipv4/fib_hash.c 2008-04-17 09:58:09.000000000 +0300
-+++ linux/net/ipv4/fib_hash.c 2008-04-19 18:30:04.000000000 +0300
+diff -urp v2.6.26/linux/net/ipv4/fib_hash.c linux/net/ipv4/fib_hash.c
+--- v2.6.26/linux/net/ipv4/fib_hash.c 2008-07-14 09:58:50.000000000 +0300
++++ linux/net/ipv4/fib_hash.c 2008-07-16 09:15:57.000000000 +0300
@@ -280,25 +280,35 @@ out:
static void
fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct
fib_result *res)
@@ -325,9 +325,9 @@
/*
* Insert new entry to the list.
-diff -urp v2.6.25/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
---- v2.6.25/linux/net/ipv4/fib_lookup.h 2008-04-17 09:58:09.000000000
+0300
-+++ linux/net/ipv4/fib_lookup.h 2008-04-19 18:30:04.000000000 +0300
+diff -urp v2.6.26/linux/net/ipv4/fib_lookup.h linux/net/ipv4/fib_lookup.h
+--- v2.6.26/linux/net/ipv4/fib_lookup.h 2008-04-17 09:58:09.000000000
+0300
++++ linux/net/ipv4/fib_lookup.h 2008-07-16 09:15:57.000000000 +0300
@@ -8,6 +8,7 @@
struct fib_alias {
struct list_head fa_list;
@@ -346,9 +346,9 @@
static inline void fib_result_assign(struct fib_result *res,
struct fib_info *fi)
-diff -urp v2.6.25/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
---- v2.6.25/linux/net/ipv4/fib_rules.c 2008-04-17 09:58:09.000000000 +0300
-+++ linux/net/ipv4/fib_rules.c 2008-04-19 18:30:04.000000000 +0300
+diff -urp v2.6.26/linux/net/ipv4/fib_rules.c linux/net/ipv4/fib_rules.c
+--- v2.6.26/linux/net/ipv4/fib_rules.c 2008-07-14 09:58:50.000000000 +0300
++++ linux/net/ipv4/fib_rules.c 2008-07-16 09:15:57.000000000 +0300
@@ -54,6 +54,11 @@ u32 fib_rules_tclass(struct fib_result *
}
#endif
@@ -361,9 +361,9 @@
int fib_lookup(struct net *net, struct flowi *flp, struct fib_result *res)
{
struct fib_lookup_arg arg = {
-diff -urp v2.6.25/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
---- v2.6.25/linux/net/ipv4/fib_semantics.c 2008-04-17 09:58:09.000000000
+0300
-+++ linux/net/ipv4/fib_semantics.c 2008-04-19 18:30:17.000000000 +0300
+diff -urp v2.6.26/linux/net/ipv4/fib_semantics.c linux/net/ipv4/fib_semantics.c
+--- v2.6.26/linux/net/ipv4/fib_semantics.c 2008-07-14 09:58:50.000000000
+0300
++++ linux/net/ipv4/fib_semantics.c 2008-07-16 09:16:29.000000000 +0300
@@ -52,6 +52,7 @@ static struct hlist_head *fib_info_hash;
static struct hlist_head *fib_info_laddrhash;
static unsigned int fib_hash_size;
@@ -372,7 +372,7 @@
#define DEVINDEX_HASHBITS 8
#define DEVINDEX_HASHSIZE (1U << DEVINDEX_HASHBITS)
-@@ -187,7 +188,7 @@ static __inline__ int nh_comp(const stru
+@@ -188,7 +189,7 @@ static __inline__ int nh_comp(const stru
#ifdef CONFIG_NET_CLS_ROUTE
nh->nh_tclassid != onh->nh_tclassid ||
#endif
@@ -381,7 +381,7 @@
return -1;
onh++;
} endfor_nexthops(fi);
-@@ -238,7 +239,7 @@ static struct fib_info *fib_find_info(co
+@@ -239,7 +240,7 @@ static struct fib_info *fib_find_info(co
nfi->fib_priority == fi->fib_priority &&
memcmp(nfi->fib_metrics, fi->fib_metrics,
sizeof(fi->fib_metrics)) == 0 &&
@@ -390,7 +390,7 @@
(nfi->fib_nhs == 0 || nh_comp(fi, nfi) == 0))
return fi;
}
-@@ -349,26 +350,70 @@ struct fib_alias *fib_find_alias(struct
+@@ -350,26 +351,70 @@ struct fib_alias *fib_find_alias(struct
}
int fib_detect_death(struct fib_info *fi, int order,
@@ -477,7 +477,7 @@
}
#ifdef CONFIG_IP_ROUTE_MULTIPATH
-@@ -540,8 +585,11 @@ static int fib_check_nh(struct fib_confi
+@@ -541,8 +586,11 @@ static int fib_check_nh(struct fib_confi
return -EINVAL;
if ((dev = __dev_get_by_index(net, nh->nh_oif)) == NULL)
return -ENODEV;
@@ -491,7 +491,7 @@
nh->nh_dev = dev;
dev_hold(dev);
nh->nh_scope = RT_SCOPE_LINK;
-@@ -561,24 +609,48 @@ static int fib_check_nh(struct fib_confi
+@@ -562,24 +610,48 @@ static int fib_check_nh(struct fib_confi
/* It is not necessary, but requires a bit of thinking
*/
if (fl.fl4_scope < RT_SCOPE_LINK)
fl.fl4_scope = RT_SCOPE_LINK;
@@ -556,7 +556,7 @@
} else {
struct in_device *in_dev;
-@@ -589,8 +661,11 @@ out:
+@@ -590,8 +662,11 @@ out:
if (in_dev == NULL)
return -ENODEV;
if (!(in_dev->dev->flags&IFF_UP)) {
@@ -570,7 +570,7 @@
}
nh->nh_dev = in_dev->dev;
dev_hold(nh->nh_dev);
-@@ -900,8 +975,12 @@ int fib_semantic_match(struct list_head
+@@ -901,8 +976,12 @@ int fib_semantic_match(struct list_head
for_nexthops(fi) {
if (nh->nh_flags&RTNH_F_DEAD)
continue;
@@ -585,7 +585,7 @@
}
#ifdef CONFIG_IP_ROUTE_MULTIPATH
if (nhsel < fi->fib_nhs) {
-@@ -1078,18 +1157,29 @@ int fib_sync_down_dev(struct net_device
+@@ -1082,18 +1161,29 @@ int fib_sync_down_dev(struct net_device
prev_fi = fi;
dead = 0;
change_nexthops(fi) {
@@ -623,7 +623,7 @@
}
#ifdef CONFIG_IP_ROUTE_MULTIPATH
if (force > 1 && nh->nh_dev == dev) {
-@@ -1107,11 +1197,8 @@ int fib_sync_down_dev(struct net_device
+@@ -1111,11 +1201,8 @@ int fib_sync_down_dev(struct net_device
return ret;
}
@@ -636,7 +636,7 @@
*/
int fib_sync_up(struct net_device *dev)
-@@ -1121,8 +1208,10 @@ int fib_sync_up(struct net_device *dev)
+@@ -1125,8 +1212,10 @@ int fib_sync_up(struct net_device *dev)
struct hlist_head *head;
struct hlist_node *node;
struct fib_nh *nh;
@@ -648,7 +648,7 @@
if (!(dev->flags&IFF_UP))
return 0;
-@@ -1130,6 +1219,7 @@ int fib_sync_up(struct net_device *dev)
+@@ -1134,6 +1223,7 @@ int fib_sync_up(struct net_device *dev)
hash = fib_devindex_hashfn(dev->ifindex);
head = &fib_info_devhash[hash];
ret = 0;
@@ -656,7 +656,7 @@
hlist_for_each_entry(nh, node, head, nh_hash) {
struct fib_info *fi = nh->nh_parent;
-@@ -1142,19 +1232,39 @@ int fib_sync_up(struct net_device *dev)
+@@ -1146,19 +1236,39 @@ int fib_sync_up(struct net_device *dev)
prev_fi = fi;
alive = 0;
change_nexthops(fi) {
@@ -676,7 +676,7 @@
+ .scope = nh->nh_scope } },
+ .oif = nh->nh_oif,
+ };
-+ if (fib_lookup(dev->nd_net, &fl, &res) != 0)
++ if (fib_lookup(dev_net(dev), &fl, &res) != 0)
+ continue;
+ if (res.type != RTN_UNICAST &&
+ res.type != RTN_LOCAL) {
@@ -699,7 +699,7 @@
} endfor_nexthops(fi)
if (alive > 0) {
-@@ -1162,10 +1272,14 @@ int fib_sync_up(struct net_device *dev)
+@@ -1166,10 +1276,14 @@ int fib_sync_up(struct net_device *dev)
ret++;
}
}
@@ -714,7 +714,7 @@
/*
The algorithm is suboptimal, but it provides really
fair weighted route distribution.
-@@ -1174,24 +1288,45 @@ int fib_sync_up(struct net_device *dev)
+@@ -1178,24 +1292,45 @@ int fib_sync_up(struct net_device *dev)
void fib_select_multipath(const struct flowi *flp, struct fib_result *res)
{
struct fib_info *fi = res->fi;
@@ -768,7 +768,7 @@
}
-@@ -1201,20 +1336,40 @@ void fib_select_multipath(const struct f
+@@ -1205,20 +1340,40 @@ void fib_select_multipath(const struct f
w = jiffies % fi->fib_power;
@@ -812,9 +812,130 @@
spin_unlock_bh(&fib_multipath_lock);
}
#endif
-diff -urp v2.6.25/linux/net/ipv4/netfilter/ipt_MASQUERADE.c
linux/net/ipv4/netfilter/ipt_MASQUERADE.c
---- v2.6.25/linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2008-04-17
09:58:09.000000000 +0300
-+++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2008-04-19 18:30:17.000000000
+0300
+diff -urp v2.6.26/linux/net/ipv4/fib_trie.c linux/net/ipv4/fib_trie.c
+--- v2.6.26/linux/net/ipv4/fib_trie.c 2008-07-14 09:58:50.000000000 +0300
++++ linux/net/ipv4/fib_trie.c 2008-07-16 09:15:57.000000000 +0300
+@@ -1263,6 +1263,7 @@ static int fn_trie_insert(struct fib_tab
+ fi_drop = fa->fa_info;
+ new_fa->fa_tos = fa->fa_tos;
+ new_fa->fa_info = fi;
++ new_fa->fa_last_dflt = -1;
+ new_fa->fa_type = cfg->fc_type;
+ new_fa->fa_scope = cfg->fc_scope;
+ state = fa->fa_state;
+@@ -1303,6 +1304,7 @@ static int fn_trie_insert(struct fib_tab
+ new_fa->fa_type = cfg->fc_type;
+ new_fa->fa_scope = cfg->fc_scope;
+ new_fa->fa_state = 0;
++ new_fa->fa_last_dflt = -1;
+ /*
+ * Insert new entry to the list.
+ */
+@@ -1804,24 +1806,31 @@ static void fn_trie_select_default(struc
+ struct fib_result *res)
+ {
+ struct trie *t = (struct trie *) tb->tb_data;
+- int order, last_idx;
++ int order, last_idx, last_dflt, last_nhsel;
++ struct fib_alias *first_fa = NULL;
+ struct fib_info *fi = NULL;
+ struct fib_info *last_resort;
+ struct fib_alias *fa = NULL;
+ struct list_head *fa_head;
+ struct leaf *l;
++ u32 key, mask;
+
++ last_dflt = -2;
++ last_nhsel = 0;
+ last_idx = -1;
+ last_resort = NULL;
+ order = -1;
+
++ mask = inet_make_mask(res->prefixlen);
++ key = ntohl(flp->fl4_dst & mask);
++
+ rcu_read_lock();
+
+- l = fib_find_node(t, 0);
++ l = fib_find_node(t, key);
+ if (!l)
+ goto out;
+
+- fa_head = get_fa_head(l, 0);
++ fa_head = get_fa_head(l, res->prefixlen);
+ if (!fa_head)
+ goto out;
+
+@@ -1835,39 +1844,52 @@ static void fn_trie_select_default(struc
+ fa->fa_type != RTN_UNICAST)
+ continue;
+
++ if (fa->fa_tos &&
++ fa->fa_tos != flp->fl4_tos)
++ continue;
+ if (next_fi->fib_priority > res->fi->fib_priority)
+ break;
+- if (!next_fi->fib_nh[0].nh_gw ||
+- next_fi->fib_nh[0].nh_scope != RT_SCOPE_LINK)
+- continue;
+ fa->fa_state |= FA_S_ACCESSED;
+
+- if (fi == NULL) {
+- if (next_fi != res->fi)
+- break;
+- } else if (!fib_detect_death(fi, order, &last_resort,
+- &last_idx, tb->tb_default)) {
++ if (!first_fa) {
++ last_dflt = fa->fa_last_dflt;
++ first_fa = fa;
++ }
++ if (fi && !fib_detect_death(fi, order, &last_resort,
++ &last_idx, &last_dflt, &last_nhsel, flp)) {
+ fib_result_assign(res, fi);
+- tb->tb_default = order;
++ first_fa->fa_last_dflt = order;
+ goto out;
+ }
+ fi = next_fi;
+ order++;
+ }
+ if (order <= 0 || fi == NULL) {
+- tb->tb_default = -1;
++ if (fi && fi->fib_nhs > 1 &&
++ fib_detect_death(fi, order, &last_resort, &last_idx,
++ &last_dflt, &last_nhsel, flp) &&
++ last_resort == fi) {
++ read_lock_bh(&fib_nhflags_lock);
++ fi->fib_nh[last_nhsel].nh_flags &= ~RTNH_F_SUSPECT;
++ read_unlock_bh(&fib_nhflags_lock);
++ }
++ if (first_fa) first_fa->fa_last_dflt = -1;
+ goto out;
+ }
+
+ if (!fib_detect_death(fi, order, &last_resort, &last_idx,
+- tb->tb_default)) {
++ &last_dflt, &last_nhsel, flp)) {
+ fib_result_assign(res, fi);
+- tb->tb_default = order;
++ first_fa->fa_last_dflt = order;
+ goto out;
+ }
+- if (last_idx >= 0)
++ if (last_idx >= 0) {
+ fib_result_assign(res, last_resort);
+- tb->tb_default = last_idx;
++ read_lock_bh(&fib_nhflags_lock);
++ last_resort->fib_nh[last_nhsel].nh_flags &= ~RTNH_F_SUSPECT;
++ read_unlock_bh(&fib_nhflags_lock);
++ first_fa->fa_last_dflt = last_idx;
++ }
+ out:
+ rcu_read_unlock();
+ }
+diff -urp v2.6.26/linux/net/ipv4/netfilter/ipt_MASQUERADE.c
linux/net/ipv4/netfilter/ipt_MASQUERADE.c
+--- v2.6.26/linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2008-07-14
09:58:50.000000000 +0300
++++ linux/net/ipv4/netfilter/ipt_MASQUERADE.c 2008-07-16 09:16:29.000000000
+0300
@@ -59,7 +59,7 @@ masquerade_tg(struct sk_buff *skb, const
enum ip_conntrack_info ctinfo;
struct nf_nat_range newrange;
@@ -828,7 +949,7 @@
return NF_ACCEPT;
mr = targinfo;
-- rt = (struct rtable *)skb->dst;
+- rt = skb->rtable;
- newsrc = inet_select_addr(out, rt->rt_gateway, RT_SCOPE_UNIVERSE);
- if (!newsrc) {
- printk("MASQUERADE: %s ate my IP address\n", out->name);
@@ -839,11 +960,11 @@
+ { .daddr = ip_hdr(skb)->daddr,
+ .tos =
(RT_TOS(ip_hdr(skb)->tos) |
+ RTO_CONN),
-+ .gw = ((struct rtable *)
skb->dst)->rt_gateway,
++ .gw = skb->rtable->rt_gateway,
+ } },
+ .mark = skb->mark,
+ .oif = out->ifindex };
-+ if (ip_route_output_key(out->nd_net, &rt, &fl) != 0) {
++ if (ip_route_output_key(dev_net(out), &rt, &fl) != 0) {
+ /* Funky routing can do this. */
+ if (net_ratelimit())
+ printk("MASQUERADE:"
@@ -858,10 +979,10 @@
write_lock_bh(&masq_lock);
nat->masq_index = out->ifindex;
write_unlock_bh(&masq_lock);
-diff -urp v2.6.25/linux/net/ipv4/netfilter/nf_nat_core.c
linux/net/ipv4/netfilter/nf_nat_core.c
---- v2.6.25/linux/net/ipv4/netfilter/nf_nat_core.c 2008-04-17
09:58:09.000000000 +0300
-+++ linux/net/ipv4/netfilter/nf_nat_core.c 2008-04-19 18:30:17.000000000
+0300
-@@ -624,6 +624,52 @@ static struct nf_ct_ext_type nat_extend
+diff -urp v2.6.26/linux/net/ipv4/netfilter/nf_nat_core.c
linux/net/ipv4/netfilter/nf_nat_core.c
+--- v2.6.26/linux/net/ipv4/netfilter/nf_nat_core.c 2008-07-14
09:58:50.000000000 +0300
++++ linux/net/ipv4/netfilter/nf_nat_core.c 2008-07-16 09:16:29.000000000
+0300
+@@ -583,6 +583,52 @@ static struct nf_ct_ext_type nat_extend
.flags = NF_CT_EXT_F_PREALLOC,
};
@@ -914,10 +1035,10 @@
static int __init nf_nat_init(void)
{
size_t i;
-diff -urp v2.6.25/linux/net/ipv4/netfilter/nf_nat_standalone.c
linux/net/ipv4/netfilter/nf_nat_standalone.c
---- v2.6.25/linux/net/ipv4/netfilter/nf_nat_standalone.c 2008-04-17
09:58:09.000000000 +0300
-+++ linux/net/ipv4/netfilter/nf_nat_standalone.c 2008-04-19
18:30:17.000000000 +0300
-@@ -282,6 +282,14 @@ static struct nf_hook_ops nf_nat_ops[] _
+diff -urp v2.6.26/linux/net/ipv4/netfilter/nf_nat_standalone.c
linux/net/ipv4/netfilter/nf_nat_standalone.c
+--- v2.6.26/linux/net/ipv4/netfilter/nf_nat_standalone.c 2008-07-14
09:58:50.000000000 +0300
++++ linux/net/ipv4/netfilter/nf_nat_standalone.c 2008-07-16
09:16:29.000000000 +0300
+@@ -256,6 +256,14 @@ static struct nf_hook_ops nf_nat_ops[] _
.hooknum = NF_INET_PRE_ROUTING,
.priority = NF_IP_PRI_NAT_DST,
},
@@ -932,10 +1053,10 @@
/* After packet filtering, change source */
{
.hook = nf_nat_out,
-diff -urp v2.6.25/linux/net/ipv4/route.c linux/net/ipv4/route.c
---- v2.6.25/linux/net/ipv4/route.c 2008-04-17 09:58:09.000000000 +0300
-+++ linux/net/ipv4/route.c 2008-04-19 18:30:17.000000000 +0300
-@@ -1207,6 +1207,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
+diff -urp v2.6.26/linux/net/ipv4/route.c linux/net/ipv4/route.c
+--- v2.6.26/linux/net/ipv4/route.c 2008-07-14 09:58:50.000000000 +0300
++++ linux/net/ipv4/route.c 2008-07-16 09:16:29.000000000 +0300
+@@ -1238,6 +1238,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
/* Gateway is different ... */
rt->rt_gateway = new_gw;
@@ -943,7 +1064,7 @@
/* Redirect received -> path was valid */
dst_confirm(&rth->u.dst);
-@@ -1647,6 +1648,7 @@ static int ip_route_input_mc(struct sk_b
+@@ -1684,6 +1685,7 @@ static int ip_route_input_mc(struct sk_b
rth->fl.fl4_tos = tos;
rth->fl.mark = skb->mark;
rth->fl.fl4_src = saddr;
@@ -951,7 +1072,7 @@
rth->rt_src = saddr;
#ifdef CONFIG_NET_CLS_ROUTE
rth->u.dst.tclassid = itag;
-@@ -1657,6 +1659,7 @@ static int ip_route_input_mc(struct sk_b
+@@ -1694,6 +1696,7 @@ static int ip_route_input_mc(struct sk_b
dev_hold(rth->u.dst.dev);
rth->idev = in_dev_get(rth->u.dst.dev);
rth->fl.oif = 0;
@@ -959,24 +1080,24 @@
rth->rt_gateway = daddr;
rth->rt_spec_dst= spec_dst;
rth->rt_genid = atomic_read(&rt_genid);
-@@ -1722,7 +1725,7 @@ static inline int __mkroute_input(struct
- struct fib_result* res,
- struct in_device *in_dev,
- __be32 daddr, __be32 saddr, u32 tos,
-- struct rtable **result)
-+ __be32 lsrc, struct rtable **result)
+@@ -1759,7 +1762,7 @@ static int __mkroute_input(struct sk_buf
+ struct fib_result *res,
+ struct in_device *in_dev,
+ __be32 daddr, __be32 saddr, u32 tos,
+- struct rtable **result)
++ __be32 lsrc, struct rtable **result)
{
struct rtable *rth;
-@@ -1756,6 +1759,7 @@ static inline int __mkroute_input(struct
+@@ -1793,6 +1796,7 @@ static int __mkroute_input(struct sk_buf
flags |= RTCF_DIRECTSRC;
- if (out_dev == in_dev && err && !(flags & RTCF_MASQ) &&
+ if (out_dev == in_dev && err &&
+ !lsrc &&
(IN_DEV_SHARED_MEDIA(out_dev) ||
inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
flags |= RTCF_DOREDIRECT;
-@@ -1789,6 +1793,7 @@ static inline int __mkroute_input(struct
+@@ -1826,6 +1830,7 @@ static int __mkroute_input(struct sk_buf
rth->fl.mark = skb->mark;
rth->fl.fl4_src = saddr;
rth->rt_src = saddr;
@@ -984,7 +1105,7 @@
rth->rt_gateway = daddr;
rth->rt_iif =
rth->fl.iif = in_dev->dev->ifindex;
-@@ -1796,6 +1801,7 @@ static inline int __mkroute_input(struct
+@@ -1833,6 +1838,7 @@ static int __mkroute_input(struct sk_buf
dev_hold(rth->u.dst.dev);
rth->idev = in_dev_get(rth->u.dst.dev);
rth->fl.oif = 0;
@@ -992,15 +1113,15 @@
rth->rt_spec_dst= spec_dst;
rth->u.dst.input = ip_forward;
-@@ -1816,21 +1822,23 @@ static inline int __mkroute_input(struct
+@@ -1853,21 +1859,23 @@ static int __mkroute_input(struct sk_buf
- static inline int ip_mkroute_input(struct sk_buff *skb,
- struct fib_result* res,
-+ struct net *net,
- const struct flowi *fl,
- struct in_device *in_dev,
-- __be32 daddr, __be32 saddr, u32 tos)
-+ __be32 daddr, __be32 saddr, u32 tos, __be32
lsrc)
+ static int ip_mkroute_input(struct sk_buff *skb,
+ struct fib_result *res,
++ struct net *net,
+ const struct flowi *fl,
+ struct in_device *in_dev,
+- __be32 daddr, __be32 saddr, u32 tos)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-routes.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
