2004-11-12 Paul Jakma <paul@dishone.st>

	* ospf_ia.c: (process_summary_lsa) Only an ABR has any reason to
          ignore stub area summary default. Even so it seems a strange
          check, add a comment to that effect.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 3adaeaf7b4cab70a7a671738fec5172c311088f5..85d9950877a83d57cfd89aa02b083b0e6c9f875a 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-12 Paul Jakma <paul@dishone.st>
+
+       * ospf_ia.c: (process_summary_lsa) Only an ABR has any reason to
+          ignore stub area summary default. Even so it seems a strange
+          check, add a comment to that effect.
+
 2004-11-04 Paul Jakma <paul@dishone.st>
 
        * ospfd.c: (ospf_network_match_iface) revert to previous network

diff --git a/ospfd/ospf_ia.c b/ospfd/ospf_ia.c
index ff47f4fe7d18bfc8fc607ad0035ef64fc75c6e3b..8e82582d764ae83bc94310f861f4c638bf331e8f 100644 (file)
--- a/ospfd/ospf_ia.c
+++ b/ospfd/ospf_ia.c
@@ -241,7 +241,12 @@ process_summary_lsa (struct ospf_area *area, struct route_table *rt,
       ospf_area_range_active (range))
     return 0;
 
-  if (ospf->abr_type != OSPF_ABR_STAND &&
+  /* XXX: This check seems dubious to me. If an ABR has already decided
+   * to consider summaries received in this area, then why would one wish
+   * to exclude default? 
+   */
+  if (IS_OSPF_ABR(ospf) && 
+      ospf->abr_type != OSPF_ABR_STAND &&
       area->external_routing != OSPF_AREA_DEFAULT &&
       p.prefix.s_addr == OSPF_DEFAULT_DESTINATION &&
       p.prefixlen == 0)