Merge r4373, r4374, r4378

diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile
index 2bced7a76f0a9814eefc1e7e9d5c9a9859249e1d..1baab9de7e485d6871f47730f919bcc10cbf6a3f 100644 (file)
--- a/contrib/package/olsrd-luci/Makefile
+++ b/contrib/package/olsrd-luci/Makefile
@@ -11,22 +11,22 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASENAME:=olsrd
 PKG_NAME:=$(PKG_BASENAME)-luci
-PKG_BASEVER:=0.5.6-r3
-PKG_VERSION:=$(PKG_BASEVER)+hg1781
-PKG_RELEASE:=2
-
-PKG_HGREV:=ecb9cb41f488
-PKG_SOURCE:=$(PKG_HGREV).tar.gz
-PKG_SOURCE_URL:=http://gredler.at/hg/olsrd-0.5.6/archive
-PKG_MD5SUM:=554baef838afe51cf1f7238f2ba28db0
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_HGREV)
-PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
-
-#PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_BASEVER).tar.bz2
-#PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
-#PKG_MD5SUM:=0935688fa0fb5b0e073fe53ec654c5b2
-#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_BASEVER)
-#PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xjf $(DL_DIR)/$(PKG_SOURCE)
+PKG_BASEVER:=0.5.6-r4
+PKG_VERSION:=$(PKG_BASEVER)+luci1
+PKG_RELEASE:=1
+
+#PKG_HGREV:=54e88033741d
+#PKG_SOURCE:=$(PKG_HGREV).tar.gz
+#PKG_SOURCE_URL:=http://gredler.at/hg/olsrd-0.5.6/archive
+#PKG_MD5SUM:=e195860d25f152245d6d92257c31304d
+#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_HGREV)
+#PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+
+PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_BASEVER).tar.bz2
+PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
+PKG_MD5SUM:=16076660413bcf625ba8772fdb3d607f
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_BASEVER)
+PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xjf $(DL_DIR)/$(PKG_SOURCE)
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch b/contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch
index 06e34a6d3dea872791bad74cd25f9a55782a608a..a87ee5dbbf3a5388c0ed34b6cab311a6a9da260c 100644 (file)
--- a/contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch
+++ b/contrib/package/olsrd-luci/patches/140-olsrd-optimize-size.patch
@@ -1,6 +1,6 @@
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/Makefile.inc olsrd-0-5-6-ecb9cb41f488/Makefile.inc
---- olsrd-0-5-6-ecb9cb41f488.orig/Makefile.inc 2009-03-18 21:44:01.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/Makefile.inc      2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/Makefile.inc olsrd-0.5.6-r4/Makefile.inc
+--- olsrd-0.5.6-r4.orig/Makefile.inc   2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/Makefile.inc        2009-03-27 17:33:00.000000000 +0000
 @@ -204,6 +204,10 @@
  $(warning Use CPPFLAGS instead of DEFINES for -D)
  endif
@@ -12,9 +12,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/Makefile.inc olsrd-0-5-6-ecb9cb41f488/Mak
  TAGFILE ?=    src/TAGS
  
  help:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/lib/bmf/src/NetworkInterfaces.c olsrd-0-5-6-ecb9cb41f488/lib/bmf/src/NetworkInterfaces.c
---- olsrd-0-5-6-ecb9cb41f488.orig/lib/bmf/src/NetworkInterfaces.c      2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/lib/bmf/src/NetworkInterfaces.c   2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/lib/bmf/src/NetworkInterfaces.c olsrd-0.5.6-r4/lib/bmf/src/NetworkInterfaces.c
+--- olsrd-0.5.6-r4.orig/lib/bmf/src/NetworkInterfaces.c        2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/lib/bmf/src/NetworkInterfaces.c     2009-03-27 17:33:00.000000000 +0000
 @@ -544,7 +544,9 @@
            OLSR_PRINTF(9, "%s: ----> Not forwarding to %s: no link found\n", PLUGIN_NAME_SHORT,
                        olsr_ip_to_string(&buf, &walker->neighbor_iface_addr));
