korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 22:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

[NETNS]: Add netns parameter to fib_select_default.

Browse Source 
Currently fib_select_default calls fib_get_table() with the
init_net. Prepare it to provide a correct namespace to lookup default
route.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2008-01-22 22:04:04 -08:00 committed by David S. Miller
parent 64c2d53829
commit 010278ec4c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/ip_fib.h
View File

@ -213,7 +213,8 @@ extern const struct nla_policy rtm_ipv4_policy[];
extern void ip_fib_init(void); extern void ip_fib_init(void);
extern int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif, extern int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
struct net_device *dev, __be32 *spec_dst, u32 *itag); struct net_device *dev, __be32 *spec_dst, u32 *itag);
extern void fib_select_default(const struct flowi *flp, struct fib_result *res); extern void fib_select_default(struct net *net, const struct flowi *flp,
struct fib_result *res);
/* Exported by fib_semantics.c */ /* Exported by fib_semantics.c */
extern int ip_fib_check_default(__be32 gw, struct net_device *dev); extern int ip_fib_check_default(__be32 gw, struct net_device *dev);

5
net/ipv4/fib_frontend.c
View File

@ -116,7 +116,8 @@ struct fib_table *fib_get_table(struct net *net, u32 id)
} }
#endif /* CONFIG_IP_MULTIPLE_TABLES */ #endif /* CONFIG_IP_MULTIPLE_TABLES */
void fib_select_default(const struct flowi *flp, struct fib_result *res) void fib_select_default(struct net *net,
const struct flowi *flp, struct fib_result *res)
{ {
struct fib_table *tb; struct fib_table *tb;
int table = RT_TABLE_MAIN; int table = RT_TABLE_MAIN;
@ -125,7 +126,7 @@ void fib_select_default(const struct flowi *flp, struct fib_result *res)
return; return;
table = res->r->table; table = res->r->table;
#endif #endif
tb = fib_get_table(&init_net, table); tb = fib_get_table(net, table);
if (FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK) if (FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK)
tb->tb_select_default(tb, flp, res); tb->tb_select_default(tb, flp, res);
} }

2
net/ipv4/route.c
View File

@ -2419,7 +2419,7 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp)
else else
#endif #endif
if (!res.prefixlen && res.type == RTN_UNICAST && !fl.oif) if (!res.prefixlen && res.type == RTN_UNICAST && !fl.oif)
fib_select_default(&fl, &res); fib_select_default(&init_net, &fl, &res);
if (!fl.fl4_src) if (!fl.fl4_src)
fl.fl4_src = FIB_RES_PREFSRC(res); fl.fl4_src = FIB_RES_PREFSRC(res);