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

OSPF: Fix crash during route removal

Browse source 
The bug was introduced by an earler patch which removed additional eattr
argument to rt_notify hook.
This commit is contained in:
Ondrej Zajicek (work) 2018-07-19 20:48:13 +02:00
parent 092c493027
commit 8bd718b3ba
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
proto/ospf/topology.c
View file

@ -1248,7 +1248,6 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
struct ospf_proto *p = (struct ospf_proto *) P; struct ospf_proto *p = (struct ospf_proto *) P;
struct ospf_area *oa = NULL; /* non-NULL for NSSA-LSA */ struct ospf_area *oa = NULL; /* non-NULL for NSSA-LSA */
ort *nf; ort *nf;
struct ea_list *ea = new->attrs->eattrs;
/* /*
* There are several posibilities: * There are several posibilities:
@ -1282,8 +1281,8 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
/* Get route attributes */ /* Get route attributes */
rta *a = new->attrs; rta *a = new->attrs;
eattr *m1a = ea_find(ea, EA_OSPF_METRIC1); eattr *m1a = ea_find(a->eattrs, EA_OSPF_METRIC1);
eattr *m2a = ea_find(ea, EA_OSPF_METRIC2); eattr *m2a = ea_find(a->eattrs, EA_OSPF_METRIC2);
uint m1 = m1a ? m1a->u.data : 0; uint m1 = m1a ? m1a->u.data : 0;
uint m2 = m2a ? m2a->u.data : 10000; uint m2 = m2a ? m2a->u.data : 10000;
@ -1307,7 +1306,7 @@ ospf_rt_notify(struct proto *P, struct channel *ch UNUSED, net *n, rte *new, rte
uint ebit = m2a || !m1a; uint ebit = m2a || !m1a;
uint metric = ebit ? m2 : m1; uint metric = ebit ? m2 : m1;
uint tag = ea_get_int(ea, EA_OSPF_TAG, 0); uint tag = ea_get_int(a->eattrs, EA_OSPF_TAG, 0);
ip_addr fwd = IPA_NONE; ip_addr fwd = IPA_NONE;
if ((a->dest == RTD_UNICAST) && use_gw_for_fwaddr(p, a->nh.gw, a->nh.iface)) if ((a->dest == RTD_UNICAST) && use_gw_for_fwaddr(p, a->nh.gw, a->nh.iface))