* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2, or (at your option) any
* later version.
- *
+ *
* GNU Zebra is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING. If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "ospfd/ospf_zebra.h"
#include "ospfd/ospf_dump.h"
-\f
-struct ospf_area_range *
+static struct ospf_area_range *
ospf_area_range_new (struct prefix_ipv4 *p)
{
struct ospf_area_range *range;
return range;
}
-void
+static void
ospf_area_range_free (struct ospf_area_range *range)
{
XFREE (MTYPE_OSPF_AREA_RANGE, range);
}
-void
+static void
ospf_area_range_add (struct ospf_area *area, struct ospf_area_range *range)
{
struct route_node *rn;
rn->info = range;
}
-void
-ospf_area_range_delete (struct ospf_area *area, struct ospf_area_range *range)
+static void
+ospf_area_range_delete (struct ospf_area *area, struct route_node *rn)
{
- struct route_node *rn;
- struct prefix_ipv4 p;
+ struct ospf_area_range *range = rn->info;
- p.family = AF_INET;
- p.prefixlen = range->masklen;
- p.prefix = range->addr;
+ if (range->specifics != 0)
+ ospf_delete_discard_route (area->ospf->new_table,
+ (struct prefix_ipv4 *) &rn->p);
- rn = route_node_lookup (area->ranges, (struct prefix *)&p);
- if (rn)
- {
- ospf_area_range_free (rn->info);
- rn->info = NULL;
- route_unlock_node (rn);
- route_unlock_node (rn);
- }
+ ospf_area_range_free (range);
+ rn->info = NULL;
+ route_unlock_node (rn);
+ route_unlock_node (rn);
}
struct ospf_area_range *
}
struct ospf_area_range *
-ospf_area_range_lookup_next (struct ospf_area *area, struct in_addr *range_net,
- int first)
+ospf_area_range_lookup_next (struct ospf_area *area,
+ struct in_addr *range_net,
+ int first)
{
struct route_node *rn;
struct prefix_ipv4 p;
return NULL;
}
-struct ospf_area_range *
+static struct ospf_area_range *
ospf_area_range_match (struct ospf_area *area, struct prefix_ipv4 *p)
{
struct route_node *node;
ospf_area_range_match_any (struct ospf *ospf, struct prefix_ipv4 *p)
{
struct ospf_area_range *range;
- listnode node;
+ struct ospf_area *area;
+ struct listnode *node;
- for (node = listhead (ospf->areas); node; nextnode (node))
- if ((range = ospf_area_range_match (node->data, p)))
+ for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area))
+ if ((range = ospf_area_range_match (area, p)))
return range;
return NULL;
return range->specifics;
}
-int
+static int
ospf_area_actively_attached (struct ospf_area *area)
{
return area->act_ints;
{
struct ospf_area *area;
struct ospf_area_range *range;
- int ret = OSPF_AREA_ID_FORMAT_DECIMAL;
- area = ospf_area_get (area_id, ret);
+ area = ospf_area_get (ospf, area_id);
if (area == NULL)
return 0;
&& !CHECK_FLAG (advertise, OSPF_AREA_RANGE_ADVERTISE))
|| (!CHECK_FLAG (range->flags, OSPF_AREA_RANGE_ADVERTISE)
&& CHECK_FLAG (advertise, OSPF_AREA_RANGE_ADVERTISE)))
- ospf_schedule_abr_task ();
+ ospf_schedule_abr_task (ospf);
}
else
{
range = ospf_area_range_new (p);
ospf_area_range_add (area, range);
- ospf_schedule_abr_task ();
+ ospf_schedule_abr_task (ospf);
}
if (CHECK_FLAG (advertise, OSPF_AREA_RANGE_ADVERTISE))
{
struct ospf_area *area;
struct ospf_area_range *range;
- int ret = OSPF_AREA_ID_FORMAT_DECIMAL;
- area = ospf_area_get (area_id, ret);
+ area = ospf_area_get (ospf, area_id);
if (area == NULL)
return 0;
- range = ospf_area_range_new (p);
+ range = ospf_area_range_lookup (area, p);
if (range == NULL)
return 0;
{
range->cost_config = cost;
if (ospf_area_range_active (range))
- ospf_schedule_abr_task ();
+ ospf_schedule_abr_task (ospf);
}
return 1;
struct prefix_ipv4 *p)
{
struct ospf_area *area;
- struct ospf_area_range *range;
+ struct route_node *rn;
- area = ospf_area_lookup_by_area_id (area_id);
+ area = ospf_area_lookup_by_area_id (ospf, area_id);
if (area == NULL)
return 0;
- range = ospf_area_range_lookup (area, p);
- if (range == NULL)
+ rn = route_node_lookup (area->ranges, (struct prefix*)p);
+ if (rn == NULL)
return 0;
- if (ospf_area_range_active (range))
- ospf_schedule_abr_task ();
+ if (ospf_area_range_active (rn->info))
+ ospf_schedule_abr_task (ospf);
- ospf_area_range_delete (area, range);
+ ospf_area_range_delete (area, rn);
return 1;
}
{
struct ospf_area *area;
struct ospf_area_range *range;
- int ret = OSPF_AREA_ID_FORMAT_DECIMAL;
- area = ospf_area_get (area_id, ret);
+ area = ospf_area_get (ospf, area_id);
range = ospf_area_range_lookup (area, p);
if (range != NULL)
{
if (!CHECK_FLAG (range->flags, OSPF_AREA_RANGE_ADVERTISE) ||
!CHECK_FLAG (range->flags, OSPF_AREA_RANGE_SUBSTITUTE))
- ospf_schedule_abr_task ();
+ ospf_schedule_abr_task (ospf);
}
else
{
range = ospf_area_range_new (p);
ospf_area_range_add (area, range);
- ospf_schedule_abr_task ();
+ ospf_schedule_abr_task (ospf);
}
SET_FLAG (range->flags, OSPF_AREA_RANGE_ADVERTISE);
struct ospf_area *area;
struct ospf_area_range *range;
- area = ospf_area_lookup_by_area_id (area_id);
+ area = ospf_area_lookup_by_area_id (ospf, area_id);
if (area == NULL)
return 0;
if (CHECK_FLAG (range->flags, OSPF_AREA_RANGE_SUBSTITUTE))
if (ospf_area_range_active (range))
- ospf_schedule_abr_task ();
+ ospf_schedule_abr_task (ospf);
UNSET_FLAG (range->flags, OSPF_AREA_RANGE_SUBSTITUTE);
range->subst_addr.s_addr = 0;
}
int
-ospf_act_bb_connection ()
+ospf_act_bb_connection (struct ospf *ospf)
{
- if (ospf_top->backbone == NULL)
+ if (ospf->backbone == NULL)
return 0;
- return ospf_top->backbone->full_nbrs;
+ return ospf->backbone->full_nbrs;
+}
+
+/* Determine whether this router is elected translator or not for area */
+static int
+ospf_abr_nssa_am_elected (struct ospf_area *area)
+{
+ struct route_node *rn;
+ struct ospf_lsa *lsa;
+ struct router_lsa *rlsa;
+ struct in_addr *best = NULL;
+
+ LSDB_LOOP ( ROUTER_LSDB (area), rn, lsa)
+ {
+ /* sanity checks */
+ if (!lsa
+ || (lsa->data->type != OSPF_ROUTER_LSA)
+ || IS_LSA_SELF (lsa))
+ continue;
+
+ rlsa = (struct router_lsa *) lsa->data;
+
+ /* ignore non-ABR routers */
+ if (!IS_ROUTER_LSA_BORDER (rlsa))
+ continue;
+
+ /* Router has Nt flag - always translate */
+ if (IS_ROUTER_LSA_NT (rlsa))
+ {
+ if (IS_DEBUG_OSPF_NSSA)
+ zlog_debug ("ospf_abr_nssa_am_elected: "
+ "router %s asserts Nt",
+ inet_ntoa (lsa->data->id) );
+ return 0;
+ }
+
+ if (best == NULL)
+ best = &lsa->data->id;
+ else
+ if (IPV4_ADDR_CMP (&best->s_addr, &lsa->data->id.s_addr) < 0)
+ best = &lsa->data->id;
+ }
+
+ if (IS_DEBUG_OSPF_NSSA)
+ zlog_debug ("ospf_abr_nssa_am_elected: best electable ABR is: %s",
+ (best) ? inet_ntoa (*best) : "<none>" );
+
+ if (best == NULL)
+ return 1;
+
+ if (IPV4_ADDR_CMP (&best->s_addr, &area->ospf->router_id.s_addr) < 0)
+ return 1;
+ else
+ return 0;
+}
+
+/* Check NSSA ABR status
+ * assumes there are nssa areas
+ */
+static void
+ospf_abr_nssa_check_status (struct ospf *ospf)
+{
+ struct ospf_area *area;
+ struct listnode *lnode, *nnode;
+
+ for (ALL_LIST_ELEMENTS (ospf->areas, lnode, nnode, area))
+ {
+ u_char old_state = area->NSSATranslatorState;
+
+ if (area->external_routing != OSPF_AREA_NSSA)
+ continue;
+
+ if (IS_DEBUG_OSPF (nssa, NSSA))
+ zlog_debug ("ospf_abr_nssa_check_status: "
+ "checking area %s",
+ inet_ntoa (area->area_id));
+
+ if (!IS_OSPF_ABR (area->ospf))
+ {
+ if (IS_DEBUG_OSPF (nssa, NSSA))
+ zlog_debug ("ospf_abr_nssa_check_status: "
+ "not ABR");
+ area->NSSATranslatorState = OSPF_NSSA_TRANSLATE_DISABLED;
+ }
+ else
+ {
+ switch (area->NSSATranslatorRole)
+ {
+ case OSPF_NSSA_ROLE_NEVER:
+ /* We never Translate Type-7 LSA. */
+ /* TODO: check previous state and flush? */
+ if (IS_DEBUG_OSPF (nssa, NSSA))
+ zlog_debug ("ospf_abr_nssa_check_status: "
+ "never translate");
+ area->NSSATranslatorState = OSPF_NSSA_TRANSLATE_DISABLED;
+ break;
+
+ case OSPF_NSSA_ROLE_ALWAYS:
+ /* We always translate if we are an ABR
+ * TODO: originate new LSAs if state change?
+ * or let the nssa abr task take care of it?
+ */
+ if (IS_DEBUG_OSPF (nssa, NSSA))
+ zlog_debug ("ospf_abr_nssa_check_status: "
+ "translate always");
+ area->NSSATranslatorState = OSPF_NSSA_TRANSLATE_ENABLED;
+ break;
+
+ case OSPF_NSSA_ROLE_CANDIDATE:
+ /* We are a candidate for Translation */
+ if (ospf_abr_nssa_am_elected (area) > 0)
+ {
+ area->NSSATranslatorState = OSPF_NSSA_TRANSLATE_ENABLED;
+ if (IS_DEBUG_OSPF (nssa, NSSA))
+ zlog_debug ("ospf_abr_nssa_check_status: "
+ "elected translator");
+ }
+ else
+ {
+ area->NSSATranslatorState = OSPF_NSSA_TRANSLATE_DISABLED;
+ if (IS_DEBUG_OSPF (nssa, NSSA))
+ zlog_debug ("ospf_abr_nssa_check_status: " "not elected");
+ }
+ break;
+ }
+ }
+ /* RFC3101, 3.1:
+ * All NSSA border routers must set the E-bit in the Type-1 router-LSAs
+ * of their directly attached non-stub areas, even when they are not
+ * translating.
+ */
+ if (old_state != area->NSSATranslatorState)
+ {
+ if (old_state == OSPF_NSSA_TRANSLATE_DISABLED)
+ ospf_asbr_status_update (ospf, ++ospf->redistribute);
+ else if (area->NSSATranslatorState == OSPF_NSSA_TRANSLATE_DISABLED)
+ ospf_asbr_status_update (ospf, --ospf->redistribute);
+ }
+ }
}
/* Check area border router status. */
void
-ospf_check_abr_status ()
+ospf_check_abr_status (struct ospf *ospf)
{
struct ospf_area *area;
- listnode node;
+ struct listnode *node, *nnode;
int bb_configured = 0;
int bb_act_attached = 0;
int areas_configured = 0;
int areas_act_attached = 0;
-
- u_char new_flags = ospf_top->flags;
+ u_char new_flags = ospf->flags;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_check_abr_status(): Start");
+ zlog_debug ("ospf_check_abr_status(): Start");
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (ALL_LIST_ELEMENTS (ospf->areas, node, nnode, area))
{
- area = getdata (node);
-
if (listcount (area->oiflist))
{
areas_configured++;
if (IS_DEBUG_OSPF_EVENT)
{
- zlog_info ("ospf_check_abr_status(): looked through areas");
- zlog_info ("ospf_check_abr_status(): bb_configured: %d", bb_configured);
- zlog_info ("ospf_check_abr_status(): bb_act_attached: %d",
+ zlog_debug ("ospf_check_abr_status(): looked through areas");
+ zlog_debug ("ospf_check_abr_status(): bb_configured: %d", bb_configured);
+ zlog_debug ("ospf_check_abr_status(): bb_act_attached: %d",
bb_act_attached);
- zlog_info ("ospf_check_abr_status(): areas_configured: %d",
+ zlog_debug ("ospf_check_abr_status(): areas_configured: %d",
areas_configured);
- zlog_info ("ospf_check_abr_status(): areas_act_attached: %d",
+ zlog_debug ("ospf_check_abr_status(): areas_act_attached: %d",
areas_act_attached);
}
- switch (ospf_top->abr_type)
+ switch (ospf->abr_type)
{
case OSPF_ABR_SHORTCUT:
case OSPF_ABR_STAND:
break;
}
- if (new_flags != ospf_top->flags)
+ if (new_flags != ospf->flags)
{
- ospf_spf_calculate_schedule ();
+ ospf_spf_calculate_schedule (ospf, SPF_FLAG_ABR_STATUS_CHANGE);
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_check_abr_status(): new router flags: %x",new_flags);
- ospf_top->flags = new_flags;
- OSPF_TIMER_ON (ospf_top->t_router_lsa_update,
- ospf_router_lsa_update_timer, OSPF_LSA_UPDATE_DELAY);
+ zlog_debug ("ospf_check_abr_status(): new router flags: %x",new_flags);
+ ospf->flags = new_flags;
+ ospf_router_lsa_update (ospf);
}
}
-void
+static void
ospf_abr_update_aggregate (struct ospf_area_range *range,
- struct ospf_route *or)
+ struct ospf_route *or, struct ospf_area *area)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_update_aggregate(): Start");
+ zlog_debug ("ospf_abr_update_aggregate(): Start");
- if (range->cost_config != -1)
+ if (CHECK_FLAG (area->stub_router_state, OSPF_AREA_IS_STUB_ROUTED) &&
+ (range->cost != OSPF_STUB_MAX_METRIC_SUMMARY_COST))
{
+ range->cost = OSPF_STUB_MAX_METRIC_SUMMARY_COST;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_update_aggregate(): use configured cost %d",
- range->cost_config);
+ zlog_debug ("ospf_abr_update_aggregate(): use summary max-metric 0x%08x",
+ range->cost);
+ }
+ else if (range->cost_config != OSPF_AREA_RANGE_COST_UNSPEC)
+ {
+ if (IS_DEBUG_OSPF_EVENT)
+ zlog_debug ("ospf_abr_update_aggregate(): use configured cost %d",
+ range->cost_config);
range->cost = range->cost_config;
}
else
{
if (range->specifics == 0)
- range->cost = or->cost; /* 1st time get 1st cost */
-
- if (or->cost < range->cost)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_update_aggregate(): lowest cost, update");
+ zlog_debug ("ospf_abr_update_aggregate(): use or->cost %d",
+ or->cost);
- range->cost = or->cost;
+ range->cost = or->cost; /* 1st time get 1st cost */
}
+
+ if (or->cost > range->cost)
+ {
+ if (IS_DEBUG_OSPF_EVENT)
+ zlog_debug ("ospf_abr_update_aggregate(): update to %d", or->cost);
+
+ range->cost = or->cost;
+ }
}
range->specifics++;
struct summary_lsa *header;
u_char *mp;
metric = htonl (metric);
- mp = (char *) &metric;
+ mp = (u_char *) &metric;
mp++;
header = (struct summary_lsa *) lsa->data;
memcpy(header->metric, mp, 3);
}
-#ifdef HAVE_NSSA
-int
-ospf_abr_check_nssa_range (struct prefix_ipv4 *p, u_int32_t cost,
- struct ospf_area *area)
-{
- /* The Type-7 is tested against the aggregated prefix and forwarded
- for lsa installation and flooding */
- return 0;
-}
-
/* ospf_abr_translate_nssa */
-int
-ospf_abr_translate_nssa (struct ospf_lsa *lsa, void *p_arg, int int_arg)
+static int
+ospf_abr_translate_nssa (struct ospf_area *area, struct ospf_lsa *lsa)
{
/* Incoming Type-7 or later aggregated Type-7
-
- LSA is skipped if P-bit is off.
- LSA is aggregated if within range.
-
- The Type-7 is translated, Installed/Approved as a Type-5 into
- global LSDB, then Flooded through AS
-
- Later, any Unapproved Translated Type-5's are flushed/discarded */
-
- struct ospf_lsa *dup;
+ *
+ * LSA is skipped if P-bit is off.
+ * LSA is aggregated if within range.
+ *
+ * The Type-7 is translated, Installed/Approved as a Type-5 into
+ * global LSDB, then Flooded through AS
+ *
+ * Later, any Unapproved Translated Type-5's are flushed/discarded
+ */
+
+ struct ospf_lsa *old = NULL,
+ *new = NULL;
+ struct as_external_lsa *ext7;
+ struct prefix_ipv4 p;
if (! CHECK_FLAG (lsa->data->options, OSPF_OPTION_NP))
{
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_nssa(): P-bit off, NO Translation");
- return 0;
+ zlog_debug ("ospf_abr_translate_nssa(): LSA Id %s, P-bit off, NO Translation",
+ inet_ntoa (lsa->data->id));
+ return 1;
}
-
+
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_nssa(): TRANSLATING 7 to 5");
+ zlog_debug ("ospf_abr_translate_nssa(): LSA Id %s, TRANSLATING 7 to 5",
+ inet_ntoa (lsa->data->id));
- /* No more P-bit. */
- /* UNSET_FLAG (lsa->data->options, OSPF_OPTION_NP); */
+ ext7 = (struct as_external_lsa *)(lsa->data);
+ p.prefix = lsa->data->id;
+ p.prefixlen = ip_masklen (ext7->mask);
+
+ if (ext7->e[0].fwd_addr.s_addr == OSPF_DEFAULT_DESTINATION)
+ {
+ if (IS_DEBUG_OSPF_NSSA)
+ zlog_debug ("ospf_abr_translate_nssa(): LSA Id %s, "
+ "Forward address is 0, NO Translation",
+ inet_ntoa (lsa->data->id));
+ return 1;
+ }
+
+ /* try find existing AS-External LSA for this prefix */
+
+ old = ospf_external_info_find_lsa (area->ospf, &p);
+
+ if (old)
+ {
+ if (IS_DEBUG_OSPF_NSSA)
+ zlog_debug ("ospf_abr_translate_nssa(): "
+ "found old translated LSA Id %s, refreshing",
+ inet_ntoa (old->data->id));
+
+ /* refresh */
+ new = ospf_translated_nssa_refresh (area->ospf, lsa, old);
+ if (!new)
+ {
+ if (IS_DEBUG_OSPF_NSSA)
+ zlog_debug ("ospf_abr_translate_nssa(): "
+ "could not refresh translated LSA Id %s",
+ inet_ntoa (old->data->id));
+ }
+ }
+ else
+ {
+ /* no existing external route for this LSA Id
+ * originate translated LSA
+ */
+
+ if ((new = ospf_translated_nssa_originate (area->ospf, lsa))
+ == NULL)
+ {
+ if (IS_DEBUG_OSPF_NSSA)
+ zlog_debug ("ospf_abr_translate_nssa(): Could not translate "
+ "Type-7 for %s to Type-5",
+ inet_ntoa (lsa->data->id));
+ return 1;
+ }
+ }
/* Area where Aggregate testing will be inserted, just like summary
advertisements */
/* ospf_abr_check_nssa_range (p_arg, lsa-> cost, lsa -> area); */
- /* Follow thru here means no aggregation */
- dup = ospf_lsa_dup (lsa); /* keep LSDB intact, lock = 1 */
-
- SET_FLAG (dup->flags, OSPF_LSA_LOCAL_XLT); /* Translated from 7 */
- SET_FLAG (dup->flags, OSPF_LSA_APPROVED); /* So, do not remove it */
-
- dup->data->type = OSPF_AS_EXTERNAL_LSA; /* make Type-5 */
-
- ospf_lsa_checksum (dup->data);
-
- ospf_lsa_install (NULL, dup); /* Install this Type-5 into LSDB, Lock = 2. */
-
- ospf_flood_through_as (NULL, dup); /* flood non-NSSA/STUB areas */
-
- /* This translated Type-5 will go to all non-NSSA areas connected to
- this ABR; The Type-5 could come from any of the NSSA's connected
- to this ABR. */
-
return 0;
}
-void
+static void
ospf_abr_translate_nssa_range (struct prefix_ipv4 *p, u_int32_t cost)
{
/* The Type-7 is created from the aggregated prefix and forwarded
for lsa installation and flooding... to be added... */
}
-#endif /* HAVE_NSSA */
void
ospf_abr_announce_network_to_area (struct prefix_ipv4 *p, u_int32_t cost,
{
struct ospf_lsa *lsa, *old = NULL;
struct summary_lsa *sl = NULL;
+ u_int32_t full_cost;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network_to_area(): Start");
+ zlog_debug ("ospf_abr_announce_network_to_area(): Start");
- old = OSPF_SUMMARY_LSA_SELF_FIND_BY_PREFIX (area, p);
+ if (CHECK_FLAG (area->stub_router_state, OSPF_AREA_IS_STUB_ROUTED))
+ full_cost = OSPF_STUB_MAX_METRIC_SUMMARY_COST;
+ else
+ full_cost = cost;
+ old = ospf_lsa_lookup_by_prefix (area->lsdb, OSPF_SUMMARY_LSA,
+ (struct prefix_ipv4 *) p,
+ area->ospf->router_id);
if (old)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network_to_area(): old summary found");
+ zlog_debug ("ospf_abr_announce_network_to_area(): old summary found");
+
sl = (struct summary_lsa *) old->data;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network_to_area(): "
- "old metric: %d, new metric: %d",
- GET_METRIC (sl->metric), cost);
- }
-
- if (old && (GET_METRIC (sl->metric) == cost))
- {
- if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network_to_area(): "
- "old summary approved");
- SET_FLAG (old->flags, OSPF_LSA_APPROVED);
+ zlog_debug ("ospf_abr_announce_network_to_area(): "
+ "old metric: %d, new metric: %d",
+ GET_METRIC (sl->metric), cost);
+
+ if ((GET_METRIC (sl->metric) == full_cost) &&
+ ((old->flags & OSPF_LSA_IN_MAXAGE) == 0))
+ {
+ /* unchanged. simply reapprove it */
+ if (IS_DEBUG_OSPF_EVENT)
+ zlog_debug ("ospf_abr_announce_network_to_area(): "
+ "old summary approved");
+ SET_FLAG (old->flags, OSPF_LSA_APPROVED);
+ }
+ else
+ {
+ /* LSA is changed, refresh it */
+ if (IS_DEBUG_OSPF_EVENT)
+ zlog_debug ("ospf_abr_announce_network_to_area(): "
+ "refreshing summary");
+ set_metric (old, full_cost);
+ lsa = ospf_lsa_refresh (area->ospf, old);
+
+ if (!lsa)
+ {
+ char buf[PREFIX2STR_BUFFER];
+
+ prefix2str ((struct prefix *) p, buf, sizeof(buf));
+ zlog_warn ("%s: Could not refresh %s to %s",
+ __func__,
+ buf,
+ inet_ntoa (area->area_id));
+ return;
+ }
+
+ SET_FLAG (lsa->flags, OSPF_LSA_APPROVED);
+ /* This will flood through area. */
+ }
}
else
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network_to_area(): "
- "creating new summary");
- if (old)
- {
-
- set_metric (old, cost);
- lsa = ospf_summary_lsa_refresh (old);
- /* This will flood through area. */
- }
- else
- {
- lsa = ospf_summary_lsa_originate (p, cost, area);
- /* This will flood through area. */
+ zlog_debug ("ospf_abr_announce_network_to_area(): "
+ "creating new summary");
+ lsa = ospf_summary_lsa_originate ( (struct prefix_ipv4 *)p, full_cost, area);
+ /* This will flood through area. */
+
+ if (!lsa)
+ {
+ char buf[PREFIX2STR_BUFFER];
+
+ prefix2str ((struct prefix *)p, buf, sizeof(buf));
+ zlog_warn ("%s: Could not originate %s to %s",
+ __func__,
+ buf,
+ inet_ntoa (area->area_id));
+ return;
}
-
SET_FLAG (lsa->flags, OSPF_LSA_APPROVED);
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network_to_area(): "
- "flooding new version of summary");
-
-#ifndef HAVE_NSSA
- ospf_flood_through_area (area, NULL, lsa);
-#endif /* ! HAVE_NSSA */
+ zlog_debug ("ospf_abr_announce_network_to_area(): "
+ "flooding new version of summary");
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network_to_area(): Stop");
+ zlog_debug ("ospf_abr_announce_network_to_area(): Stop");
}
-int
+static int
ospf_abr_nexthops_belong_to_area (struct ospf_route *or,
struct ospf_area *area)
{
- listnode node;
+ struct listnode *node, *nnode;
+ struct ospf_path *path;
+ struct ospf_interface *oi;
- for (node = listhead (or->path); node; nextnode (node))
- {
- struct ospf_path *path = node->data;
- struct ospf_interface *oi = path->oi;
-
- if (oi != NULL)
- if (oi->area == area)
- return 1;
- }
+ for (ALL_LIST_ELEMENTS_RO (or->paths, node, path))
+ for (ALL_LIST_ELEMENTS_RO (area->oiflist, nnode, oi))
+ if (oi->ifp && oi->ifp->ifindex == path->ifindex)
+ return 1;
return 0;
}
-int
-ospf_abr_should_accept (struct prefix *p, struct ospf_area *area)
+static int
+ospf_abr_should_accept (struct prefix_ipv4 *p, struct ospf_area *area)
{
if (IMPORT_NAME (area))
{
return 1;
}
-int
+static int
ospf_abr_plist_in_check (struct ospf_area *area, struct ospf_route *or,
- struct prefix *p)
+ struct prefix_ipv4 *p)
{
if (PREFIX_NAME_IN (area))
{
return 1;
}
-int
+static int
ospf_abr_plist_out_check (struct ospf_area *area, struct ospf_route *or,
- struct prefix *p)
+ struct prefix_ipv4 *p)
{
if (PREFIX_NAME_OUT (area))
{
return 1;
}
-void
-ospf_abr_announce_network (struct route_node *n, struct ospf_route *or)
+static void
+ospf_abr_announce_network (struct ospf *ospf,
+ struct prefix_ipv4 *p, struct ospf_route *or)
{
- listnode node;
struct ospf_area_range *range;
- struct prefix_ipv4 *p;
struct ospf_area *area, *or_area;
+ struct listnode *node;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network(): Start");
- p = (struct prefix_ipv4 *) &n->p;
+ zlog_debug ("ospf_abr_announce_network(): Start");
- or_area = ospf_area_lookup_by_area_id (or->u.std.area_id);
+ or_area = ospf_area_lookup_by_area_id (ospf, or->u.std.area_id);
assert (or_area);
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area))
{
- area = getdata (node);
-
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network(): looking at area %s",
+ zlog_debug ("ospf_abr_announce_network(): looking at area %s",
inet_ntoa (area->area_id));
if (IPV4_ADDR_SAME (&or->u.std.area_id, &area->area_id))
if (ospf_abr_nexthops_belong_to_area (or, area))
continue;
- if (!ospf_abr_should_accept (&n->p, area))
+ if (!ospf_abr_should_accept (p, area))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network(): "
+ zlog_debug ("ospf_abr_announce_network(): "
"prefix %s/%d was denied by import-list",
inet_ntoa (p->prefix), p->prefixlen);
continue;
}
- if (!ospf_abr_plist_in_check (area, or, &n->p))
+ if (!ospf_abr_plist_in_check (area, or, p))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network(): "
+ zlog_debug ("ospf_abr_announce_network(): "
"prefix %s/%d was denied by prefix-list",
inet_ntoa (p->prefix), p->prefixlen);
continue;
if (area->external_routing != OSPF_AREA_DEFAULT && area->no_summary)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network(): "
+ zlog_debug ("ospf_abr_announce_network(): "
"area %s is stub and no_summary",
inet_ntoa (area->area_id));
continue;
if (or->path_type == OSPF_PATH_INTER_AREA)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network(): this is "
+ zlog_debug ("ospf_abr_announce_network(): this is "
"inter-area route to %s/%d",
inet_ntoa (p->prefix), p->prefixlen);
}
if (or->path_type == OSPF_PATH_INTRA_AREA)
- {
- if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network(): "
- "this is intra-area route to %s/%d",
- inet_ntoa (p->prefix), p->prefixlen);
- if ((range = ospf_area_range_match (or_area, p)) &&
- !ospf_area_is_transit (area))
- ospf_abr_update_aggregate (range, or);
- else
- ospf_abr_announce_network_to_area (p, or->cost, area);
- }
+ {
+ if (IS_DEBUG_OSPF_EVENT)
+ zlog_debug ("ospf_abr_announce_network(): "
+ "this is intra-area route to %s/%d",
+ inet_ntoa (p->prefix), p->prefixlen);
+ if ((range = ospf_area_range_match (or_area, p))
+ && !ospf_area_is_transit (area))
+ ospf_abr_update_aggregate (range, or, area);
+ else
+ ospf_abr_announce_network_to_area (p, or->cost, area);
+ }
}
}
-int
-ospf_abr_should_announce (struct prefix *p, struct ospf_route *or)
+static int
+ospf_abr_should_announce (struct ospf *ospf,
+ struct prefix_ipv4 *p, struct ospf_route *or)
{
- struct ospf_area *area = ospf_area_lookup_by_area_id (or->u.std.area_id);
+ struct ospf_area *area;
+
+ area = ospf_area_lookup_by_area_id (ospf, or->u.std.area_id);
assert (area);
return 1;
}
-#ifdef HAVE_NSSA
-void
-ospf_abr_process_nssa_translates ()
+static void
+ospf_abr_process_nssa_translates (struct ospf *ospf)
{
/* Scan through all NSSA_LSDB records for all areas;
flood install as approved in Type-5 LSDB with XLATE Flag on
later, do same for all aggregates... At end, DISCARD all
remaining UNAPPROVED Type-5's (Aggregate is for future ) */
- listnode node;
+ struct listnode *node;
struct ospf_area *area;
+ struct route_node *rn;
+ struct ospf_lsa *lsa;
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_process_nssa_translates(): Start");
+ zlog_debug ("ospf_abr_process_nssa_translates(): Start");
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area))
{
- area = getdata (node);
-
- if (! area->NSSATranslator)
- continue; /* skip if not translator */
+ if (! area->NSSATranslatorState)
+ continue; /* skip if not translator */
if (area->external_routing != OSPF_AREA_NSSA)
- continue; /* skip if not Nssa Area */
+ continue; /* skip if not Nssa Area */
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_process_nssa_translates(): "
- "looking at area %s", inet_ntoa (area->area_id));
+ zlog_debug ("ospf_abr_process_nssa_translates(): "
+ "looking at area %s", inet_ntoa (area->area_id));
- foreach_lsa (NSSA_LSDB (area), area, 0, ospf_abr_translate_nssa);
+ LSDB_LOOP (NSSA_LSDB (area), rn, lsa)
+ ospf_abr_translate_nssa (area, lsa);
}
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_process_nssa_translates(): Stop");
+ zlog_debug ("ospf_abr_process_nssa_translates(): Stop");
}
-#endif /* HAVE_NSSA */
-void
-ospf_abr_process_network_rt (struct route_table *rt)
+static void
+ospf_abr_process_network_rt (struct ospf *ospf,
+ struct route_table *rt)
{
- struct route_node *rn;
- struct ospf_route *or;
struct ospf_area *area;
+ struct ospf_route *or;
+ struct route_node *rn;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_network_rt(): Start");
+ zlog_debug ("ospf_abr_process_network_rt(): Start");
for (rn = route_top (rt); rn; rn = route_next (rn))
{
if ((or = rn->info) == NULL)
continue;
- if (!(area = ospf_area_lookup_by_area_id (or->u.std.area_id)))
+ if (!(area = ospf_area_lookup_by_area_id (ospf, or->u.std.area_id)))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_network_rt(): area %s no longer exists",
+ zlog_debug ("ospf_abr_process_network_rt(): area %s no longer exists",
inet_ntoa (or->u.std.area_id));
continue;
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_network_rt(): this is a route to %s/%d",
+ zlog_debug ("ospf_abr_process_network_rt(): this is a route to %s/%d",
inet_ntoa (rn->p.u.prefix4), rn->p.prefixlen);
if (or->path_type >= OSPF_PATH_TYPE1_EXTERNAL)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_network_rt(): "
+ zlog_debug ("ospf_abr_process_network_rt(): "
"this is an External router, skipping");
continue;
}
if (or->cost >= OSPF_LS_INFINITY)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_network_rt():"
+ zlog_debug ("ospf_abr_process_network_rt():"
" this route's cost is infinity, skipping");
continue;
}
if (or->type == OSPF_DESTINATION_DISCARD)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_network_rt():"
+ zlog_debug ("ospf_abr_process_network_rt():"
" this is a discard entry, skipping");
continue;
}
if (or->path_type == OSPF_PATH_INTRA_AREA &&
- !ospf_abr_should_announce (&rn->p, or))
+ !ospf_abr_should_announce (ospf, (struct prefix_ipv4 *) &rn->p, or))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info("ospf_abr_process_network_rt(): denied by export-list");
+ zlog_debug("ospf_abr_process_network_rt(): denied by export-list");
continue;
}
if (or->path_type == OSPF_PATH_INTRA_AREA &&
- !ospf_abr_plist_out_check (area, or, &rn->p))
+ !ospf_abr_plist_out_check (area, or, (struct prefix_ipv4 *) &rn->p))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info("ospf_abr_process_network_rt(): denied by prefix-list");
+ zlog_debug("ospf_abr_process_network_rt(): denied by prefix-list");
continue;
}
!OSPF_IS_AREA_ID_BACKBONE (or->u.std.area_id))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_network_rt():"
+ zlog_debug ("ospf_abr_process_network_rt():"
" this is route is not backbone one, skipping");
continue;
}
- if ((ospf_top->abr_type == OSPF_ABR_CISCO) ||
- (ospf_top->abr_type == OSPF_ABR_IBM))
+ if ((ospf->abr_type == OSPF_ABR_CISCO) ||
+ (ospf->abr_type == OSPF_ABR_IBM))
- if (!ospf_act_bb_connection () &&
+ if (!ospf_act_bb_connection (ospf) &&
or->path_type != OSPF_PATH_INTRA_AREA)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_network_rt(): ALT ABR: "
+ zlog_debug ("ospf_abr_process_network_rt(): ALT ABR: "
"No BB connection, skip not intra-area routes");
continue;
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_network_rt(): announcing");
- ospf_abr_announce_network (rn, or);
+ zlog_debug ("ospf_abr_process_network_rt(): announcing");
+ ospf_abr_announce_network (ospf, (struct prefix_ipv4 *)&rn->p, or);
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_network_rt(): Stop");
+ zlog_debug ("ospf_abr_process_network_rt(): Stop");
}
-void
+static void
ospf_abr_announce_rtr_to_area (struct prefix_ipv4 *p, u_int32_t cost,
struct ospf_area *area)
{
struct summary_lsa *slsa = NULL;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_rtr_to_area(): Start");
-
- old = OSPF_SUMMARY_ASBR_LSA_SELF_FIND_BY_PREFIX (area, p);
- /* old = ospf_find_self_summary_asbr_lsa_by_prefix (area, p); */
+ zlog_debug ("ospf_abr_announce_rtr_to_area(): Start");
+ old = ospf_lsa_lookup_by_prefix (area->lsdb, OSPF_ASBR_SUMMARY_LSA,
+ p, area->ospf->router_id);
if (old)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_rtr_to_area(): old summary found");
+ zlog_debug ("ospf_abr_announce_rtr_to_area(): old summary found");
slsa = (struct summary_lsa *) old->data;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network_to_area(): "
+ zlog_debug ("ospf_abr_announce_network_to_area(): "
"old metric: %d, new metric: %d",
GET_METRIC (slsa->metric), cost);
}
- if (old && (GET_METRIC (slsa->metric) == cost))
+ if (old && (GET_METRIC (slsa->metric) == cost) &&
+ ((old->flags & OSPF_LSA_IN_MAXAGE) == 0))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_rtr_to_area(): old summary approved");
+ zlog_debug ("ospf_abr_announce_rtr_to_area(): old summary approved");
SET_FLAG (old->flags, OSPF_LSA_APPROVED);
}
else
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_rtr_to_area(): 2.2");
+ zlog_debug ("ospf_abr_announce_rtr_to_area(): 2.2");
if (old)
{
set_metric (old, cost);
- lsa = ospf_summary_asbr_lsa_refresh (old);
+ lsa = ospf_lsa_refresh (area->ospf, old);
}
else
lsa = ospf_summary_asbr_lsa_originate (p, cost, area);
-
+ if (!lsa)
+ {
+ char buf[PREFIX2STR_BUFFER];
+
+ prefix2str ((struct prefix *)p, buf, sizeof(buf));
+ zlog_warn ("%s: Could not refresh/originate %s to %s",
+ __func__,
+ buf,
+ inet_ntoa (area->area_id));
+ return;
+ }
+
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_rtr_to_area(): "
+ zlog_debug ("ospf_abr_announce_rtr_to_area(): "
"flooding new version of summary");
+
/*
zlog_info ("ospf_abr_announce_rtr_to_area(): creating new summary");
lsa = ospf_summary_asbr_lsa (p, cost, area, old); */
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_rtr_to_area(): Stop");
+ zlog_debug ("ospf_abr_announce_rtr_to_area(): Stop");
}
-void
-ospf_abr_announce_rtr (struct prefix_ipv4 *p, struct ospf_route *or)
+static void
+ospf_abr_announce_rtr (struct ospf *ospf,
+ struct prefix_ipv4 *p, struct ospf_route *or)
{
- listnode node;
+ struct listnode *node;
struct ospf_area *area;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_rtr(): Start");
+ zlog_debug ("ospf_abr_announce_rtr(): Start");
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area))
{
- area = getdata (node);
-
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_rtr(): looking at area %s",
+ zlog_debug ("ospf_abr_announce_rtr(): looking at area %s",
inet_ntoa (area->area_id));
if (IPV4_ADDR_SAME (&or->u.std.area_id, &area->area_id))
if (area->external_routing != OSPF_AREA_DEFAULT)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_network(): "
+ zlog_debug ("ospf_abr_announce_rtr(): "
"area %s doesn't support external routing",
inet_ntoa(area->area_id));
continue;
if (or->path_type == OSPF_PATH_INTER_AREA)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_rtr(): "
+ zlog_debug ("ospf_abr_announce_rtr(): "
"this is inter-area route to %s", inet_ntoa (p->prefix));
if (!OSPF_IS_AREA_BACKBONE (area))
ospf_abr_announce_rtr_to_area (p, or->cost, area);
if (or->path_type == OSPF_PATH_INTRA_AREA)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_rtr(): "
+ zlog_debug ("ospf_abr_announce_rtr(): "
"this is intra-area route to %s", inet_ntoa (p->prefix));
ospf_abr_announce_rtr_to_area (p, or->cost, area);
}
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_rtr(): Stop");
+ zlog_debug ("ospf_abr_announce_rtr(): Stop");
}
-void
-ospf_abr_process_router_rt (struct route_table *rt)
+static void
+ospf_abr_process_router_rt (struct ospf *ospf, struct route_table *rt)
{
- struct route_node *rn;
struct ospf_route *or;
+ struct route_node *rn;
struct list *l;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_router_rt(): Start");
+ zlog_debug ("ospf_abr_process_router_rt(): Start");
for (rn = route_top (rt); rn; rn = route_next (rn))
{
- listnode node;
+ struct listnode *node, *nnode;
char flag = 0;
struct ospf_route *best = NULL;
l = rn->info;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_router_rt(): this is a route to %s",
+ zlog_debug ("ospf_abr_process_router_rt(): this is a route to %s",
inet_ntoa (rn->p.u.prefix4));
- for (node = listhead (l); node; nextnode (node))
+ for (ALL_LIST_ELEMENTS (l, node, nnode, or))
{
- or = getdata (node);
- if (or == NULL)
- continue;
-
- if (!ospf_area_lookup_by_area_id (or->u.std.area_id))
+ if (!ospf_area_lookup_by_area_id (ospf, or->u.std.area_id))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_router_rt(): area %s no longer exists",
+ zlog_debug ("ospf_abr_process_router_rt(): area %s no longer exists",
inet_ntoa (or->u.std.area_id));
continue;
}
if (!CHECK_FLAG (or->u.std.flags, ROUTER_LSA_EXTERNAL))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_router_rt(): "
+ zlog_debug ("ospf_abr_process_router_rt(): "
"This is not an ASBR, skipping");
continue;
}
if (!flag)
{
- best = ospf_find_asbr_route (rt, (struct prefix_ipv4 *) &rn->p);
+ best = ospf_find_asbr_route (ospf, rt,
+ (struct prefix_ipv4 *) &rn->p);
flag = 1;
}
if (or != best)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_router_rt(): "
+ zlog_debug ("ospf_abr_process_router_rt(): "
"This route is not the best among possible, skipping");
continue;
}
!OSPF_IS_AREA_ID_BACKBONE (or->u.std.area_id))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_router_rt(): "
+ zlog_debug ("ospf_abr_process_router_rt(): "
"This route is not a backbone one, skipping");
continue;
}
if (or->cost >= OSPF_LS_INFINITY)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_router_rt(): "
+ zlog_debug ("ospf_abr_process_router_rt(): "
"This route has LS_INFINITY metric, skipping");
continue;
}
- if (ospf_top->abr_type == OSPF_ABR_CISCO ||
- ospf_top->abr_type == OSPF_ABR_IBM)
- if (!ospf_act_bb_connection () &&
- or->path_type != OSPF_PATH_INTRA_AREA)
+ if (ospf->abr_type == OSPF_ABR_CISCO
+ || ospf->abr_type == OSPF_ABR_IBM)
+ if (!ospf_act_bb_connection (ospf)
+ && or->path_type != OSPF_PATH_INTRA_AREA)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info("ospf_abr_process_network_rt(): ALT ABR: "
+ zlog_debug("ospf_abr_process_network_rt(): ALT ABR: "
"No BB connection, skip not intra-area routes");
continue;
}
- ospf_abr_announce_rtr ((struct prefix_ipv4 *) &rn->p, or);
+ ospf_abr_announce_rtr (ospf, (struct prefix_ipv4 *) &rn->p, or);
}
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_process_router_rt(): Stop");
+ zlog_debug ("ospf_abr_process_router_rt(): Stop");
}
-#ifdef HAVE_NSSA
-int
-ospf_abr_unapprove_translates_apply (struct ospf_lsa *lsa, void *p_arg,
- int int_arg)
+static void
+ospf_abr_unapprove_translates (struct ospf *ospf) /* For NSSA Translations */
{
- /* Could be a mix of Normal Type-5's, self-originated, or Type-7s
- that are Locally ABR Translated */
-
- if (CHECK_FLAG (lsa->flags, OSPF_LSA_LOCAL_XLT))
- UNSET_FLAG (lsa->flags, OSPF_LSA_APPROVED);
-
- return 0;
-}
+ struct ospf_lsa *lsa;
+ struct route_node *rn;
-void
-ospf_abr_unapprove_translates () /* For NSSA Translations */
-{
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_unapprove_translates(): Start");
+ zlog_debug ("ospf_abr_unapprove_translates(): Start");
/* NSSA Translator is not checked, because it may have gone away,
and we would want to flush any residuals anyway */
- foreach_lsa (EXTERNAL_LSDB (ospf_top), NULL, 0,
- ospf_abr_unapprove_translates_apply);
+ 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)
+ zlog_debug ("ospf_abr_unapprove_translates(): "
+ "approved unset on link id %s",
+ inet_ntoa (lsa->data->id));
+ }
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_unapprove_translates(): Stop");
+ zlog_debug ("ospf_abr_unapprove_translates(): Stop");
}
-#endif /* HAVE_NSSA */
-int
-ospf_abr_unapprove_summaries_apply (struct ospf_lsa *lsa, void *p_arg,
- int int_arg)
-{
- if (ospf_lsa_is_self_originated (lsa))
- UNSET_FLAG (lsa->flags, OSPF_LSA_APPROVED);
-
- return 0;
-}
-
-void
-ospf_abr_unapprove_summaries ()
+static void
+ospf_abr_unapprove_summaries (struct ospf *ospf)
{
- listnode node;
+ struct listnode *node;
struct ospf_area *area;
+ struct route_node *rn;
+ struct ospf_lsa *lsa;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_unapprove_summaries(): Start");
+ zlog_debug ("ospf_abr_unapprove_summaries(): Start");
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area))
{
- area = getdata (node);
- foreach_lsa (SUMMARY_LSDB (area), NULL, 0,
- ospf_abr_unapprove_summaries_apply);
- foreach_lsa (ASBR_SUMMARY_LSDB (area), NULL, 0,
- ospf_abr_unapprove_summaries_apply);
+ if (IS_DEBUG_OSPF_EVENT)
+ zlog_debug ("ospf_abr_unapprove_summaries(): "
+ "considering area %s",
+ inet_ntoa (area->area_id));
+ LSDB_LOOP (SUMMARY_LSDB (area), rn, lsa)
+ if (ospf_lsa_is_self_originated (ospf, lsa))
+ {
+ if (IS_DEBUG_OSPF_EVENT)
+ zlog_debug ("ospf_abr_unapprove_summaries(): "
+ "approved unset on summary link id %s",
+ inet_ntoa (lsa->data->id));
+ UNSET_FLAG (lsa->flags, OSPF_LSA_APPROVED);
+ }
+
+ LSDB_LOOP (ASBR_SUMMARY_LSDB (area), rn, lsa)
+ if (ospf_lsa_is_self_originated (ospf, lsa))
+ {
+ if (IS_DEBUG_OSPF_EVENT)
+ zlog_debug ("ospf_abr_unapprove_summaries(): "
+ "approved unset on asbr-summary link id %s",
+ inet_ntoa (lsa->data->id));
+ UNSET_FLAG (lsa->flags, OSPF_LSA_APPROVED);
+ }
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_unapprove_summaries(): Stop");
+ zlog_debug ("ospf_abr_unapprove_summaries(): Stop");
}
-void
-ospf_abr_prepare_aggregates ()
+static void
+ospf_abr_prepare_aggregates (struct ospf *ospf)
{
- listnode node;
+ struct listnode *node;
struct route_node *rn;
struct ospf_area_range *range;
+ struct ospf_area *area;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_prepare_aggregates(): Start");
+ zlog_debug ("ospf_abr_prepare_aggregates(): Start");
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area))
{
- struct ospf_area *area = getdata (node);
-
for (rn = route_top (area->ranges); rn; rn = route_next (rn))
if ((range = rn->info) != NULL)
{
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_prepare_aggregates(): Stop");
+ zlog_debug ("ospf_abr_prepare_aggregates(): Stop");
}
-void
-ospf_abr_announce_aggregates ()
+static void
+ospf_abr_announce_aggregates (struct ospf *ospf)
{
struct ospf_area *area, *ar;
struct ospf_area_range *range;
struct route_node *rn;
- struct prefix_ipv4 p;
- listnode node, n;
+ struct prefix p;
+ struct listnode *node, *n;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_aggregates(): Start");
+ zlog_debug ("ospf_abr_announce_aggregates(): Start");
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area))
{
- area = getdata (node);
-
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_aggregates(): looking at area %s",
+ zlog_debug ("ospf_abr_announce_aggregates(): looking at area %s",
inet_ntoa (area->area_id));
for (rn = route_top (area->ranges); rn; rn = route_next (rn))
if (!CHECK_FLAG (range->flags, OSPF_AREA_RANGE_ADVERTISE))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_aggregates():"
+ zlog_debug ("ospf_abr_announce_aggregates():"
" discarding suppress-ranges");
continue;
}
p.family = AF_INET;
- p.prefix = range->addr;
+ p.u.prefix4 = range->addr;
p.prefixlen = range->masklen;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_aggregates():"
+ zlog_debug ("ospf_abr_announce_aggregates():"
" this is range: %s/%d",
- inet_ntoa (p.prefix), p.prefixlen);
+ inet_ntoa (p.u.prefix4), p.prefixlen);
if (CHECK_FLAG (range->flags, OSPF_AREA_RANGE_SUBSTITUTE))
{
p.family = AF_INET;
- p.prefix = range->subst_addr;
+ p.u.prefix4 = range->subst_addr;
p.prefixlen = range->subst_masklen;
}
if (range->specifics)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_aggregates(): active range");
+ zlog_debug ("ospf_abr_announce_aggregates(): active range");
- for (n = listhead (ospf_top->areas); n; nextnode (n))
+ for (ALL_LIST_ELEMENTS_RO (ospf->areas, n, ar))
{
- ar = getdata (n);
if (ar == area)
continue;
OSPF_IS_AREA_BACKBONE (area))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_aggregates(): Skipping "
+ zlog_debug ("ospf_abr_announce_aggregates(): Skipping "
"announcement of BB aggregate into"
" a transit area");
continue;
}
- ospf_abr_announce_network_to_area (&p, range->cost, ar);
+ ospf_abr_announce_network_to_area ((struct prefix_ipv4 *)&p, range->cost, ar);
}
}
}
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_aggregates(): Stop");
+ zlog_debug ("ospf_abr_announce_aggregates(): Stop");
}
-#ifdef HAVE_NSSA
-void
-ospf_abr_send_nssa_aggregates () /* temporarily turned off */
+static void
+ospf_abr_send_nssa_aggregates (struct ospf *ospf) /* temporarily turned off */
{
- listnode node; /*, n; */
+ struct listnode *node; /*, n; */
struct ospf_area *area; /*, *ar; */
struct route_node *rn;
struct ospf_area_range *range;
struct prefix_ipv4 p;
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_send_nssa_aggregates(): Start");
+ zlog_debug ("ospf_abr_send_nssa_aggregates(): Start");
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area))
{
- area = getdata (node);
-
- if (! area->NSSATranslator)
+ if (! area->NSSATranslatorState)
continue;
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_send_nssa_aggregates(): looking at area %s",
+ zlog_debug ("ospf_abr_send_nssa_aggregates(): looking at area %s",
inet_ntoa (area->area_id));
for (rn = route_top (area->ranges); rn; rn = route_next (rn))
if (!CHECK_FLAG (range->flags, OSPF_AREA_RANGE_ADVERTISE))
{
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_send_nssa_aggregates():"
+ zlog_debug ("ospf_abr_send_nssa_aggregates():"
" discarding suppress-ranges");
continue;
}
p.prefixlen = range->masklen;
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_send_nssa_aggregates():"
+ zlog_debug ("ospf_abr_send_nssa_aggregates():"
" this is range: %s/%d",
inet_ntoa (p.prefix), p.prefixlen);
}
if (range->specifics)
- {
- if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_send_nssa_aggregates(): active range");
-
- /* Fetch LSA-Type-7 from aggregate prefix, and then
- translate, Install (as Type-5), Approve, and Flood */
- ospf_abr_translate_nssa_range (&p, range->cost);
- } /* if (range->specifics)*/
- } /* all area ranges*/
+ {
+ if (IS_DEBUG_OSPF_NSSA)
+ zlog_debug ("ospf_abr_send_nssa_aggregates(): active range");
+
+ /* Fetch LSA-Type-7 from aggregate prefix, and then
+ * translate, Install (as Type-5), Approve, and Flood
+ */
+ ospf_abr_translate_nssa_range (&p, range->cost);
+ }
+ } /* all area ranges*/
} /* all areas */
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_send_nssa_aggregates(): Stop");
+ zlog_debug ("ospf_abr_send_nssa_aggregates(): Stop");
}
-void
-ospf_abr_announce_nssa_defaults () /* By ABR-Translator */
-{
- listnode node;
- struct ospf_area *area;
- struct prefix_ipv4 p;
-
- if (! OSPF_IS_ABR)
- return;
-
- if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_announce_stub_defaults(): Start");
-
- p.family = AF_INET;
- p.prefix.s_addr = OSPF_DEFAULT_DESTINATION;
- p.prefixlen = 0;
-
- for (node = listhead (ospf_top->areas); node; nextnode (node))
- {
- area = getdata (node);
- if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_announce_nssa_defaults(): looking at area %s",
- inet_ntoa (area->area_id));
-
- if (area->external_routing != OSPF_AREA_NSSA)
- continue;
-
- if (OSPF_IS_AREA_BACKBONE (area))
- continue; /* Sanity Check */
-
- /* if (!TranslatorRole continue V 1.0 look for "always" conf */
- if (area->NSSATranslator)
- {
- if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_announce_nssa_defaults(): "
- "announcing 0.0.0.0/0 to this nssa");
- /* ospf_abr_announce_nssa_asbr_to_as (&p, area->default_cost, area); */
- }
- }
-}
-#endif /* HAVE_NSSA */
-
-void
-ospf_abr_announce_stub_defaults ()
+static void
+ospf_abr_announce_stub_defaults (struct ospf *ospf)
{
- listnode node;
+ struct listnode *node;
struct ospf_area *area;
struct prefix_ipv4 p;
- if (! OSPF_IS_ABR)
+ if (! IS_OSPF_ABR (ospf))
return;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_stub_defaults(): Start");
+ zlog_debug ("ospf_abr_announce_stub_defaults(): Start");
p.family = AF_INET;
p.prefix.s_addr = OSPF_DEFAULT_DESTINATION;
p.prefixlen = 0;
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area))
{
- area = getdata (node);
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_stub_defaults(): looking at area %s",
- inet_ntoa (area->area_id));
+ zlog_debug ("ospf_abr_announce_stub_defaults(): looking at area %s",
+ inet_ntoa (area->area_id));
-#ifdef HAVE_NSSA
- if (area->external_routing != OSPF_AREA_STUB)
-#else /* ! HAVE_NSSA */
- if (area->external_routing == OSPF_AREA_DEFAULT)
-#endif /* HAVE_NSSA */
- continue;
+ if ( (area->external_routing != OSPF_AREA_STUB)
+ && (area->external_routing != OSPF_AREA_NSSA)
+ )
+ continue;
if (OSPF_IS_AREA_BACKBONE (area))
- continue; /* Sanity Check */
+ continue; /* Sanity Check */
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_stub_defaults(): "
- "announcing 0.0.0.0/0 to this area");
+ zlog_debug ("ospf_abr_announce_stub_defaults(): "
+ "announcing 0.0.0.0/0 to area %s",
+ inet_ntoa (area->area_id));
ospf_abr_announce_network_to_area (&p, area->default_cost, area);
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_announce_stub_defaults(): Stop");
+ zlog_debug ("ospf_abr_announce_stub_defaults(): Stop");
}
-#ifdef HAVE_NSSA
-int
-ospf_abr_remove_unapproved_translates_apply (struct ospf_lsa *lsa, void *p_arg,
- int int_arg)
+static int
+ospf_abr_remove_unapproved_translates_apply (struct ospf *ospf,
+ struct ospf_lsa *lsa)
{
if (CHECK_FLAG (lsa->flags, OSPF_LSA_LOCAL_XLT)
&& ! CHECK_FLAG (lsa->flags, OSPF_LSA_APPROVED))
inet_ntoa (lsa->data->id));
/* FLUSH THROUGHOUT AS */
- ospf_lsa_flush_as (lsa);
+ ospf_lsa_flush_as (ospf, lsa);
/* DISCARD from LSDB */
}
return 0;
}
-void
-ospf_abr_remove_unapproved_translates () /* For NSSA Translations */
+static void
+ospf_abr_remove_unapproved_translates (struct ospf *ospf)
{
+ struct route_node *rn;
+ struct ospf_lsa *lsa;
+
/* All AREA PROCESS should have APPROVED necessary LSAs */
/* Remove any left over and not APPROVED */
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_remove_unapproved_translates(): Start");
+ zlog_debug ("ospf_abr_remove_unapproved_translates(): Start");
- foreach_lsa (EXTERNAL_LSDB (ospf_top), NULL, 0,
- ospf_abr_remove_unapproved_translates_apply);
+ LSDB_LOOP (EXTERNAL_LSDB (ospf), rn, lsa)
+ ospf_abr_remove_unapproved_translates_apply (ospf, lsa);
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_remove_unapproved_translates(): Stop");
-}
-#endif /* HAVE_NSSA */
-
-int
-ospf_abr_remove_unapproved_summaries_apply (struct ospf_lsa *lsa, void *p_arg,
- int int_arg)
-{
- struct ospf_area *area;
-
- area = (struct ospf_area *) p_arg;
-
- if (ospf_lsa_is_self_originated (lsa) &&
- !CHECK_FLAG (lsa->flags, OSPF_LSA_APPROVED))
- {
- if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_remove_unapproved_summaries(): "
- "removing unapproved summary, ID: %s",
- inet_ntoa (lsa->data->id));
- ospf_lsa_flush_area (lsa, area);
- }
- return 0;
+ zlog_debug ("ospf_abr_remove_unapproved_translates(): Stop");
}
-void
-ospf_abr_remove_unapproved_summaries ()
+static void
+ospf_abr_remove_unapproved_summaries (struct ospf *ospf)
{
- listnode node;
+ struct listnode *node;
struct ospf_area *area;
+ struct route_node *rn;
+ struct ospf_lsa *lsa;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_remove_unapproved_summaries(): Start");
+ zlog_debug ("ospf_abr_remove_unapproved_summaries(): Start");
- for (node = listhead (ospf_top->areas); node; nextnode (node))
+ for (ALL_LIST_ELEMENTS_RO (ospf->areas, node, area))
{
- area = getdata (node);
-
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_remove_unapproved_summaries(): "
+ zlog_debug ("ospf_abr_remove_unapproved_summaries(): "
"looking at area %s", inet_ntoa (area->area_id));
- foreach_lsa (SUMMARY_LSDB (area), area, 0,
- ospf_abr_remove_unapproved_summaries_apply);
- foreach_lsa (ASBR_SUMMARY_LSDB (area), area, 0,
- ospf_abr_remove_unapproved_summaries_apply);
+ 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)
+ if (ospf_lsa_is_self_originated (ospf, lsa))
+ if (!CHECK_FLAG (lsa->flags, OSPF_LSA_APPROVED))
+ ospf_lsa_flush_area (lsa, area);
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_remove_unapproved_summaries(): Stop");
+ zlog_debug ("ospf_abr_remove_unapproved_summaries(): Stop");
}
-void
-ospf_abr_manage_discard_routes ()
+static void
+ospf_abr_manage_discard_routes (struct ospf *ospf)
{
- listnode node;
+ struct listnode *node, *nnode;
struct route_node *rn;
struct ospf_area *area;
struct ospf_area_range *range;
- for (node = listhead (ospf_top->areas); node; nextnode (node))
- if ((area = node->data) != NULL)
- for (rn = route_top (area->ranges); rn; rn = route_next (rn))
- if ((range = rn->info) != NULL)
- if (CHECK_FLAG (range->flags, OSPF_AREA_RANGE_ADVERTISE))
- {
- if (range->specifics)
- ospf_add_discard_route (ospf_top->new_table, area,
- (struct prefix_ipv4 *) &rn->p);
- else
- ospf_delete_discard_route ((struct prefix_ipv4 *) &rn->p);
- }
+ for (ALL_LIST_ELEMENTS (ospf->areas, node, nnode, area))
+ for (rn = route_top (area->ranges); rn; rn = route_next (rn))
+ if ((range = rn->info) != NULL)
+ if (CHECK_FLAG (range->flags, OSPF_AREA_RANGE_ADVERTISE))
+ {
+ if (range->specifics)
+ ospf_add_discard_route (ospf->new_table, area,
+ (struct prefix_ipv4 *) &rn->p);
+ else
+ ospf_delete_discard_route (ospf->new_table,
+ (struct prefix_ipv4 *) &rn->p);
+ }
}
-#ifdef HAVE_NSSA
/* This is the function taking care about ABR NSSA, i.e. NSSA
Translator, -LSA aggregation and flooding. For all NSSAs
For External Calculations, any NSSA areas use the Type-7 AREA-LSDB,
any ABR-non-NSSA areas use the Type-5 GLOBAL-LSDB. */
-void
-ospf_abr_nssa_task () /* called only if any_nssa */
+static void
+ospf_abr_nssa_task (struct ospf *ospf) /* called only if any_nssa */
{
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("Check for NSSA-ABR Tasks():");
+ zlog_debug ("Check for NSSA-ABR Tasks():");
- if (! OSPF_IS_ABR)
+ if (! IS_OSPF_ABR (ospf))
return;
- if (! ospf_top->anyNSSA)
+ if (! ospf->anyNSSA)
return;
/* Each area must confirm TranslatorRole */
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_nssa_task(): Start");
+ zlog_debug ("ospf_abr_nssa_task(): Start");
/* For all Global Entries flagged "local-translate", unset APPROVED */
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_nssa_task(): unapprove translates");
+ zlog_debug ("ospf_abr_nssa_task(): unapprove translates");
- ospf_abr_unapprove_translates ();
+ ospf_abr_unapprove_translates (ospf);
/* RESET all Ranges in every Area, same as summaries */
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_nssa_task(): NSSA initialize aggregates");
-
- /* ospf_abr_prepare_aggregates (); TURNED OFF just for now */
+ zlog_debug ("ospf_abr_nssa_task(): NSSA initialize aggregates");
+ ospf_abr_prepare_aggregates (ospf); /*TURNED OFF just for now */
/* For all NSSAs, Type-7s, translate to 5's, INSTALL/FLOOD, or
- Aggregate as Type-7 */
- /* Install or Approve in Type-5 Global LSDB */
+ * Aggregate as Type-7
+ * Install or Approve in Type-5 Global LSDB
+ */
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_nssa_task(): process translates");
-
- ospf_abr_process_nssa_translates (ospf_top->new_table);
+ zlog_debug ("ospf_abr_nssa_task(): process translates");
+ ospf_abr_process_nssa_translates (ospf);
/* Translate/Send any "ranged" aggregates, and also 5-Install and
- Approve */
- /* Scan Type-7's for aggregates, translate to Type-5's,
- Install/Flood/Approve */
+ * Approve
+ * Scan Type-7's for aggregates, translate to Type-5's,
+ * Install/Flood/Approve
+ */
if (IS_DEBUG_OSPF_NSSA)
- zlog_info("ospf_abr_nssa_task(): send NSSA aggregates");
- /* ospf_abr_send_nssa_aggregates (); TURNED OFF FOR NOW */
-
- /* Send any NSSA defaults as Type-5 */
- if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_nssa_task(): announce nssa defaults");
- ospf_abr_announce_nssa_defaults ();
+ zlog_debug("ospf_abr_nssa_task(): send NSSA aggregates");
+ ospf_abr_send_nssa_aggregates (ospf); /*TURNED OFF FOR NOW */
+
+ /* Send any NSSA defaults as Type-5
+ *if (IS_DEBUG_OSPF_NSSA)
+ * zlog_debug ("ospf_abr_nssa_task(): announce nssa defaults");
+ *ospf_abr_announce_nssa_defaults (ospf);
+ * havnt a clue what above is supposed to do.
+ */
/* Flush any unapproved previous translates from Global Data Base */
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_nssa_task(): remove unapproved translates");
- ospf_abr_remove_unapproved_translates ();
+ zlog_debug ("ospf_abr_nssa_task(): remove unapproved translates");
+ ospf_abr_remove_unapproved_translates (ospf);
- ospf_abr_manage_discard_routes (); /* same as normal...discard */
+ ospf_abr_manage_discard_routes (ospf); /* same as normal...discard */
if (IS_DEBUG_OSPF_NSSA)
- zlog_info ("ospf_abr_nssa_task(): Stop");
+ zlog_debug ("ospf_abr_nssa_task(): Stop");
}
-#endif /* HAVE_NSSA */
/* This is the function taking care about ABR stuff, i.e.
summary-LSA origination and flooding. */
void
-ospf_abr_task ()
+ospf_abr_task (struct ospf *ospf)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_task(): Start");
+ zlog_debug ("ospf_abr_task(): Start");
- if (ospf_top->new_table == NULL || ospf_top->new_rtrs == NULL)
+ if (ospf->new_table == NULL || ospf->new_rtrs == NULL)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_task(): Routing tables are not yet ready");
+ zlog_debug ("ospf_abr_task(): Routing tables are not yet ready");
return;
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_task(): unapprove summaries");
- ospf_abr_unapprove_summaries ();
+ zlog_debug ("ospf_abr_task(): unapprove summaries");
+ ospf_abr_unapprove_summaries (ospf);
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_task(): prepare aggregates");
- ospf_abr_prepare_aggregates ();
+ zlog_debug ("ospf_abr_task(): prepare aggregates");
+ ospf_abr_prepare_aggregates (ospf);
- if (OSPF_IS_ABR)
+ if (IS_OSPF_ABR (ospf))
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_task(): process network RT");
- ospf_abr_process_network_rt (ospf_top->new_table);
+ zlog_debug ("ospf_abr_task(): process network RT");
+ ospf_abr_process_network_rt (ospf, ospf->new_table);
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_task(): process router RT");
- ospf_abr_process_router_rt (ospf_top->new_rtrs);
+ zlog_debug ("ospf_abr_task(): process router RT");
+ ospf_abr_process_router_rt (ospf, ospf->new_rtrs);
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_task(): announce aggregates");
- ospf_abr_announce_aggregates ();
+ zlog_debug ("ospf_abr_task(): announce aggregates");
+ ospf_abr_announce_aggregates (ospf);
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_task(): announce stub defaults");
- ospf_abr_announce_stub_defaults ();
+ zlog_debug ("ospf_abr_task(): announce stub defaults");
+ ospf_abr_announce_stub_defaults (ospf);
}
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_task(): remove unapproved summaries");
- ospf_abr_remove_unapproved_summaries ();
+ zlog_debug ("ospf_abr_task(): remove unapproved summaries");
+ ospf_abr_remove_unapproved_summaries (ospf);
- ospf_abr_manage_discard_routes ();
-
-#ifdef HAVE_NSSA
- ospf_abr_nssa_task(); /* if nssa-abr, then scan Type-7 LSDB */
-#endif /* HAVE_NSSA */
+ ospf_abr_manage_discard_routes (ospf);
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("ospf_abr_task(): Stop");
+ zlog_debug ("ospf_abr_task(): Stop");
}
-
-int
-ospf_abr_task_timer (struct thread *t)
+static int
+ospf_abr_task_timer (struct thread *thread)
{
- ospf_top->t_abr_task = 0;
+ struct ospf *ospf = THREAD_ARG (thread);
+
+ ospf->t_abr_task = 0;
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("Running ABR task on timer");
+ zlog_debug ("Running ABR task on timer");
- ospf_check_abr_status ();
+ ospf_check_abr_status (ospf);
+ ospf_abr_nssa_check_status (ospf);
- ospf_abr_task ();
+ ospf_abr_task (ospf);
+ ospf_abr_nssa_task (ospf); /* if nssa-abr, then scan Type-7 LSDB */
- return 0;
+ return 0;
}
void
-ospf_schedule_abr_task ()
+ospf_schedule_abr_task (struct ospf *ospf)
{
if (IS_DEBUG_OSPF_EVENT)
- zlog_info ("Scheduling ABR task");
- if (! ospf_top->t_abr_task)
- ospf_top->t_abr_task = thread_add_timer (master, ospf_abr_task_timer,
- 0, OSPF_ABR_TASK_DELAY);
+ zlog_debug ("Scheduling ABR task");
+
+ thread_add_timer(master, ospf_abr_task_timer, ospf, OSPF_ABR_TASK_DELAY,
+ &ospf->t_abr_task);
}
projects / mirror_frr.git / blobdiff