mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-11-18 09:08:42 +00:00
Merge commit 'origin/master'
This commit is contained in:
commit
46bb7e0d17
@ -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))
|
||||||
|
Loading…
Reference in New Issue
Block a user