Merge branch 'master' into scheduler_cleanup
[olsrd.git] / src / olsr.c
index 8f57d6c..5f719f4 100644 (file)
@@ -51,7 +51,8 @@
 #include "mid_set.h"
 #include "lq_mpr.h"
 #include "olsr_spf.h"
-#include "scheduler.h"
+#include "olsr_timer.h"
+#include "olsr_socket.h"
 #include "neighbor_table.h"
 #include "lq_packet.h"
 #include "common/avl.h"
@@ -190,8 +191,8 @@ olsr_init_willingness(void)
     /* Run it first and then periodic. */
     olsr_update_willingness(NULL);
 
-    willingness_timer_info = olsr_alloc_timerinfo("Update Willingness", &olsr_update_willingness, true);
-    olsr_start_timer(olsr_cnf->will_int, 5, NULL, willingness_timer_info);
+    willingness_timer_info = olsr_timer_add("Update Willingness", &olsr_update_willingness, true);
+    olsr_timer_start(olsr_cnf->will_int, 5, NULL, willingness_timer_info);
   }
 }