Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge commit 'origin/master'

Browse source
This commit is contained in:
Ondrej Zajicek 2011-05-06 22:09:44 +02:00
commit 46bb7e0d17
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nest/rt-table.c
View file

@ -1486,13 +1486,18 @@ rt_get_igp_metric(rte *rt)
return ea->u.data; return ea->u.data;
rta *a = rt->attrs; rta *a = rt->attrs;
#ifdef CONFIG_OSPF
if ((a->source == RTS_OSPF) || if ((a->source == RTS_OSPF) ||
(a->source == RTS_OSPF_IA) || (a->source == RTS_OSPF_IA) ||
(a->source == RTS_OSPF_EXT1)) (a->source == RTS_OSPF_EXT1))
return rt->u.ospf.metric1; return rt->u.ospf.metric1;
#endif
#ifdef CONFIG_RIP
if (a->source == RTS_RIP) if (a->source == RTS_RIP)
return rt->u.rip.metric; return rt->u.rip.metric;
#endif
/* Device routes */ /* Device routes */
if ((a->dest != RTD_ROUTER) && (a->dest != RTD_MULTIPATH)) if ((a->dest != RTD_ROUTER) && (a->dest != RTD_MULTIPATH))