FIX: warning on linux in link_set.c
authorHenning Rogge <hrogge@googlemail.com>
Sat, 21 Feb 2009 10:30:03 +0000 (11:30 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Sat, 21 Feb 2009 10:30:03 +0000 (11:30 +0100)
Disable -Werror for stable branch

Makefile.inc
src/link_set.c

index a8489b5..d595c8e 100644 (file)
@@ -87,7 +87,8 @@ endif
 #WARNINGS +=   -Wunreachable-code
 WARNINGS +=    -Winline
 WARNINGS +=    -Wdisabled-optimization
-WARNINGS +=    -Werror
+# Disable -Werror in stable branch
+#WARNINGS +=   -Werror
 WARNINGS +=    -finline-functions-called-once
 WARNINGS +=    -fearly-inlining
 ifeq ($(DEBUG),0)
index ec307e4..7dafb78 100644 (file)
@@ -466,6 +466,11 @@ olsr_expire_link_entry(void *context)
 void
 olsr_set_link_timer(struct link_entry *link, unsigned int rel_timer)
 {
+  struct ipaddr_str buf;
+
+  fprintf(stderr, "reset link timer: %s = %u\n",
+    olsr_ip_to_string(&buf, &link->neighbor_iface_addr),
+    (unsigned int)(olsr_times() + rel_timer/1000));
   olsr_set_timer(&link->link_timer, rel_timer, OLSR_LINK_JITTER, OLSR_TIMER_ONESHOT, &olsr_expire_link_entry, link, 0);
 }