diff options
| author | Mark Stapp <mjs@voltanet.io> | 2020-03-04 15:24:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 15:24:56 -0500 |
| commit | 5103b017886ff2bc3b60a2278859c8464ae7d6d2 (patch) | |
| tree | 1e4bf851da5e74638e3f60289048323d2930e671 /ospfd/ospf_ism.c | |
| parent | 5a2c6abbc7e88ac66da526d48d70dbe82b3efaf3 (diff) | |
| parent | 850dda33ce2a5d3c1ea89f0e45dfe7ad716f4fe0 (diff) | |
Merge pull request #5910 from donaldsharp/ospf_indentation
ospfd: Fix 4 levels of unnecessary indentation
Diffstat (limited to 'ospfd/ospf_ism.c')
| -rw-r--r-- | ospfd/ospf_ism.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c index f4e89da45d..86712c6198 100644 --- a/ospfd/ospf_ism.c +++ b/ospfd/ospf_ism.c @@ -183,17 +183,22 @@ static void ospf_dr_change(struct ospf *ospf, struct route_table *nbrs) struct route_node *rn; struct ospf_neighbor *nbr; - for (rn = route_top(nbrs); rn; rn = route_next(rn)) - if ((nbr = rn->info) != NULL) - /* Ignore 0.0.0.0 node*/ - if (nbr->router_id.s_addr != INADDR_ANY) - /* Is neighbor upper 2-Way? */ - if (nbr->state >= NSM_TwoWay) - /* Ignore myself. */ - if (!IPV4_ADDR_SAME(&nbr->router_id, - &ospf->router_id)) - OSPF_NSM_EVENT_SCHEDULE( - nbr, NSM_AdjOK); + for (rn = route_top(nbrs); rn; rn = route_next(rn)) { + nbr = rn->info; + + if (!nbr) + continue; + + /* + * Ignore 0.0.0.0 node + * Is neighbor 2-Way? + * Ignore myself + */ + 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) |