Automated merge with http://gredler.at/hg/olsrd/

[olsrd.git] / src / olsr.c

diff --git a/src/olsr.c b/src/olsr.c
index 65ac6b3..aae15f7 100644 (file)
--- a/src/olsr.c
+++ b/src/olsr.c
@@ -52,7 +52,7 @@
 #include "mid_set.h"
 #include "mpr.h"
 #include "lq_mpr.h"
 #include "mid_set.h"
 #include "mpr.h"
 #include "lq_mpr.h"

-#include "lq_route.h"
+#include "olsr_spf.h"

 #include "scheduler.h"
 #include "apm.h"
 #include "misc.h"
 #include "scheduler.h"
 #include "apm.h"
 #include "misc.h"


@@ -61,6 +61,7 @@
 #include "lq_packet.h"
 #include "common/avl.h"
 #include "net_olsr.h"
 #include "lq_packet.h"
 #include "common/avl.h"
 #include "net_olsr.h"

+#include "lq_plugin.h"

 
 #include <stdarg.h>
 #include <signal.h>
 
 #include <stdarg.h>
 #include <signal.h>


@@ -218,7 +219,6 @@ void
 olsr_trigger_forced_update(void *unused __attribute__((unused))) {
 
   changes_force = OLSR_TRUE;
 olsr_trigger_forced_update(void *unused __attribute__((unused))) {
 
   changes_force = OLSR_TRUE;

-

   changes_neighborhood = OLSR_TRUE;
   changes_topology = OLSR_TRUE;
   changes_hna = OLSR_TRUE;
   changes_neighborhood = OLSR_TRUE;
   changes_topology = OLSR_TRUE;
   changes_hna = OLSR_TRUE;


@@ -240,13 +240,16 @@ olsr_init_tables(void)
 
   /* Set avl tree comparator */
   if (olsr_cnf->ipsize == 4) {
 
   /* Set avl tree comparator */
   if (olsr_cnf->ipsize == 4) {

-    avl_comp_default = NULL;
+    avl_comp_default = avl_comp_ipv4;

     avl_comp_prefix_default = avl_comp_ipv4_prefix;
   } else {
     avl_comp_default = avl_comp_ipv6;
     avl_comp_prefix_default = avl_comp_ipv6_prefix;
   }
 
     avl_comp_prefix_default = avl_comp_ipv4_prefix;
   } else {
     avl_comp_default = avl_comp_ipv6;
     avl_comp_prefix_default = avl_comp_ipv6_prefix;
   }
 

+  /* Initialize lq plugin set */
+  init_lq_handler_tree();
+  

   /* Initialize link set */
   olsr_init_link_set();
 
   /* Initialize link set */
   olsr_init_link_set();
 


@@ -274,6 +277,11 @@ olsr_init_tables(void)
   /* Initialize HNA set */
   olsr_init_hna_set();  
 
   /* Initialize HNA set */
   olsr_init_hna_set();  
 

+#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,
   /* 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,