@@ -25,9 +25,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/lib/bmf/src/NetworkInterfaces.c olsrd-0-5
  
            OLSR_PRINTF(9, "%s: ----> Not forwarding to %s: \"%s\" gives a better link to this neighbor, costing %5.2f\n",
                        PLUGIN_NAME_SHORT, olsr_ip_to_string(&buf, &walker->neighbor_iface_addr), bestIntf->int_name,
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/lib/httpinfo/Makefile olsrd-0-5-6-ecb9cb41f488/lib/httpinfo/Makefile
---- olsrd-0-5-6-ecb9cb41f488.orig/lib/httpinfo/Makefile        2009-03-18 21:44:01.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/lib/httpinfo/Makefile     2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/lib/httpinfo/Makefile olsrd-0.5.6-r4/lib/httpinfo/Makefile
+--- olsrd-0.5.6-r4.orig/lib/httpinfo/Makefile  2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/lib/httpinfo/Makefile       2009-03-27 17:33:00.000000000 +0000
 @@ -47,7 +47,11 @@
  CPPFLAGS +=   -DADMIN_INTERFACE
  endif
@@ -40,9 +40,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/lib/httpinfo/Makefile olsrd-0-5-6-ecb9cb4
  
  default_target: $(PLUGIN_FULLNAME)
  ifdef ADMIN_INTERFACE
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/lib/httpinfo/src/olsrd_httpinfo.c olsrd-0-5-6-ecb9cb41f488/lib/httpinfo/src/olsrd_httpinfo.c
---- olsrd-0-5-6-ecb9cb41f488.orig/lib/httpinfo/src/olsrd_httpinfo.c    2009-03-18 21:44:01.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/lib/httpinfo/src/olsrd_httpinfo.c 2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/lib/httpinfo/src/olsrd_httpinfo.c olsrd-0.5.6-r4/lib/httpinfo/src/olsrd_httpinfo.c
+--- olsrd-0.5.6-r4.orig/lib/httpinfo/src/olsrd_httpinfo.c      2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/lib/httpinfo/src/olsrd_httpinfo.c   2009-03-27 17:33:00.000000000 +0000
 @@ -67,7 +67,9 @@
  
  #include "olsrd_httpinfo.h"
@@ -159,9 +159,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/lib/httpinfo/src/olsrd_httpinfo.c olsrd-0
  
  static int
  check_allowed_ip(const struct allowed_net *const allowed_nets, const union olsr_ip_addr *const addr)
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/lib/nameservice/src/nameservice.c olsrd-0-5-6-ecb9cb41f488/lib/nameservice/src/nameservice.c
---- olsrd-0-5-6-ecb9cb41f488.orig/lib/nameservice/src/nameservice.c    2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/lib/nameservice/src/nameservice.c 2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/lib/nameservice/src/nameservice.c olsrd-0.5.6-r4/lib/nameservice/src/nameservice.c
+--- olsrd-0.5.6-r4.orig/lib/nameservice/src/nameservice.c      2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/lib/nameservice/src/nameservice.c   2009-03-27 17:33:00.000000000 +0000
 @@ -65,6 +65,11 @@
  #include "mapwrite.h"
  #include "compat.h"
@@ -463,9 +463,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/lib/nameservice/src/nameservice.c olsrd-0
      case NAME_SERVICE:
        service_table_changed = true;
        break;
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/apm.h olsrd-0-5-6-ecb9cb41f488/src/apm.h
---- olsrd-0-5-6-ecb9cb41f488.orig/src/apm.h    2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/apm.h 2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/apm.h olsrd-0.5.6-r4/src/apm.h
+--- olsrd-0.5.6-r4.orig/src/apm.h      2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/apm.h   2009-03-27 17:33:00.000000000 +0000
 @@ -41,6 +41,7 @@
  
  #ifndef _OLSR_APM
@@ -482,9 +482,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/apm.h olsrd-0-5-6-ecb9cb41f488/src/ap
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/cfgfile_gen.c olsrd-0-5-6-ecb9cb41f488/src/cfgparser/cfgfile_gen.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/cfgfile_gen.c  2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/cfgparser/cfgfile_gen.c       2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/cfgparser/cfgfile_gen.c olsrd-0.5.6-r4/src/cfgparser/cfgfile_gen.c
+--- olsrd-0.5.6-r4.orig/src/cfgparser/cfgfile_gen.c    2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/cfgparser/cfgfile_gen.c 2009-03-27 17:33:00.000000000 +0000
 @@ -57,7 +57,9 @@
    struct olsr_if *in = cnf->interfaces;
    struct plugin_entry *pe = cnf->plugins;
@@ -537,9 +537,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/cfgfile_gen.c olsrd-0-5-6-e
  
    /* Hysteresis */
    WRITE_TO_BUF("# Hysteresis adds more robustness to the\n# link sensing.\n# Used by default. 'yes' or 'no'\n\n");
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/local.mk olsrd-0-5-6-ecb9cb41f488/src/cfgparser/local.mk
---- olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/local.mk       2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/cfgparser/local.mk    2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/cfgparser/local.mk olsrd-0.5.6-r4/src/cfgparser/local.mk
+--- olsrd-0.5.6-r4.orig/src/cfgparser/local.mk 2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/cfgparser/local.mk      2009-03-27 17:33:00.000000000 +0000
 @@ -41,8 +41,13 @@
  C=$(if $(CFGDIR),$(CFGDIR)/)
  
@@ -554,9 +554,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/local.mk olsrd-0-5-6-ecb9cb
  HDRS += $(foreach file,olsrd_conf oparse,$(C)$(file).h)
  
  $(C)oscan.c: $(C)oscan.lex $(C)Makefile
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/olsrd_conf.c olsrd-0-5-6-ecb9cb41f488/src/cfgparser/olsrd_conf.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/olsrd_conf.c   2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/cfgparser/olsrd_conf.c        2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/cfgparser/olsrd_conf.c olsrd-0.5.6-r4/src/cfgparser/olsrd_conf.c
+--- olsrd-0.5.6-r4.orig/src/cfgparser/olsrd_conf.c     2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/cfgparser/olsrd_conf.c  2009-03-27 17:33:00.000000000 +0000
 @@ -81,11 +81,13 @@
    }
  
