[ospfd] Bug #330 regression: failure to calculate routes through networks

2007-03-23 Paul Jakma <paul.jakma@sun.com>

	* ospf_spf.c: (ospf_nexthop_calculation) Fix silly regression
	  causing ospfd to fail to calculate paths past networks not
	  attached to root vertex, introduced with bug #330 fixes.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index d0a3fcf04b1489b576194a240d115f2095a44b80..654c31a231a0d0f19cbcc40814133864b7b6538d 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,6 +1,9 @@
 2007-03-23 Paul Jakma <paul.jakma@sun.com>
 
        * ospf_spf.c: (various) Add more debug statements.
+         (ospf_nexthop_calculation) Fix silly regression causing ospfd
+         to fail to calculate paths past networks not attached to root
+         vertex, introduced with bug #330 fixes.
 
 2007-03-14 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 

diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c
index f6e5e6630d517f749e37f6c6544c8f5af07eafa7..c8cbe3f6f0b862df1cf49680ffd5058875d41923 100644 (file)
--- a/ospfd/ospf_spf.c
+++ b/ospfd/ospf_spf.c
@@ -677,7 +677,8 @@ ospf_nexthop_calculation (struct ospf_area *area, struct vertex *v,
                 }
             }
         }
-      return added;
+      if (added)
+        return added;
     }
 
   /* 16.1.1 para 4.  If there is at least one intervening router in the