summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2007-03-23 11:19:08 +0000
committerPaul Jakma <paul.jakma@sun.com>2007-03-23 11:19:08 +0000
commit85ef784e8a41a6dd11da42e10368f80c8bdb99d8 (patch)
treeb2089c197ee4eaefc18a15d1cb30118f2c66daab
parentb75ae99e1d95685869fb38049e1936129fe17fc9 (diff)
[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.
-rw-r--r--ospfd/ChangeLog3
-rw-r--r--ospfd/ospf_spf.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index d0a3fcf0..654c31a2 100644
--- 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 f6e5e663..c8cbe3f6 100644
--- 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