@@ -592,7 +592,7 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/olsrd_conf.c olsrd-0-5-6-ec
    cnf->ipsize = sizeof(struct in_addr);
    cnf->maxplen = 32;
 @@ -400,7 +406,9 @@
-   cnf->rtproto = 3;
+   cnf->rtproto = DEF_RTPROTO;
    cnf->rttable_default = 0;
    cnf->willingness_auto = DEF_WILL_AUTO;
 +#ifndef SVEN_OLA_UNBLOAT
@@ -617,9 +617,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/olsrd_conf.c olsrd-0-5-6-ec
  
  #if defined WIN32
  struct ioinfo {
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/oparse.y olsrd-0-5-6-ecb9cb41f488/src/cfgparser/oparse.y
---- olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/oparse.y       2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/cfgparser/oparse.y    2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/cfgparser/oparse.y olsrd-0.5.6-r4/src/cfgparser/oparse.y
+--- olsrd-0.5.6-r4.orig/src/cfgparser/oparse.y 2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/cfgparser/oparse.y      2009-03-27 17:33:00.000000000 +0000
 @@ -178,7 +178,6 @@
  %token TOK_RTPROTO
  %token TOK_RTTABLE_DEFAULT
@@ -741,9 +741,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/oparse.y olsrd-0-5-6-ecb9cb
  iifweight:       TOK_IFWEIGHT TOK_INTEGER
  {
    int ifcnt = ifs_in_curr_cfg;
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/oscan.lex olsrd-0-5-6-ecb9cb41f488/src/cfgparser/oscan.lex
---- olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/oscan.lex      2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/cfgparser/oscan.lex   2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/cfgparser/oscan.lex olsrd-0.5.6-r4/src/cfgparser/oscan.lex
+--- olsrd-0.5.6-r4.orig/src/cfgparser/oscan.lex        2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/cfgparser/oscan.lex     2009-03-27 17:33:00.000000000 +0000
 @@ -253,11 +253,6 @@
      return TOK_NETLABEL;
  }
@@ -768,9 +768,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/cfgparser/oscan.lex olsrd-0-5-6-ecb9c
  "FIBMetric" {
      yylval = NULL;
      return TOK_FIBMETRIC;
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/defs.h olsrd-0-5-6-ecb9cb41f488/src/defs.h
---- olsrd-0-5-6-ecb9cb41f488.orig/src/defs.h   2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/defs.h        2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/defs.h olsrd-0.5.6-r4/src/defs.h
+--- olsrd-0.5.6-r4.orig/src/defs.h     2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/defs.h  2009-03-27 17:33:00.000000000 +0000
 @@ -190,6 +190,8 @@
   */
  clock_t olsr_times(void);
@@ -788,9 +788,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/defs.h olsrd-0-5-6-ecb9cb41f488/src/d
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/duplicate_set.c olsrd-0-5-6-ecb9cb41f488/src/duplicate_set.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/duplicate_set.c  2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/duplicate_set.c       2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/duplicate_set.c olsrd-0.5.6-r4/src/duplicate_set.c
+--- olsrd-0.5.6-r4.orig/src/duplicate_set.c    2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/duplicate_set.c 2009-03-27 17:33:00.000000000 +0000
 @@ -174,6 +174,7 @@
    return false;                 /* no duplicate */
  }
@@ -807,9 +807,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/duplicate_set.c olsrd-0-5-6-ecb9cb41f
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/hna_set.c olsrd-0-5-6-ecb9cb41f488/src/hna_set.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/hna_set.c        2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/hna_set.c     2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/hna_set.c olsrd-0.5.6-r4/src/hna_set.c
+--- olsrd-0.5.6-r4.orig/src/hna_set.c  2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/hna_set.c       2009-03-27 17:33:00.000000000 +0000
 @@ -279,6 +279,7 @@
   *
   *@return nada
@@ -826,9 +826,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/hna_set.c olsrd-0-5-6-ecb9cb41f488/sr
  
  /**
   *Process incoming HNA message.
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/interfaces.c olsrd-0-5-6-ecb9cb41f488/src/interfaces.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/interfaces.c     2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/interfaces.c  2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/interfaces.c olsrd-0.5.6-r4/src/interfaces.c
+--- olsrd-0.5.6-r4.orig/src/interfaces.c       2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/interfaces.c    2009-03-27 17:33:00.000000000 +0000
 @@ -93,12 +93,16 @@
    OLSR_PRINTF(1, "\n ---- Interface configuration ---- \n\n");
    /* Run trough all interfaces immedeatly */
@@ -868,9 +868,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/interfaces.c olsrd-0-5-6-ecb9cb41f488
  
    strscpy(interf_n->name, name, name_size);
    interf_n->next = olsr_cnf->interfaces;
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/interfaces.h olsrd-0-5-6-ecb9cb41f488/src/interfaces.h
---- olsrd-0-5-6-ecb9cb41f488.orig/src/interfaces.h     2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/interfaces.h  2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/interfaces.h olsrd-0.5.6-r4/src/interfaces.h
+--- olsrd-0.5.6-r4.orig/src/interfaces.h       2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/interfaces.h    2009-03-27 17:33:00.000000000 +0000
 @@ -200,7 +200,12 @@
  
  struct interface *if_ifwithindex(const int if_index);
@@ -885,9 +885,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/interfaces.h olsrd-0-5-6-ecb9cb41f488
  
  int add_ifchgf(int (*f) (struct interface *, int));
  
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/ipc_frontend.c olsrd-0-5-6-ecb9cb41f488/src/ipc_frontend.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/ipc_frontend.c   2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/ipc_frontend.c        2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/ipc_frontend.c olsrd-0.5.6-r4/src/ipc_frontend.c
+--- olsrd-0.5.6-r4.orig/src/ipc_frontend.c     2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/ipc_frontend.c  2009-03-27 17:33:00.000000000 +0000
 @@ -46,6 +46,7 @@
   *
   */
@@ -904,9 +904,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/ipc_frontend.c olsrd-0-5-6-ecb9cb41f4
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/ipc_frontend.h olsrd-0-5-6-ecb9cb41f488/src/ipc_frontend.h
---- olsrd-0-5-6-ecb9cb41f488.orig/src/ipc_frontend.h   2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/ipc_frontend.h        2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/ipc_frontend.h olsrd-0.5.6-r4/src/ipc_frontend.h
+--- olsrd-0.5.6-r4.orig/src/ipc_frontend.h     2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/ipc_frontend.h  2009-03-27 17:33:00.000000000 +0000
 @@ -48,6 +48,7 @@
  
  #ifndef _OLSR_IPC
@@ -923,9 +923,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/ipc_frontend.h olsrd-0-5-6-ecb9cb41f4
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/ipcalc.c olsrd-0-5-6-ecb9cb41f488/src/ipcalc.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/ipcalc.c 2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/ipcalc.c      2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/ipcalc.c olsrd-0.5.6-r4/src/ipcalc.c
+--- olsrd-0.5.6-r4.orig/src/ipcalc.c   2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/ipcalc.c        2009-03-27 17:33:00.000000000 +0000
 @@ -121,6 +121,7 @@
    return prefix;
  }
