From 6bfdbb69e6cd8d49bfc2ba287800de086e813425 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 15 Mar 2009 18:25:44 +0000 Subject: [PATCH] contrib/package/olsr-luci: - fix unbloat patch - enable -DSVEN_OLA_UNBLOAT in target cflags --- contrib/package/olsrd-luci/Makefile | 2 +- .../patches/140-olsrd-optimize-size.patch | 223 +++++++++++++++------ 2 files changed, 166 insertions(+), 59 deletions(-) diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile index 19656100c..c0ccf46d2 100644 --- a/contrib/package/olsrd-luci/Makefile +++ b/contrib/package/olsrd-luci/Makefile @@ -125,7 +125,7 @@ define Build/Compile $(MAKE) -C "$(PKG_BUILD_DIR)" olsrd libs \ $(TARGET_CONFIGURE_OPTS) \ NODEBUG=1 \ - CFLAGS="$(TARGET_CFLAGS)" \ + CFLAGS="$(TARGET_CFLAGS) -DSVEN_OLA_UNBLOAT" \ OS="linux" \ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ LIBDIR="$(PKG_INSTALL_DIR)/usr/lib" \ 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 76837fdfd..debc3415d 100644 --- 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-fc691af9a18d.orig/Makefile.inc olsrd-0-5-6-fc691af9a18d/Makefile.inc --- olsrd-0-5-6-fc691af9a18d.orig/Makefile.inc 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/Makefile.inc 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/Makefile.inc 2009-03-15 18:10:12.000000000 +0000 @@ -205,6 +205,10 @@ $(warning Use CPPFLAGS instead of DEFINES for -D) endif @@ -14,7 +14,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/Makefile.inc olsrd-0-5-6-fc691af9a18d/Mak help: diff -ur olsrd-0-5-6-fc691af9a18d.orig/lib/bmf/src/NetworkInterfaces.c olsrd-0-5-6-fc691af9a18d/lib/bmf/src/NetworkInterfaces.c --- olsrd-0-5-6-fc691af9a18d.orig/lib/bmf/src/NetworkInterfaces.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/lib/bmf/src/NetworkInterfaces.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/lib/bmf/src/NetworkInterfaces.c 2009-03-15 18:10:12.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)); @@ -27,7 +27,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/lib/bmf/src/NetworkInterfaces.c olsrd-0-5 PLUGIN_NAME_SHORT, olsr_ip_to_string(&buf, &walker->neighbor_iface_addr), bestIntf->int_name, diff -ur olsrd-0-5-6-fc691af9a18d.orig/lib/httpinfo/Makefile olsrd-0-5-6-fc691af9a18d/lib/httpinfo/Makefile --- olsrd-0-5-6-fc691af9a18d.orig/lib/httpinfo/Makefile 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/lib/httpinfo/Makefile 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/lib/httpinfo/Makefile 2009-03-15 18:10:12.000000000 +0000 @@ -47,7 +47,11 @@ CPPFLAGS += -DADMIN_INTERFACE endif @@ -42,7 +42,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/lib/httpinfo/Makefile olsrd-0-5-6-fc691af ifdef ADMIN_INTERFACE diff -ur olsrd-0-5-6-fc691af9a18d.orig/lib/httpinfo/src/olsrd_httpinfo.c olsrd-0-5-6-fc691af9a18d/lib/httpinfo/src/olsrd_httpinfo.c --- olsrd-0-5-6-fc691af9a18d.orig/lib/httpinfo/src/olsrd_httpinfo.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/lib/httpinfo/src/olsrd_httpinfo.c 2009-03-15 16:59:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/lib/httpinfo/src/olsrd_httpinfo.c 2009-03-15 18:10:12.000000000 +0000 @@ -67,7 +67,9 @@ #include "olsrd_httpinfo.h" @@ -161,7 +161,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/lib/httpinfo/src/olsrd_httpinfo.c olsrd-0 check_allowed_ip(const struct allowed_net *const allowed_nets, const union olsr_ip_addr *const addr) diff -ur olsrd-0-5-6-fc691af9a18d.orig/lib/nameservice/src/nameservice.c olsrd-0-5-6-fc691af9a18d/lib/nameservice/src/nameservice.c --- olsrd-0-5-6-fc691af9a18d.orig/lib/nameservice/src/nameservice.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/lib/nameservice/src/nameservice.c 2009-03-15 17:04:54.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/lib/nameservice/src/nameservice.c 2009-03-15 18:10:12.000000000 +0000 @@ -65,6 +65,11 @@ #include "mapwrite.h" #include "compat.h" @@ -465,7 +465,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/lib/nameservice/src/nameservice.c olsrd-0 break; diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/apm.h olsrd-0-5-6-fc691af9a18d/src/apm.h --- olsrd-0-5-6-fc691af9a18d.orig/src/apm.h 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/apm.h 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/apm.h 2009-03-15 18:10:12.000000000 +0000 @@ -41,6 +41,7 @@ #ifndef _OLSR_APM @@ -482,9 +482,64 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/apm.h olsrd-0-5-6-fc691af9a18d/src/ap /* * Local Variables: +diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/cfgfile_gen.c olsrd-0-5-6-fc691af9a18d/src/cfgparser/cfgfile_gen.c +--- olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/cfgfile_gen.c 2009-03-14 22:39:09.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/cfgparser/cfgfile_gen.c 2009-03-15 18:19:20.000000000 +0000 +@@ -57,7 +57,9 @@ + struct olsr_if *in = cnf->interfaces; + struct plugin_entry *pe = cnf->plugins; + struct plugin_param *pp; ++#ifndef SVEN_OLA_UNBLOAT + struct ip_prefix_list *ie = cnf->ipc_nets; ++#endif /* SVEN_OLA_UNBLOAT */ + struct olsr_lq_mult *mult; + + char ipv6_buf[100]; /* buffer for IPv6 inet_htop */ +@@ -125,6 +127,7 @@ + else + fprintf(fd, "Willingness\t%d\n\n", cnf->willingness); + ++#ifndef SVEN_OLA_UNBLOAT + /* IPC */ + fprintf(fd, "# Allow processes like the GUI front-end\n# to connect to the daemon.\n\n"); + fprintf(fd, "IpcConnect {\n"); +@@ -141,6 +144,7 @@ + } + + fprintf(fd, "}\n\n"); ++#endif /* SVEN_OLA_UNBLOAT */ + + /* Hysteresis */ + fprintf(fd, "# Hysteresis adds more robustness to the\n# link sensing.\n# Used by default. 'yes' or 'no'\n\n"); +@@ -350,7 +354,9 @@ + struct olsr_if *in = cnf->interfaces; + struct plugin_entry *pe = cnf->plugins; + struct plugin_param *pp; ++#ifndef SVEN_OLA_UNBLOAT + struct ip_prefix_list *ie = cnf->ipc_nets; ++#endif /* SVEN_OLA_UNBLOAT */ + struct olsr_lq_mult *mult; + + int size = 0; +@@ -409,6 +415,7 @@ + else + WRITE_TO_BUF("Willingness\t%d\n\n", cnf->willingness); + ++#ifndef SVEN_OLA_UNBLOAT + /* IPC */ + WRITE_TO_BUF("# Allow processes like the GUI front-end\n# to connect to the daemon.\n\n"); + WRITE_TO_BUF("IpcConnect {\n"); +@@ -424,6 +431,7 @@ + } + + WRITE_TO_BUF("}\n\n"); ++#endif /* SVEN_OLA_UNBLOAT */ + + /* 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-fc691af9a18d.orig/src/cfgparser/local.mk olsrd-0-5-6-fc691af9a18d/src/cfgparser/local.mk --- olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/local.mk 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/cfgparser/local.mk 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/cfgparser/local.mk 2009-03-15 18:10:12.000000000 +0000 @@ -41,8 +41,13 @@ C=$(if $(CFGDIR),$(CFGDIR)/) @@ -501,7 +556,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/local.mk olsrd-0-5-6-fc691a $(C)oscan.c: $(C)oscan.lex $(C)Makefile diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/olsrd_conf.c olsrd-0-5-6-fc691af9a18d/src/cfgparser/olsrd_conf.c --- olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/olsrd_conf.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/cfgparser/olsrd_conf.c 2009-03-15 16:53:43.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/cfgparser/olsrd_conf.c 2009-03-15 18:10:12.000000000 +0000 @@ -81,11 +81,13 @@ } @@ -564,7 +619,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/olsrd_conf.c olsrd-0-5-6-fc struct ioinfo { diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/oparse.y olsrd-0-5-6-fc691af9a18d/src/cfgparser/oparse.y --- olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/oparse.y 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/cfgparser/oparse.y 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/cfgparser/oparse.y 2009-03-15 18:10:12.000000000 +0000 @@ -176,7 +176,6 @@ %token TOK_RTTABLE %token TOK_RTTABLE_DEFAULT @@ -688,7 +743,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/oparse.y olsrd-0-5-6-fc691a int ifcnt = ifs_in_curr_cfg; diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/oscan.lex olsrd-0-5-6-fc691af9a18d/src/cfgparser/oscan.lex --- olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/oscan.lex 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/cfgparser/oscan.lex 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/cfgparser/oscan.lex 2009-03-15 18:10:12.000000000 +0000 @@ -253,11 +253,6 @@ return TOK_NETLABEL; } @@ -715,7 +770,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/cfgparser/oscan.lex olsrd-0-5-6-fc691 return TOK_FIBMETRIC; diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/defs.h olsrd-0-5-6-fc691af9a18d/src/defs.h --- olsrd-0-5-6-fc691af9a18d.orig/src/defs.h 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/defs.h 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/defs.h 2009-03-15 18:10:12.000000000 +0000 @@ -190,6 +190,8 @@ */ clock_t olsr_times(void); @@ -735,7 +790,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/defs.h olsrd-0-5-6-fc691af9a18d/src/d * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/duplicate_set.c olsrd-0-5-6-fc691af9a18d/src/duplicate_set.c --- olsrd-0-5-6-fc691af9a18d.orig/src/duplicate_set.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/duplicate_set.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/duplicate_set.c 2009-03-15 18:10:12.000000000 +0000 @@ -174,6 +174,7 @@ return false; /* no duplicate */ } @@ -754,7 +809,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/duplicate_set.c olsrd-0-5-6-fc691af9a * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/hna_set.c olsrd-0-5-6-fc691af9a18d/src/hna_set.c --- olsrd-0-5-6-fc691af9a18d.orig/src/hna_set.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/hna_set.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/hna_set.c 2009-03-15 18:10:12.000000000 +0000 @@ -279,6 +279,7 @@ * *@return nada @@ -773,7 +828,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/hna_set.c olsrd-0-5-6-fc691af9a18d/sr *Process incoming HNA message. diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/interfaces.c olsrd-0-5-6-fc691af9a18d/src/interfaces.c --- olsrd-0-5-6-fc691af9a18d.orig/src/interfaces.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/interfaces.c 2009-03-15 16:54:47.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/interfaces.c 2009-03-15 18:10:12.000000000 +0000 @@ -93,12 +93,16 @@ OLSR_PRINTF(1, "\n ---- Interface configuration ---- \n\n"); /* Run trough all interfaces immedeatly */ @@ -815,7 +870,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/interfaces.c olsrd-0-5-6-fc691af9a18d interf_n->next = olsr_cnf->interfaces; diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/interfaces.h olsrd-0-5-6-fc691af9a18d/src/interfaces.h --- olsrd-0-5-6-fc691af9a18d.orig/src/interfaces.h 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/interfaces.h 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/interfaces.h 2009-03-15 18:10:12.000000000 +0000 @@ -196,7 +196,12 @@ struct interface *if_ifwithindex(const int if_index); @@ -832,7 +887,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/interfaces.h olsrd-0-5-6-fc691af9a18d diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/ipc_frontend.c olsrd-0-5-6-fc691af9a18d/src/ipc_frontend.c --- olsrd-0-5-6-fc691af9a18d.orig/src/ipc_frontend.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/ipc_frontend.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/ipc_frontend.c 2009-03-15 18:10:12.000000000 +0000 @@ -46,6 +46,7 @@ * */ @@ -851,7 +906,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/ipc_frontend.c olsrd-0-5-6-fc691af9a1 * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/ipc_frontend.h olsrd-0-5-6-fc691af9a18d/src/ipc_frontend.h --- olsrd-0-5-6-fc691af9a18d.orig/src/ipc_frontend.h 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/ipc_frontend.h 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/ipc_frontend.h 2009-03-15 18:10:12.000000000 +0000 @@ -48,6 +48,7 @@ #ifndef _OLSR_IPC @@ -870,7 +925,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/ipc_frontend.h olsrd-0-5-6-fc691af9a1 * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/ipcalc.c olsrd-0-5-6-fc691af9a18d/src/ipcalc.c --- olsrd-0-5-6-fc691af9a18d.orig/src/ipcalc.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/ipcalc.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/ipcalc.c 2009-03-15 18:10:12.000000000 +0000 @@ -121,6 +121,7 @@ return prefix; } @@ -889,7 +944,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/ipcalc.c olsrd-0-5-6-fc691af9a18d/src * of both are equal. So we must compare the first bits. diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/ipcalc.h olsrd-0-5-6-fc691af9a18d/src/ipcalc.h --- olsrd-0-5-6-fc691af9a18d.orig/src/ipcalc.h 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/ipcalc.h 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/ipcalc.h 2009-03-15 18:10:12.000000000 +0000 @@ -146,7 +146,9 @@ return inet_ntop(olsr_cnf->ip_version, addr, buf->buf, sizeof(buf->buf)); } @@ -902,7 +957,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/ipcalc.h olsrd-0-5-6-fc691af9a18d/src sockaddr4_to_string(struct ipaddr_str *const buf, const struct sockaddr *const addr) diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/link_set.c olsrd-0-5-6-fc691af9a18d/src/link_set.c --- olsrd-0-5-6-fc691af9a18d.orig/src/link_set.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/link_set.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/link_set.c 2009-03-15 18:10:12.000000000 +0000 @@ -761,6 +761,7 @@ return ret; } @@ -921,7 +976,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/link_set.c olsrd-0-5-6-fc691af9a18d/s * called for every LQ HELLO message. diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/linux/apm.c olsrd-0-5-6-fc691af9a18d/src/linux/apm.c --- olsrd-0-5-6-fc691af9a18d.orig/src/linux/apm.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/linux/apm.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/linux/apm.c 2009-03-15 18:10:12.000000000 +0000 @@ -44,6 +44,7 @@ * Acpi-Power Enlightenment epplet */ @@ -940,7 +995,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/linux/apm.c olsrd-0-5-6-fc691af9a18d/ * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/linux/kernel_routes.c olsrd-0-5-6-fc691af9a18d/src/linux/kernel_routes.c --- olsrd-0-5-6-fc691af9a18d.orig/src/linux/kernel_routes.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/linux/kernel_routes.c 2009-03-15 16:49:14.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/linux/kernel_routes.c 2009-03-15 18:22:31.000000000 +0000 @@ -288,11 +288,13 @@ if (rt_ret > 0) rt_ret = 0;//0 means successful recovery else rt_ret = -1;//unrecoverable error @@ -955,9 +1010,49 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/linux/kernel_routes.c olsrd-0-5-6-fc6 if (rt_ret == -2) olsr_syslog(OLSR_LOG_ERR,"no rtnetlink response was received! (no more system ressources?, everything may happen now ...)"); return rt_ret; } +@@ -330,7 +332,9 @@ + int rslt; + #endif /* LINUX_POLICY_ROUTING */ + ++#ifndef SVEN_OLA_UNBLOAT + OLSR_PRINTF(2, "KERN: Adding %s\n", olsr_rtp_to_string(rt->rt_best)); ++#endif /* SVEN_OLA_UNBLOAT */ + + #if !LINUX_POLICY_ROUTING + memset(&kernel_route, 0, sizeof(struct rtentry)); +@@ -404,7 +408,9 @@ + struct in6_rtmsg kernel_route; + int rslt; + ++#ifndef SVEN_OLA_UNBLOAT + OLSR_PRINTF(2, "KERN: Adding %s\n", olsr_rtp_to_string(rt->rt_best)); ++#endif /* SVEN_OLA_UNBLOAT */ + + memset(&kernel_route, 0, sizeof(struct in6_rtmsg)); + +@@ -457,7 +463,9 @@ + int rslt; + #endif /* LINUX_POLICY_ROUTING */ + ++#ifndef SVEN_OLA_UNBLOAT + OLSR_PRINTF(2, "KERN: Deleting %s\n", olsr_rt_to_string(rt)); ++#endif /* SVEN_OLA_UNBLOAT */ + + #if !LINUX_POLICY_ROUTING + memset(&kernel_route, 0, sizeof(struct rtentry)); +@@ -524,7 +532,9 @@ + int rslt; + #endif /* LINUX_POLICY_ROUTING */ + ++#ifndef SVEN_OLA_UNBLOAT + OLSR_PRINTF(2, "KERN: Deleting %s\n", olsr_rt_to_string(rt)); ++#endif /* SVEN_OLA_UNBLOAT */ + + #if !LINUX_POLICY_ROUTING + memset(&kernel_route, 0, sizeof(struct in6_rtmsg)); diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/linux/net.c olsrd-0-5-6-fc691af9a18d/src/linux/net.c --- olsrd-0-5-6-fc691af9a18d.orig/src/linux/net.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/linux/net.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/linux/net.c 2009-03-15 18:10:12.000000000 +0000 @@ -69,8 +69,10 @@ #define SIOCGIWRATE 0x8B21 /* get default bit rate (bps) */ @@ -1156,7 +1251,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/linux/net.c olsrd-0-5-6-fc691af9a18d/ *@param sa sockaddr struct. Used for bind(2). diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin.c olsrd-0-5-6-fc691af9a18d/src/lq_plugin.c --- olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/lq_plugin.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/lq_plugin.c 2009-03-15 18:10:12.000000000 +0000 @@ -67,12 +67,18 @@ init_lq_handler_tree(void) { @@ -1226,7 +1321,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin.c olsrd-0-5-6-fc691af9a18d/ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin_default_float.c olsrd-0-5-6-fc691af9a18d/src/lq_plugin_default_float.c --- olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin_default_float.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/lq_plugin_default_float.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/lq_plugin_default_float.c 2009-03-15 18:10:12.000000000 +0000 @@ -39,6 +39,7 @@ * */ @@ -1245,7 +1340,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin_default_float.c olsrd-0-5-6 * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin_default_float.h olsrd-0-5-6-fc691af9a18d/src/lq_plugin_default_float.h --- olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin_default_float.h 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/lq_plugin_default_float.h 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/lq_plugin_default_float.h 2009-03-15 18:10:12.000000000 +0000 @@ -39,6 +39,7 @@ * */ @@ -1264,7 +1359,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin_default_float.h olsrd-0-5-6 * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin_default_fpm.c olsrd-0-5-6-fc691af9a18d/src/lq_plugin_default_fpm.c --- olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin_default_fpm.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/lq_plugin_default_fpm.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/lq_plugin_default_fpm.c 2009-03-15 18:10:12.000000000 +0000 @@ -39,6 +39,7 @@ * */ @@ -1283,7 +1378,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin_default_fpm.c olsrd-0-5-6-f * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin_default_fpm.h olsrd-0-5-6-fc691af9a18d/src/lq_plugin_default_fpm.h --- olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin_default_fpm.h 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/lq_plugin_default_fpm.h 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/lq_plugin_default_fpm.h 2009-03-15 18:10:12.000000000 +0000 @@ -39,6 +39,7 @@ * */ @@ -1302,7 +1397,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/lq_plugin_default_fpm.h olsrd-0-5-6-f * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/main.c olsrd-0-5-6-fc691af9a18d/src/main.c --- olsrd-0-5-6-fc691af9a18d.orig/src/main.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/main.c 2009-03-15 16:52:17.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/main.c 2009-03-15 18:10:12.000000000 +0000 @@ -258,13 +258,17 @@ /* * Print configuration @@ -1456,7 +1551,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/main.c olsrd-0-5-6-fc691af9a18d/src/m * Delete possible default GWs diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/neighbor_table.c olsrd-0-5-6-fc691af9a18d/src/neighbor_table.c --- olsrd-0-5-6-fc691af9a18d.orig/src/neighbor_table.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/neighbor_table.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/neighbor_table.c 2009-03-15 18:10:12.000000000 +0000 @@ -362,6 +362,7 @@ * *@return nada @@ -1475,7 +1570,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/neighbor_table.c olsrd-0-5-6-fc691af9 * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/net_olsr.c olsrd-0-5-6-fc691af9a18d/src/net_olsr.c --- olsrd-0-5-6-fc691af9a18d.orig/src/net_olsr.c 2009-03-15 17:06:26.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/net_olsr.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/net_olsr.c 2009-03-15 18:10:12.000000000 +0000 @@ -44,7 +44,9 @@ #include "log.h" #include "olsr.h" @@ -1516,7 +1611,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/net_olsr.c olsrd-0-5-6-fc691af9a18d/s } diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/olsr.c olsrd-0-5-6-fc691af9a18d/src/olsr.c --- olsrd-0-5-6-fc691af9a18d.orig/src/olsr.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/olsr.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/olsr.c 2009-03-15 18:10:12.000000000 +0000 @@ -149,7 +149,9 @@ return; @@ -1599,7 +1694,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/olsr.c olsrd-0-5-6-fc691af9a18d/src/o *Wrapper for printf that prints to a specific diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/olsr.h olsrd-0-5-6-fc691af9a18d/src/olsr.h --- olsrd-0-5-6-fc691af9a18d.orig/src/olsr.h 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/olsr.h 2009-03-15 16:42:54.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/olsr.h 2009-03-15 18:10:12.000000000 +0000 @@ -72,15 +72,21 @@ uint8_t olsr_calculate_willingness(void); @@ -1624,7 +1719,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/olsr.h olsrd-0-5-6-fc691af9a18d/src/o diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/olsr_cfg.h olsrd-0-5-6-fc691af9a18d/src/olsr_cfg.h --- olsrd-0-5-6-fc691af9a18d.orig/src/olsr_cfg.h 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/olsr_cfg.h 2009-03-15 16:45:53.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/olsr_cfg.h 2009-03-15 18:10:12.000000000 +0000 @@ -140,8 +140,10 @@ char *name; char *config; @@ -1676,7 +1771,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/olsr_cfg.h olsrd-0-5-6-fc691af9a18d/s diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/parser.c olsrd-0-5-6-fc691af9a18d/src/parser.c --- olsrd-0-5-6-fc691af9a18d.orig/src/parser.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/parser.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/parser.c 2009-03-15 18:10:12.000000000 +0000 @@ -51,7 +51,9 @@ #include "rebuild_packet.h" #include "net_os.h" @@ -1700,7 +1795,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/parser.c olsrd-0-5-6-fc691af9a18d/src msgsize = ntohs(m->v4.olsr_msgsize); diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/print_packet.c olsrd-0-5-6-fc691af9a18d/src/print_packet.c --- olsrd-0-5-6-fc691af9a18d.orig/src/print_packet.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/print_packet.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/print_packet.c 2009-03-15 18:10:12.000000000 +0000 @@ -39,6 +39,7 @@ * */ @@ -1719,7 +1814,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/print_packet.c olsrd-0-5-6-fc691af9a1 * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/process_routes.c olsrd-0-5-6-fc691af9a18d/src/process_routes.c --- olsrd-0-5-6-fc691af9a18d.orig/src/process_routes.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/process_routes.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/process_routes.c 2009-03-15 18:11:42.000000000 +0000 @@ -159,6 +159,7 @@ static void olsr_delete_kernel_route(struct rt_entry *rt) @@ -1733,7 +1828,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/process_routes.c olsrd-0-5-6-fc691af9 } } +#else /* SVEN_OLA_UNBLOAT */ -+ olsr_16_t error = olsr_cnf->ip_version == AF_INET ? olsr_delroute_function(rt) : olsr_delroute6_function(rt); ++ int16_t error = olsr_cnf->ip_version == AF_INET ? olsr_delroute_function(rt) : olsr_delroute6_function(rt); + if (0 > error) { + olsr_syslog(OLSR_LOG_ERR, "Delete route: %s", strerror(errno)); + } @@ -1754,7 +1849,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/process_routes.c olsrd-0-5-6-fc691af9 } } +#else /* SVEN_OLA_UNBLOAT */ -+ olsr_16_t error = olsr_cnf->ip_version == AF_INET ? olsr_addroute_function(rt) : olsr_addroute6_function(rt); ++ int16_t error = olsr_cnf->ip_version == AF_INET ? olsr_addroute_function(rt) : olsr_addroute6_function(rt); + if (0 > error) { + olsr_syslog(OLSR_LOG_ERR, "Add route: %s", strerror(errno)); + } else { @@ -1775,7 +1870,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/process_routes.c olsrd-0-5-6-fc691af9 } diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/rebuild_packet.c olsrd-0-5-6-fc691af9a18d/src/rebuild_packet.c --- olsrd-0-5-6-fc691af9a18d.orig/src/rebuild_packet.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/rebuild_packet.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/rebuild_packet.c 2009-03-15 18:10:12.000000000 +0000 @@ -60,7 +60,11 @@ mid_chgestruct(struct mid_message *mmsg, const union olsr_message *m) { @@ -1822,7 +1917,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/rebuild_packet.c olsrd-0-5-6-fc691af9 } diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/routing_table.c olsrd-0-5-6-fc691af9a18d/src/routing_table.c --- olsrd-0-5-6-fc691af9a18d.orig/src/routing_table.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/routing_table.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/routing_table.c 2009-03-15 18:10:12.000000000 +0000 @@ -623,6 +623,7 @@ /** * format a route entry into a buffer @@ -1855,7 +1950,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/routing_table.c olsrd-0-5-6-fc691af9a * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/routing_table.h olsrd-0-5-6-fc691af9a18d/src/routing_table.h --- olsrd-0-5-6-fc691af9a18d.orig/src/routing_table.h 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/routing_table.h 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/routing_table.h 2009-03-15 18:10:12.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 *); @@ -1870,7 +1965,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/routing_table.h olsrd-0-5-6-fc691af9a diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/tc_set.c olsrd-0-5-6-fc691af9a18d/src/tc_set.c --- olsrd-0-5-6-fc691af9a18d.orig/src/tc_set.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/tc_set.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/tc_set.c 2009-03-15 18:10:12.000000000 +0000 @@ -336,6 +336,7 @@ /** * Format tc_edge contents into a buffer. @@ -1905,7 +2000,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/tc_set.c olsrd-0-5-6-fc691af9a18d/src * calculate the border IPs of a tc edge set according to the border flags diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/tc_set.h olsrd-0-5-6-fc691af9a18d/src/tc_set.h --- olsrd-0-5-6-fc691af9a18d.orig/src/tc_set.h 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/tc_set.h 2009-03-15 16:47:08.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/tc_set.h 2009-03-15 18:10:12.000000000 +0000 @@ -157,7 +157,9 @@ /* tc_edge_entry manipulation */ @@ -1918,7 +2013,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/tc_set.h olsrd-0-5-6-fc691af9a18d/src void olsr_delete_tc_entry(struct tc_entry *); diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/two_hop_neighbor_table.c olsrd-0-5-6-fc691af9a18d/src/two_hop_neighbor_table.c --- olsrd-0-5-6-fc691af9a18d.orig/src/two_hop_neighbor_table.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/two_hop_neighbor_table.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/two_hop_neighbor_table.c 2009-03-15 18:10:12.000000000 +0000 @@ -203,6 +203,8 @@ return NULL; } @@ -1938,7 +2033,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/two_hop_neighbor_table.c olsrd-0-5-6- * Local Variables: diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d/src/unix/ifnet.c --- olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/unix/ifnet.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/unix/ifnet.c 2009-03-15 18:13:59.000000000 +0000 @@ -70,6 +70,8 @@ #define BUFSPACE (127*1024) /* max. input buffer size to request */ @@ -1992,7 +2087,19 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d /* Check interface address (IPv4) */ if (ioctl(olsr_cnf->ioctl_s, SIOCGIFADDR, &ifr) < 0) { OLSR_PRINTF(1, "\tCould not get address of interface - removing it\n"); -@@ -304,7 +314,9 @@ +@@ -294,17 +304,21 @@ + if (memcmp + (&((struct sockaddr_in *)&ifp->int_addr)->sin_addr.s_addr, &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, + olsr_cnf->ipsize) != 0) { ++#ifndef SVEN_OLA_UNBLOAT + /* New address */ + OLSR_PRINTF(1, "IPv4 address changed for %s\n", ifr.ifr_name); + OLSR_PRINTF(1, "\tOld:%s\n", ip4_to_string(&buf, ifp->int_addr.sin_addr)); + OLSR_PRINTF(1, "\tNew:%s\n", sockaddr4_to_string(&buf, &ifr.ifr_addr)); ++#endif /* SVEN_OLA_UNBLOAT */ + + ifp->int_addr = *(struct sockaddr_in *)&ifr.ifr_addr; + /* deactivated to prevent change of originator IP */ #if 0 if (memcmp(&olsr_cnf->main_addr, &ifp->ip_addr, olsr_cnf->ipsize) == 0) { OLSR_PRINTF(1, "New main address: %s\n", sockaddr4_to_string(&buf, &ifr.ifr_addr)); @@ -2002,7 +2109,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d memcpy(&olsr_cnf->main_addr, &((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr, olsr_cnf->ipsize); } #endif -@@ -366,7 +378,9 @@ +@@ -366,7 +380,9 @@ remove_interface: OLSR_PRINTF(1, "Removing interface %s\n", iface->name); @@ -2012,7 +2119,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d olsr_delete_link_entry_by_ip(&ifp->ip_addr); -@@ -398,10 +412,14 @@ +@@ -398,10 +414,14 @@ memset(&olsr_cnf->main_addr, 0, olsr_cnf->ipsize); OLSR_PRINTF(1, "No more interfaces...\n"); } else { @@ -2027,7 +2134,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d } } #endif -@@ -425,7 +443,9 @@ +@@ -425,7 +445,9 @@ if ((ifnet == NULL) && (!olsr_cnf->allow_no_interfaces)) { OLSR_PRINTF(1, "No more active interfaces - exiting.\n"); @@ -2037,7 +2144,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d olsr_cnf->exit_value = EXIT_FAILURE; kill(getpid(), SIGINT); } -@@ -434,6 +454,8 @@ +@@ -434,6 +456,8 @@ } @@ -2046,7 +2153,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d /** * Initializes the special interface used in * host-client emulation -@@ -583,6 +605,7 @@ +@@ -583,6 +607,7 @@ return 1; } @@ -2054,7 +2161,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d static char basenamestr[32]; static const char *if_basename(const char *name); -@@ -618,8 +641,10 @@ +@@ -618,8 +643,10 @@ int tos_bits = IPTOS_TOS(olsr_cnf->tos); #endif @@ -2065,7 +2172,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d memset(&ifr, 0, sizeof(struct ifreq)); memset(&ifs, 0, sizeof(struct interface)); -@@ -726,11 +751,13 @@ +@@ -726,11 +753,13 @@ ifs.int_broadaddr = *(struct sockaddr_in *)&ifr.ifr_broadaddr; } @@ -2079,7 +2186,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d } -@@ -760,7 +787,9 @@ +@@ -760,7 +789,9 @@ OLSR_PRINTF(1, "\tMTU - IPhdr: %d\n", ifs.int_mtu); @@ -2089,7 +2196,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d OLSR_PRINTF(1, "\tIndex %d\n", ifs.if_index); if (olsr_cnf->ip_version == AF_INET) { -@@ -865,10 +894,14 @@ +@@ -865,10 +896,14 @@ */ memset(&null_addr, 0, olsr_cnf->ipsize); if (ipequal(&null_addr, &olsr_cnf->main_addr)) { @@ -2097,8 +2204,8 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d struct ipaddr_str buf; +#endif olsr_cnf->main_addr = ifp->ip_addr; - OLSR_PRINTF(1, "New main address: %s\n", olsr_ip_to_string(&buf, &olsr_cnf->main_addr)); +#ifndef SVEN_OLA_UNBLOAT + OLSR_PRINTF(1, "New main address: %s\n", olsr_ip_to_string(&buf, &olsr_cnf->main_addr)); olsr_syslog(OLSR_LOG_INFO, "New main address: %s\n", olsr_ip_to_string(&buf, &olsr_cnf->main_addr)); +#endif /* SVEN_OLA_UNBLOAT */ } @@ -2106,7 +2213,7 @@ diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/ifnet.c olsrd-0-5-6-fc691af9a18d /* diff -ur olsrd-0-5-6-fc691af9a18d.orig/src/unix/misc.c olsrd-0-5-6-fc691af9a18d/src/unix/misc.c --- olsrd-0-5-6-fc691af9a18d.orig/src/unix/misc.c 2009-03-14 22:39:09.000000000 +0000 -+++ olsrd-0-5-6-fc691af9a18d/src/unix/misc.c 2009-03-15 16:32:39.000000000 +0000 ++++ olsrd-0-5-6-fc691af9a18d/src/unix/misc.c 2009-03-15 18:10:12.000000000 +0000 @@ -44,6 +44,7 @@ #include "misc.h" #include "olsr_types.h" -- 2.11.0