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 '938742decc6e1d6d3a0375dd012b75172e747bbc' into haugesund

Browse Source
This commit is contained in:
Maria Matejka
2022-06-08 15:31:28 +02:00
parent cae5979871 938742decc
commit 4364ee9b6f
27 changed files with 337 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
proto/ospf/topology.c
View File

@@ -1337,9 +1337,9 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *n, rt
ASSERT(p->asbr);
/* Get route attributes */
rta *a = new->attrs;
eattr *m1a = ea_find(a->eattrs, &ea_ospf_metric1);
eattr *m2a = ea_find(a->eattrs, &ea_ospf_metric2);
ea_list *a = new->attrs;
eattr *m1a = ea_find(a, &ea_ospf_metric1);
eattr *m2a = ea_find(a, &ea_ospf_metric2);
uint m1 = m1a ? m1a->u.data : 0;
uint m2 = m2a ? m2a->u.data : 10000;
@@ -1363,10 +1363,10 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, const net_addr *n, rt
uint ebit = m2a || !m1a;
uint metric = ebit ? m2 : m1;
uint tag = ea_get_int(a->eattrs, &ea_ospf_tag, 0);
uint tag = ea_get_int(a, &ea_ospf_tag, 0);
ip_addr fwd = IPA_NONE;
eattr *nhea = ea_find(a->eattrs, &ea_gen_nexthop);
eattr *nhea = ea_find(a, &ea_gen_nexthop);
struct nexthop_adata *nhad = (struct nexthop_adata *) nhea->u.ptr;
if (NEXTHOP_IS_REACHABLE(nhad))
if (use_gw_for_fwaddr(p, nhad->nh.gw, nhad->nh.iface))