mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

Merge commit 'd8661a4397e4576ac404661b192dd99d928e7890' into haugesund

Browse Source
This commit is contained in:
Maria Matejka
2022-05-30 17:11:30 +02:00
parent 5051e3c4af d8661a4397
commit 674587d9c8
10 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nest/rt-table.c
View File

@@ -2505,7 +2505,8 @@ rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls)
{
a->hostentry = he;
a->dest = he->dest;
a->igp_metric = he->igp_metric;
ea_set_attr_u32(&a->eattrs, &ea_gen_igp_metric, 0, he->igp_metric);
if (a->dest != RTD_UNICAST)
{
@@ -2602,7 +2603,8 @@ rta_next_hop_outdated(rta *a)
if (!he->src)
return a->dest != RTD_UNREACHABLE;
return (a->dest != he->dest) || (a->igp_metric != he->igp_metric) ||
return (a->dest != he->dest) ||
(ea_get_int(a->eattrs, &ea_gen_igp_metric, IGP_METRIC_UNKNOWN) != he->igp_metric) ||
(!he->nexthop_linkable) || !nexthop_same(&(a->nh), &(he->src->nh));
}
@@ -3534,7 +3536,7 @@ if_local_addr(ip_addr a, struct iface *i)
}
u32
rt_get_igp_metric(rte *rt)
rt_get_igp_metric(const rte *rt)
{
eattr *ea = ea_find(rt->attrs->eattrs, "igp_metric");