Merge pull request #5910 from donaldsharp/ospf_indentation

ospfd: Fix 4 levels of unnecessary indentation
This commit is contained in:
Mark Stapp 2020-03-04 15:24:56 -05:00 committed by GitHub
commit 5103b01788
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -183,17 +183,22 @@ static void ospf_dr_change(struct ospf *ospf, struct route_table *nbrs)
struct route_node *rn; struct route_node *rn;
struct ospf_neighbor *nbr; struct ospf_neighbor *nbr;
for (rn = route_top(nbrs); rn; rn = route_next(rn)) for (rn = route_top(nbrs); rn; rn = route_next(rn)) {
if ((nbr = rn->info) != NULL) nbr = rn->info;
/* Ignore 0.0.0.0 node*/
if (nbr->router_id.s_addr != INADDR_ANY) if (!nbr)
/* Is neighbor upper 2-Way? */ continue;
if (nbr->state >= NSM_TwoWay)
/* Ignore myself. */ /*
if (!IPV4_ADDR_SAME(&nbr->router_id, * Ignore 0.0.0.0 node
&ospf->router_id)) * Is neighbor 2-Way?
OSPF_NSM_EVENT_SCHEDULE( * Ignore myself
nbr, NSM_AdjOK); */
if (nbr->router_id.s_addr != INADDR_ANY
&& nbr->state >= NSM_TwoWay
&& !IPV4_ADDR_SAME(&nbr->router_id, &ospf->router_id))
OSPF_NSM_EVENT_SCHEDULE(nbr, NSM_AdjOK);
}
} }
static int ospf_dr_election(struct ospf_interface *oi) static int ospf_dr_election(struct ospf_interface *oi)