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)
1  2 
src/olsr.c
src/olsr_spf.c

diff --cc src/olsr.c
@@@ -212,11 -211,14 +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,9 -274,6 +277,11 @@@ olsr_init_tables(void
    /* Initialize HNA set */
    olsr_init_hna_set();  
  
-   // olsr_initialize_layer12();
++#if 0
 +  /* Initialize Layer 1/2 database */
++  olsr_initialize_layer12();
++#endif
 +  
    /* 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,
diff --cc src/olsr_spf.c
@@@ -62,7 -62,7 +62,7 @@@
  #include "hna_set.h"
  #include "common/list.h"
  #include "common/avl.h"
- #include "olsr_spf.h"
 -#include "lq_route.h"
++ #include "olsr_spf.h"
  #include "net_olsr.h"
  #include "lq_plugin.h"