@@ -942,9 +942,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/ipcalc.c olsrd-0-5-6-ecb9cb41f488/src
  
  /* see if the ipaddr is in the net. That is equivalent to the fact that the net part
   * of both are equal. So we must compare the first <prefixlen> bits.
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/ipcalc.h olsrd-0-5-6-ecb9cb41f488/src/ipcalc.h
---- olsrd-0-5-6-ecb9cb41f488.orig/src/ipcalc.h 2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/ipcalc.h      2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/ipcalc.h olsrd-0.5.6-r4/src/ipcalc.h
+--- olsrd-0.5.6-r4.orig/src/ipcalc.h   2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/ipcalc.h        2009-03-27 17:33:00.000000000 +0000
 @@ -146,7 +146,9 @@
    return inet_ntop(olsr_cnf->ip_version, addr, buf->buf, sizeof(buf->buf));
  }
@@ -955,9 +955,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/ipcalc.h olsrd-0-5-6-ecb9cb41f488/src
  
  static INLINE const char *
  sockaddr4_to_string(struct ipaddr_str *const buf, const struct sockaddr *const addr)
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/link_set.c olsrd-0-5-6-ecb9cb41f488/src/link_set.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/link_set.c       2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/link_set.c    2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/link_set.c olsrd-0.5.6-r4/src/link_set.c
+--- olsrd-0.5.6-r4.orig/src/link_set.c 2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/link_set.c      2009-03-27 17:33:00.000000000 +0000
 @@ -761,6 +761,7 @@
    return ret;
  }
@@ -974,9 +974,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/link_set.c olsrd-0-5-6-ecb9cb41f488/s
  
  /*
   * called for every LQ HELLO message.
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/linux/apm.c olsrd-0-5-6-ecb9cb41f488/src/linux/apm.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/linux/apm.c      2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/linux/apm.c   2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/linux/apm.c olsrd-0.5.6-r4/src/linux/apm.c
+--- olsrd-0.5.6-r4.orig/src/linux/apm.c        2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/linux/apm.c     2009-03-27 17:33:00.000000000 +0000
 @@ -44,6 +44,7 @@
   * Acpi-Power Enlightenment epplet
   */
