Automated merge with http://gredler.at/hg/olsrd/
authorHannes Gredler <hannes@gredler.at>
Mon, 19 May 2008 12:14:25 +0000 (14:14 +0200)
committerHannes Gredler <hannes@gredler.at>
Mon, 19 May 2008 12:14:25 +0000 (14:14 +0200)
Makefile
src/olsr.c
src/olsr_spf.c

index 6ea2e7b..3976031 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@
 # the copyright holders.
 #
 
-VERS =         0.5.6-rc1
+VERS =         0.5.6-rc3
 
 TOPDIR = .
 include Makefile.inc
index 071b904..aae15f7 100644 (file)
@@ -212,11 +212,13 @@ 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_force = OLSR_TRUE;
   changes_neighborhood = OLSR_TRUE;
   changes_topology = OLSR_TRUE;
   changes_hna = OLSR_TRUE;
@@ -275,8 +277,10 @@ olsr_init_tables(void)
   /* Initialize HNA set */
   olsr_init_hna_set();  
 
+#if 0
   /* Initialize Layer 1/2 database */
-  // olsr_initialize_layer12();
+  olsr_initialize_layer12();
+#endif
   
   /* Start periodic SPF and RIB recalculation */
   if (olsr_cnf->lq_dinter > 0.0) {
index 866a0eb..1418ea4 100644 (file)
@@ -62,7 +62,7 @@
 #include "hna_set.h"
 #include "common/list.h"
 #include "common/avl.h"
-#include "olsr_spf.h"
+ #include "olsr_spf.h"
 #include "net_olsr.h"
 #include "lq_plugin.h"