summaryrefslogtreecommitdiff
path: root/ospfd/ospf_ase.c
diff options
context:
space:
mode:
authorhasso <hasso>2004-06-20 21:00:27 +0000
committerhasso <hasso>2004-06-20 21:00:27 +0000
commitbeebba75167b33e05b5e02a41179ad0c13a0bcd7 (patch)
tree83b72a338e29f7f6cff2b83fd2c71e8615f9f8e5 /ospfd/ospf_ase.c
parent320ec10a24d8dd81d0aa011dc92e07877e4e02f8 (diff)
Remove ifdef's HAVE_NSSA. NSSA support is stable enough.
Diffstat (limited to 'ospfd/ospf_ase.c')
-rw-r--r--ospfd/ospf_ase.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/ospfd/ospf_ase.c b/ospfd/ospf_ase.c
index db43e102..c7b343c3 100644
--- a/ospfd/ospf_ase.c
+++ b/ospfd/ospf_ase.c
@@ -293,7 +293,6 @@ ospf_ase_calculate_route (struct ospf *ospf, struct ospf_lsa * lsa)
assert (lsa);
al = (struct as_external_lsa *) lsa->data;
-#ifdef HAVE_NSSA
if (lsa->data->type == OSPF_AS_NSSA_LSA)
if (IS_DEBUG_OSPF_NSSA)
zlog_info ("ospf_ase_calc(): Processing Type-7");
@@ -305,7 +304,6 @@ ospf_ase_calculate_route (struct ospf *ospf, struct ospf_lsa * lsa)
zlog_info ("ospf_ase_calc(): Rejecting Local Xlt'd");
return 0;
}
-#endif /* HAVE_NSSA */
zlog_info ("Route[External]: Calculate AS-external-LSA to %s/%d",
inet_ntoa (al->header.id), ip_masklen (al->mask));
@@ -613,10 +611,8 @@ ospf_ase_calculate_timer (struct thread *t)
struct ospf *ospf;
struct ospf_lsa *lsa;
struct route_node *rn;
-#ifdef HAVE_NSSA
listnode node;
struct ospf_area *area;
-#endif /* HAVE_NSSA */
ospf = THREAD_ARG (t);
ospf->t_ase_calc = NULL;
@@ -629,7 +625,6 @@ ospf_ase_calculate_timer (struct thread *t)
LSDB_LOOP (EXTERNAL_LSDB (ospf), rn, lsa)
ospf_ase_calculate_route (ospf, lsa);
-#ifdef HAVE_NSSA
/* This version simple adds to the table all NSSA areas */
if (ospf->anyNSSA)
for (node = listhead (ospf->areas); node; nextnode (node))
@@ -647,8 +642,6 @@ ospf_ase_calculate_timer (struct thread *t)
LSDB_LOOP (NSSA_LSDB (ospf),rn,lsa)
ospf_ase_calculate_route(ospf,lsa);
-#endif /* HAVE_NSSA */
-
/* Compare old and new external routing table and install the
difference info zebra/kernel */
ospf_ase_compare_tables (ospf->new_external_route,