@@ -993,10 +993,10 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/linux/apm.c olsrd-0-5-6-ecb9cb41f488/
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/linux/kernel_routes.c olsrd-0-5-6-ecb9cb41f488/src/linux/kernel_routes.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/linux/kernel_routes.c    2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/linux/kernel_routes.c 2009-03-18 21:50:25.000000000 +0000
-@@ -297,11 +297,13 @@
+diff -ur olsrd-0.5.6-r4.orig/src/linux/kernel_routes.c olsrd-0.5.6-r4/src/linux/kernel_routes.c
+--- olsrd-0.5.6-r4.orig/src/linux/kernel_routes.c      2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/linux/kernel_routes.c   2009-03-27 17:33:00.000000000 +0000
+@@ -300,11 +300,13 @@
      if (rt_ret > 0) rt_ret = 0; /* successful recovery */
      else rt_ret = -1; /* unrecoverable error */
    }
@@ -1010,7 +1010,7 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/linux/kernel_routes.c olsrd-0-5-6-ecb
    if (rt_ret == -2) olsr_syslog(OLSR_LOG_ERR,"no rtnetlink response! (no system ressources left?, everything may happen now ...)");
    return rt_ret;
  }
-@@ -339,7 +341,9 @@
+@@ -342,7 +344,9 @@
    int rslt;
  #endif /* LINUX_POLICY_ROUTING */
  
@@ -1020,7 +1020,7 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/linux/kernel_routes.c olsrd-0-5-6-ecb
  
  #if !LINUX_POLICY_ROUTING
    memset(&kernel_route, 0, sizeof(struct rtentry));
-@@ -413,7 +417,9 @@
+@@ -416,7 +420,9 @@
    struct in6_rtmsg kernel_route;
    int rslt;
  
@@ -1030,7 +1030,7 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/linux/kernel_routes.c olsrd-0-5-6-ecb
  
    memset(&kernel_route, 0, sizeof(struct in6_rtmsg));
  
-@@ -466,7 +472,9 @@
+@@ -469,7 +475,9 @@
    int rslt;
  #endif /* LINUX_POLICY_ROUTING */
  
@@ -1040,7 +1040,7 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/linux/kernel_routes.c olsrd-0-5-6-ecb
  
  #if !LINUX_POLICY_ROUTING
    memset(&kernel_route, 0, sizeof(struct rtentry));
-@@ -533,7 +541,9 @@
+@@ -536,7 +544,9 @@
    int rslt;
  #endif /* LINUX_POLICY_ROUTING */
  
@@ -1050,9 +1050,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/linux/kernel_routes.c olsrd-0-5-6-ecb
  
  #if !LINUX_POLICY_ROUTING
    memset(&kernel_route, 0, sizeof(struct in6_rtmsg));
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/linux/net.c olsrd-0-5-6-ecb9cb41f488/src/linux/net.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/linux/net.c      2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/linux/net.c   2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/linux/net.c olsrd-0.5.6-r4/src/linux/net.c
+--- olsrd-0.5.6-r4.orig/src/linux/net.c        2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/linux/net.c     2009-03-27 17:33:00.000000000 +0000
 @@ -69,8 +69,10 @@
  #define SIOCGIWRATE   0x8B21  /* get default bit rate (bps) */
  
@@ -1249,9 +1249,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/linux/net.c olsrd-0-5-6-ecb9cb41f488/
  /**
   *Creates a nonblocking broadcast socket.
   *@param sa sockaddr struct. Used for bind(2).
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin.c olsrd-0-5-6-ecb9cb41f488/src/lq_plugin.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin.c      2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/lq_plugin.c   2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/lq_plugin.c olsrd-0.5.6-r4/src/lq_plugin.c
+--- olsrd-0.5.6-r4.orig/src/lq_plugin.c        2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/lq_plugin.c     2009-03-27 17:33:00.000000000 +0000
 @@ -67,12 +67,18 @@
  init_lq_handler_tree(void)
  {
@@ -1319,9 +1319,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin.c olsrd-0-5-6-ecb9cb41f488/
  {
    struct link_entry *h;
  
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin_default_float.c olsrd-0-5-6-ecb9cb41f488/src/lq_plugin_default_float.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin_default_float.c        2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/lq_plugin_default_float.c     2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/lq_plugin_default_float.c olsrd-0.5.6-r4/src/lq_plugin_default_float.c
+--- olsrd-0.5.6-r4.orig/src/lq_plugin_default_float.c  2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/lq_plugin_default_float.c       2009-03-27 17:33:00.000000000 +0000
 @@ -39,6 +39,7 @@
   *
   */
@@ -1338,9 +1338,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin_default_float.c olsrd-0-5-6
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin_default_float.h olsrd-0-5-6-ecb9cb41f488/src/lq_plugin_default_float.h
---- olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin_default_float.h        2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/lq_plugin_default_float.h     2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/lq_plugin_default_float.h olsrd-0.5.6-r4/src/lq_plugin_default_float.h
+--- olsrd-0.5.6-r4.orig/src/lq_plugin_default_float.h  2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/lq_plugin_default_float.h       2009-03-27 17:33:00.000000000 +0000
 @@ -39,6 +39,7 @@
   *
   */
