Squashed one bug in timing of route scans.

diff --git a/TODO b/TODO
index 5efbdefe40a93aee39639f66f01ffff9e098b4df..ced47f2e6eb21edd56b27578f961ba28fca74d16 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,22 +5,22 @@ Core
 * cleanup debugging calls
 * logging and tracing; use appropriate log levels
 * check log calls for trailing newlines
+* check if all protocols set proper packet priorities and TTL's.
 * replace all NUM's by expr's
 
 - TOS not supported by kernel -> automatically drop routes with TOS<>0
+
 - config: executable config files
+- config: define ipaddr constants?
+- config: better default protocol names
 
 - fake multipath?
-- config file: define ipaddr constants?
 - counters (according to SNMP MIB?)
 - better memory allocators
 - default preferences of protocols: prefer BGP over OSPF/RIP external routes?
 - secondary addresses -> subinterfaces
-- check if all protocols set proper packet priorities and TTL's.
 
-- better default protocol names
 - config: comments at end of line -> explicit ';' needed?
-- command-line arguments: name of config file
 
 - static: check validity of route destination?
 - static: device routes

diff --git a/sysdep/linux/krt-scan.c b/sysdep/linux/krt-scan.c
index 55ba3a864eb56576613940aa1026d22fddf83abd..1428a7ac68893852793da7fa2133bfc323d48305 100644 (file)
--- a/sysdep/linux/krt-scan.c
+++ b/sysdep/linux/krt-scan.c
@@ -310,7 +310,7 @@ krt_scan_ifaces_done(struct krt_proto *x)
   SCANOPT;
   SCANSTAT;
 
-  s->accum_time += p->scan_time;
+  s->accum_time += ((struct krt_config *) x->p.cf)->ifopt.scan_time;
   if (p->scan_time && s->accum_time >= p->scan_time)
     {
       s->accum_time %= p->scan_time;
@@ -322,7 +322,7 @@ krt_scan_ifaces_done(struct krt_proto *x)
 void
 krt_scan_preconfig(struct krt_config *c)
 {
-  c->scanopt.scan_time = 1;
+  c->scanopt.scan_time = 60;
   c->scanopt.learn = 0;
 }