diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-03-13 12:08:38 -0400 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-03-13 12:08:38 -0400 |
| commit | 1f35b46a2f35d59b86ed3ee557aa1c9fcf2fcac9 (patch) | |
| tree | 27de606b3510b126766ac7a0ac9eb8ddf4573ab0 /ospfd/ospf_abr.c | |
| parent | d47ae3db4cf14c72d8468d61113ac88e19235791 (diff) | |
| parent | c1a003878246ccc84ab5986558ca959f4545f738 (diff) | |
Merge branch 'master' into docuser
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'ospfd/ospf_abr.c')
| -rw-r--r-- | ospfd/ospf_abr.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c index ea94bab6b3..b29f35d7ce 100644 --- a/ospfd/ospf_abr.c +++ b/ospfd/ospf_abr.c @@ -976,7 +976,7 @@ static void ospf_abr_process_nssa_translates(struct ospf *ospf) "looking at area %s", inet_ntoa(area->area_id)); - LSDB_LOOP(NSSA_LSDB(area), rn, lsa) + LSDB_LOOP (NSSA_LSDB(area), rn, lsa) ospf_abr_translate_nssa(area, lsa); } @@ -1323,7 +1323,7 @@ ospf_abr_unapprove_translates(struct ospf *ospf) /* For NSSA Translations */ /* NSSA Translator is not checked, because it may have gone away, and we would want to flush any residuals anyway */ - LSDB_LOOP(EXTERNAL_LSDB(ospf), rn, lsa) + LSDB_LOOP (EXTERNAL_LSDB(ospf), rn, lsa) if (CHECK_FLAG(lsa->flags, OSPF_LSA_LOCAL_XLT)) { UNSET_FLAG(lsa->flags, OSPF_LSA_APPROVED); if (IS_DEBUG_OSPF_NSSA) @@ -1353,7 +1353,7 @@ static void ospf_abr_unapprove_summaries(struct ospf *ospf) "ospf_abr_unapprove_summaries(): " "considering area %s", inet_ntoa(area->area_id)); - LSDB_LOOP(SUMMARY_LSDB(area), rn, lsa) + LSDB_LOOP (SUMMARY_LSDB(area), rn, lsa) if (ospf_lsa_is_self_originated(ospf, lsa)) { if (IS_DEBUG_OSPF_EVENT) zlog_debug( @@ -1363,7 +1363,7 @@ static void ospf_abr_unapprove_summaries(struct ospf *ospf) UNSET_FLAG(lsa->flags, OSPF_LSA_APPROVED); } - LSDB_LOOP(ASBR_SUMMARY_LSDB(area), rn, lsa) + LSDB_LOOP (ASBR_SUMMARY_LSDB(area), rn, lsa) if (ospf_lsa_is_self_originated(ospf, lsa)) { if (IS_DEBUG_OSPF_EVENT) zlog_debug( @@ -1631,7 +1631,7 @@ static void ospf_abr_remove_unapproved_translates(struct ospf *ospf) if (IS_DEBUG_OSPF_NSSA) zlog_debug("ospf_abr_remove_unapproved_translates(): Start"); - LSDB_LOOP(EXTERNAL_LSDB(ospf), rn, lsa) + LSDB_LOOP (EXTERNAL_LSDB(ospf), rn, lsa) ospf_abr_remove_unapproved_translates_apply(ospf, lsa); if (IS_DEBUG_OSPF_NSSA) @@ -1655,12 +1655,12 @@ static void ospf_abr_remove_unapproved_summaries(struct ospf *ospf) "looking at area %s", inet_ntoa(area->area_id)); - LSDB_LOOP(SUMMARY_LSDB(area), rn, lsa) + LSDB_LOOP (SUMMARY_LSDB(area), rn, lsa) if (ospf_lsa_is_self_originated(ospf, lsa)) if (!CHECK_FLAG(lsa->flags, OSPF_LSA_APPROVED)) ospf_lsa_flush_area(lsa, area); - LSDB_LOOP(ASBR_SUMMARY_LSDB(area), rn, lsa) + LSDB_LOOP (ASBR_SUMMARY_LSDB(area), rn, lsa) if (ospf_lsa_is_self_originated(ospf, lsa)) if (!CHECK_FLAG(lsa->flags, OSPF_LSA_APPROVED)) ospf_lsa_flush_area(lsa, area); @@ -1683,13 +1683,14 @@ static void ospf_abr_manage_discard_routes(struct ospf *ospf) if (CHECK_FLAG(range->flags, OSPF_AREA_RANGE_ADVERTISE)) { if (range->specifics) - ospf_add_discard_route(ospf, - ospf->new_table, area, + ospf_add_discard_route( + ospf, ospf->new_table, + area, (struct prefix_ipv4 *)&rn->p); else - ospf_delete_discard_route(ospf, - ospf->new_table, + ospf_delete_discard_route( + ospf, ospf->new_table, (struct prefix_ipv4 *)&rn->p); } |