@@ -1357,9 +1357,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin_default_float.h olsrd-0-5-6
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin_default_fpm.c olsrd-0-5-6-ecb9cb41f488/src/lq_plugin_default_fpm.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin_default_fpm.c  2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/lq_plugin_default_fpm.c       2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/lq_plugin_default_fpm.c olsrd-0.5.6-r4/src/lq_plugin_default_fpm.c
+--- olsrd-0.5.6-r4.orig/src/lq_plugin_default_fpm.c    2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/lq_plugin_default_fpm.c 2009-03-27 17:33:00.000000000 +0000
 @@ -39,6 +39,7 @@
   *
   */
@@ -1376,9 +1376,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin_default_fpm.c olsrd-0-5-6-e
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin_default_fpm.h olsrd-0-5-6-ecb9cb41f488/src/lq_plugin_default_fpm.h
---- olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin_default_fpm.h  2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/lq_plugin_default_fpm.h       2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/lq_plugin_default_fpm.h olsrd-0.5.6-r4/src/lq_plugin_default_fpm.h
+--- olsrd-0.5.6-r4.orig/src/lq_plugin_default_fpm.h    2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/lq_plugin_default_fpm.h 2009-03-27 17:33:00.000000000 +0000
 @@ -39,6 +39,7 @@
   *
   */
@@ -1395,9 +1395,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/lq_plugin_default_fpm.h olsrd-0-5-6-e
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/main.c olsrd-0-5-6-ecb9cb41f488/src/main.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/main.c   2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/main.c        2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/main.c olsrd-0.5.6-r4/src/main.c
+--- olsrd-0.5.6-r4.orig/src/main.c     2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/main.c  2009-03-27 17:33:00.000000000 +0000
 @@ -256,13 +256,17 @@
    /*
     * Print configuration
@@ -1549,9 +1549,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/main.c olsrd-0-5-6-ecb9cb41f488/src/m
  
      /*
       * Delete possible default GWs
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/neighbor_table.c olsrd-0-5-6-ecb9cb41f488/src/neighbor_table.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/neighbor_table.c 2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/neighbor_table.c      2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/neighbor_table.c olsrd-0.5.6-r4/src/neighbor_table.c
+--- olsrd-0.5.6-r4.orig/src/neighbor_table.c   2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/neighbor_table.c        2009-03-27 17:33:00.000000000 +0000
 @@ -362,6 +362,7 @@
   *
   *@return nada
@@ -1568,9 +1568,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/neighbor_table.c olsrd-0-5-6-ecb9cb41
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/net_olsr.c olsrd-0-5-6-ecb9cb41f488/src/net_olsr.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/net_olsr.c       2009-03-18 21:45:54.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/net_olsr.c    2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/net_olsr.c olsrd-0.5.6-r4/src/net_olsr.c
+--- olsrd-0.5.6-r4.orig/src/net_olsr.c 2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/net_olsr.c      2009-03-27 17:33:00.000000000 +0000
 @@ -44,7 +44,9 @@
  #include "log.h"
  #include "olsr.h"
@@ -1609,9 +1609,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/net_olsr.c olsrd-0-5-6-ecb9cb41f488/s
        retval = -1;
      }
    }
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/olsr.c olsrd-0-5-6-ecb9cb41f488/src/olsr.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/olsr.c   2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/olsr.c        2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/olsr.c olsrd-0.5.6-r4/src/olsr.c
+--- olsrd-0.5.6-r4.orig/src/olsr.c     2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/olsr.c  2009-03-27 17:33:00.000000000 +0000
 @@ -149,7 +149,9 @@
      return;
  
@@ -1692,9 +1692,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/olsr.c olsrd-0-5-6-ecb9cb41f488/src/o
  
  /**
   *Wrapper for printf that prints to a specific
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/olsr.h olsrd-0-5-6-ecb9cb41f488/src/olsr.h
---- olsrd-0-5-6-ecb9cb41f488.orig/src/olsr.h   2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/olsr.h        2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/olsr.h olsrd-0.5.6-r4/src/olsr.h
+--- olsrd-0.5.6-r4.orig/src/olsr.h     2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/olsr.h  2009-03-27 17:33:00.000000000 +0000
 @@ -72,15 +72,21 @@
  
  uint8_t olsr_calculate_willingness(void);
@@ -1717,10 +1717,10 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/olsr.h olsrd-0-5-6-ecb9cb41f488/src/o
  
  int olsr_printf(int, const char *, ...) __attribute__ ((format(printf, 2, 3)));
  
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/olsr_cfg.h olsrd-0-5-6-ecb9cb41f488/src/olsr_cfg.h
---- olsrd-0-5-6-ecb9cb41f488.orig/src/olsr_cfg.h       2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/olsr_cfg.h    2009-03-18 21:46:46.000000000 +0000
-@@ -146,8 +146,10 @@
+diff -ur olsrd-0.5.6-r4.orig/src/olsr_cfg.h olsrd-0.5.6-r4/src/olsr_cfg.h
+--- olsrd-0.5.6-r4.orig/src/olsr_cfg.h 2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/olsr_cfg.h      2009-03-27 17:33:00.000000000 +0000
+@@ -148,8 +148,10 @@
    char *name;
    char *config;
    bool configured;
@@ -1731,7 +1731,7 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/olsr_cfg.h olsrd-0-5-6-ecb9cb41f488/s
    struct interface *interf;
    struct if_config_options *cnf;
    struct olsr_if *next;
-@@ -190,7 +192,9 @@
+@@ -192,7 +194,9 @@
    uint16_t olsrport;
    int debug_level;
    bool no_fork;
@@ -1741,7 +1741,7 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/olsr_cfg.h olsrd-0-5-6-ecb9cb41f488/s
    int ip_version;
    bool allow_no_interfaces;
    uint16_t tos;
-@@ -199,13 +203,17 @@
+@@ -201,13 +205,17 @@
    uint8_t rttable_default;
    uint8_t willingness;
    bool willingness_auto;
@@ -1759,7 +1759,7 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/olsr_cfg.h olsrd-0-5-6-ecb9cb41f488/s
    struct olsr_if *interfaces;
    float pollrate;
    float nic_chgs_pollrate;
-@@ -265,7 +273,9 @@
+@@ -267,7 +275,9 @@
  
    void olsrd_free_cnf(struct olsrd_config *);
  
@@ -1769,9 +1769,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/olsr_cfg.h olsrd-0-5-6-ecb9cb41f488/s
  
    int olsrd_write_cnf(struct olsrd_config *, const char *);
  
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/parser.c olsrd-0-5-6-ecb9cb41f488/src/parser.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/parser.c 2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/parser.c      2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/parser.c olsrd-0.5.6-r4/src/parser.c
+--- olsrd-0.5.6-r4.orig/src/parser.c   2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/parser.c        2009-03-27 17:33:00.000000000 +0000
 @@ -51,7 +51,9 @@
  #include "rebuild_packet.h"
  #include "net_os.h"
@@ -1782,7 +1782,7 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/parser.c olsrd-0-5-6-ecb9cb41f488/src
  #include "net_olsr.h"
  
  #ifdef WIN32
-@@ -280,8 +282,10 @@
+@@ -281,8 +283,10 @@
    //printf("Message from %s\n\n", olsr_ip_to_string(&buf, from_addr));
  
    /* Display packet */
