Bugfix for Link quality dijkstra limit

diff --git a/src/cfgparser/olsrd_conf.c b/src/cfgparser/olsrd_conf.c
index 4e205da..7ee2454 100644 (file)
--- a/src/cfgparser/olsrd_conf.c
+++ b/src/cfgparser/olsrd_conf.c
@@ -234,6 +234,12 @@ olsrd_sanity_check_cnf(struct olsrd_config *cnf)
        }
     }
 
+  /* Check Link quality dijkstra limit */
+  if (olsr_cnf->lq_dinter < cnf->pollrate && olsr_cnf->lq_dlimit != 255) {
+       fprintf(stderr, "Link quality dijkstra limit must be higher than pollrate\n");
+       return -1;
+  }
+  
   /* Pollrate */
 
   if(cnf->pollrate < MIN_POLLRATE ||

diff --git a/src/lq_route.c b/src/lq_route.c
index 9795815..fd4c487 100644 (file)
--- a/src/lq_route.c
+++ b/src/lq_route.c
@@ -316,7 +316,7 @@ olsr_expire_spf_backoff(void *context __attribute__((unused)))
 }
 
 void
-olsr_calculate_routing_table (void *context __attribute__((unused)))
+olsr_calculate_routing_table (void)
 {
 #ifdef SPF_PROFILING
   struct timeval t1, t2, t3, t4, t5, spf_init, spf_run, route, kernel, total;

diff --git a/src/lq_route.h b/src/lq_route.h
index 8aaba2d..1ce225b 100644 (file)
--- a/src/lq_route.h
+++ b/src/lq_route.h
@@ -41,6 +41,6 @@
 #ifndef _LQ_ROUTE_H
 #define _LQ_ROUTE_H
 
-void olsr_calculate_routing_table(void *);
+void olsr_calculate_routing_table(void);
 
 #endif

diff --git a/src/olsr.c b/src/olsr.c
index 5407958..65ac6b3 100644 (file)
--- a/src/olsr.c
+++ b/src/olsr.c
@@ -169,7 +169,7 @@ olsr_process_changes(void)
 
   /* calculate the routing table */
   if (changes_neighborhood || changes_topology || changes_hna) {
-    olsr_calculate_routing_table(NULL);
+    olsr_calculate_routing_table();
   }
   
   if (olsr_cnf->debug_level > 0)
@@ -211,9 +211,20 @@ olsr_process_changes(void)
   changes_force = OLSR_FALSE;
 }
 
+/*
+ * Callback for the periodic route calculation.
+ */
+void
+olsr_trigger_forced_update(void *unused __attribute__((unused))) {
 
+  changes_force = OLSR_TRUE;
 
-
+  changes_neighborhood = OLSR_TRUE;
+  changes_topology = OLSR_TRUE;
+  changes_hna = OLSR_TRUE;
+  
+  olsr_process_changes();
+}
 
 /**
  *Initialize all the tables used(neighbor,
@@ -266,7 +277,7 @@ olsr_init_tables(void)
   /* Start periodic SPF and RIB recalculation */
   if (olsr_cnf->lq_dinter > 0.0) {
     olsr_start_timer((unsigned int)(olsr_cnf->lq_dinter * MSEC_PER_SEC), 5,
-                     OLSR_TIMER_PERIODIC, &olsr_calculate_routing_table, NULL, 0);
+                     OLSR_TIMER_PERIODIC, &olsr_trigger_forced_update, NULL, 0);
   }
 }
 

diff --git a/src/olsr.h b/src/olsr.h
index 46856d9..6f9b168 100644 (file)
--- a/src/olsr.h
+++ b/src/olsr.h
@@ -99,4 +99,7 @@ olsr_malloc(size_t, const char *);
 int
 olsr_printf(int, const char *, ...) __attribute__((format(printf,2,3)));
 
+void
+olsr_trigger_forced_update(void *);
+
 #endif