diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-09-27 12:46:22 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-09-27 12:46:22 +0200 |
| commit | 9be7aa9b450f22cec9c97143d0cb7650f4fd7cc9 (patch) | |
| tree | e0e05c016695293d404e4ca99f2505094de66955 /proto/ospf/topology.c | |
| parent | 32a67c93ebf29309286dca5195f026eeda3f78a2 (diff) | |
| parent | 4364ee9b6f3764c971ab111bf7dc87477fd7272c (diff) | |
Merge commit '4364ee' into tmp-bad-learn
Diffstat (limited to 'proto/ospf/topology.c')
| -rw-r--r-- | proto/ospf/topology.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c index 6ff6a745..85bce03d 100644 --- a/proto/ospf/topology.c +++ b/proto/ospf/topology.c @@ -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)) |