@@ -1793,9 +1793,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/parser.c olsrd-0-5-6-ecb9cb41f488/src
  
    if (olsr_cnf->ip_version == AF_INET)
      msgsize = ntohs(m->v4.olsr_msgsize);
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/print_packet.c olsrd-0-5-6-ecb9cb41f488/src/print_packet.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/print_packet.c   2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/print_packet.c        2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/print_packet.c olsrd-0.5.6-r4/src/print_packet.c
+--- olsrd-0.5.6-r4.orig/src/print_packet.c     2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/print_packet.c  2009-03-27 17:33:00.000000000 +0000
 @@ -39,6 +39,7 @@
   *
   */
@@ -1812,9 +1812,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/print_packet.c olsrd-0-5-6-ecb9cb41f4
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/process_routes.c olsrd-0-5-6-ecb9cb41f488/src/process_routes.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/process_routes.c 2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/process_routes.c      2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/process_routes.c olsrd-0.5.6-r4/src/process_routes.c
+--- olsrd-0.5.6-r4.orig/src/process_routes.c   2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/process_routes.c        2009-03-27 17:33:00.000000000 +0000
 @@ -159,6 +159,7 @@
  static void
  olsr_delete_kernel_route(struct rt_entry *rt)
@@ -1868,9 +1868,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/process_routes.c olsrd-0-5-6-ecb9cb41
    olsr_print_routing_table(&routingtree);
  #endif
  }
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/rebuild_packet.c olsrd-0-5-6-ecb9cb41f488/src/rebuild_packet.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/rebuild_packet.c 2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/rebuild_packet.c      2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/rebuild_packet.c olsrd-0.5.6-r4/src/rebuild_packet.c
+--- olsrd-0.5.6-r4.orig/src/rebuild_packet.c   2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/rebuild_packet.c        2009-03-27 17:33:00.000000000 +0000
 @@ -60,7 +60,11 @@
  mid_chgestruct(struct mid_message *mmsg, const union olsr_message *m)
  {
@@ -1915,9 +1915,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/rebuild_packet.c olsrd-0-5-6-ecb9cb41
    }
  
  }
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/routing_table.c olsrd-0-5-6-ecb9cb41f488/src/routing_table.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/routing_table.c  2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/routing_table.c       2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/routing_table.c olsrd-0.5.6-r4/src/routing_table.c
+--- olsrd-0.5.6-r4.orig/src/routing_table.c    2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/routing_table.c 2009-03-27 17:33:00.000000000 +0000
 @@ -628,6 +628,7 @@
  /**
   * format a route entry into a buffer
@@ -1948,9 +1948,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/routing_table.c olsrd-0-5-6-ecb9cb41f
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/routing_table.h olsrd-0-5-6-ecb9cb41f488/src/routing_table.h
---- olsrd-0-5-6-ecb9cb41f488.orig/src/routing_table.h  2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/routing_table.h       2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/routing_table.h olsrd-0.5.6-r4/src/routing_table.h
+--- olsrd-0.5.6-r4.orig/src/routing_table.h    2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/routing_table.h 2009-03-27 17:33:00.000000000 +0000
 @@ -210,9 +210,11 @@
  bool olsr_cmp_rt(const struct rt_entry *, const struct rt_entry *);
  uint8_t olsr_fib_metric(const struct rt_metric *);
@@ -1963,9 +1963,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/routing_table.h olsrd-0-5-6-ecb9cb41f
  
  const struct rt_nexthop *olsr_get_nh(const struct rt_entry *);
  
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/tc_set.c olsrd-0-5-6-ecb9cb41f488/src/tc_set.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/tc_set.c 2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/tc_set.c      2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/tc_set.c olsrd-0.5.6-r4/src/tc_set.c
+--- olsrd-0.5.6-r4.orig/src/tc_set.c   2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/tc_set.c        2009-03-27 17:33:00.000000000 +0000
 @@ -336,6 +336,7 @@
  /**
   * Format tc_edge contents into a buffer.
@@ -1998,9 +1998,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/tc_set.c olsrd-0-5-6-ecb9cb41f488/src
  
  /*
   * calculate the border IPs of a tc edge set according to the border flags
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/tc_set.h olsrd-0-5-6-ecb9cb41f488/src/tc_set.h
---- olsrd-0-5-6-ecb9cb41f488.orig/src/tc_set.h 2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/tc_set.h      2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/tc_set.h olsrd-0.5.6-r4/src/tc_set.h
+--- olsrd-0.5.6-r4.orig/src/tc_set.h   2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/tc_set.h        2009-03-27 17:33:00.000000000 +0000
 @@ -157,7 +157,9 @@
  
  /* tc_edge_entry manipulation */
@@ -2011,9 +2011,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/tc_set.h olsrd-0-5-6-ecb9cb41f488/src
  struct tc_edge_entry *olsr_lookup_tc_edge(struct tc_entry *, union olsr_ip_addr *);
  struct tc_edge_entry *olsr_add_tc_edge_entry(struct tc_entry *, union olsr_ip_addr *, uint16_t);
  void olsr_delete_tc_entry(struct tc_entry *);
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/two_hop_neighbor_table.c olsrd-0-5-6-ecb9cb41f488/src/two_hop_neighbor_table.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/two_hop_neighbor_table.c 2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/two_hop_neighbor_table.c      2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/two_hop_neighbor_table.c olsrd-0.5.6-r4/src/two_hop_neighbor_table.c
+--- olsrd-0.5.6-r4.orig/src/two_hop_neighbor_table.c   2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/two_hop_neighbor_table.c        2009-03-27 17:33:00.000000000 +0000
 @@ -203,6 +203,8 @@
    return NULL;
  }
@@ -2031,9 +2031,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/two_hop_neighbor_table.c olsrd-0-5-6-
  
  /*
   * Local Variables:
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/unix/ifnet.c olsrd-0-5-6-ecb9cb41f488/src/unix/ifnet.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/unix/ifnet.c     2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/unix/ifnet.c  2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/unix/ifnet.c olsrd-0.5.6-r4/src/unix/ifnet.c
+--- olsrd-0.5.6-r4.orig/src/unix/ifnet.c       2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/unix/ifnet.c    2009-03-27 17:33:00.000000000 +0000
 @@ -70,6 +70,8 @@
  
  #define BUFSPACE  (127*1024)    /* max. input buffer size to request */
@@ -2211,9 +2211,9 @@ diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/unix/ifnet.c olsrd-0-5-6-ecb9cb41f488
    }
  
    /*
-diff -ur olsrd-0-5-6-ecb9cb41f488.orig/src/unix/misc.c olsrd-0-5-6-ecb9cb41f488/src/unix/misc.c
---- olsrd-0-5-6-ecb9cb41f488.orig/src/unix/misc.c      2009-03-18 21:44:00.000000000 +0000
-+++ olsrd-0-5-6-ecb9cb41f488/src/unix/misc.c   2009-03-18 21:46:46.000000000 +0000
+diff -ur olsrd-0.5.6-r4.orig/src/unix/misc.c olsrd-0.5.6-r4/src/unix/misc.c
+--- olsrd-0.5.6-r4.orig/src/unix/misc.c        2009-03-27 17:32:46.000000000 +0000
++++ olsrd-0.5.6-r4/src/unix/misc.c     2009-03-27 17:33:00.000000000 +0000
 @@ -44,6 +44,7 @@
  #include "misc.h"
  #include "olsr_types.h"