olsrd 0.4.9 improvements

BKrev: 426ce60c44JZoDwZj-6RsOlQfrWIbg

diff --git a/packages/olsrd/files/0.4.9-httpinfo-makefile.diff b/packages/olsrd/files/0.4.9-httpinfo-makefile.diff
index e69de29..6a4c77a 100644 (file)
--- a/packages/olsrd/files/0.4.9-httpinfo-makefile.diff
+++ b/packages/olsrd/files/0.4.9-httpinfo-makefile.diff
@@ -0,0 +1,296 @@
+--- olsrd-0.4.9/lib/httpinfo/Makefile.orig     2005-03-31 19:11:52.000000000 +0200
++++ olsrd-0.4.9/lib/httpinfo/Makefile  2005-04-25 13:42:11.000000000 +0200
+@@ -1,103 +1,223 @@
+-#######################################
+-# HTTPINFO PLUGIN BY ANDREAS TØNNESEN #
+-#######################################
++# The olsr.org Optimized Link-State Routing daemon(olsrd)
++# Copyright (c) 2004, Andreas Tønnesen(andreto@olsr.org)
++# All rights reserved.
++#
++# Redistribution and use in source and binary forms, with or without 
++# modification, are permitted provided that the following conditions 
++# are met:
++#
++# * Redistributions of source code must retain the above copyright 
++#   notice, this list of conditions and the following disclaimer.
++# * Redistributions in binary form must reproduce the above copyright 
++#   notice, this list of conditions and the following disclaimer in 
++#   the documentation and/or other materials provided with the 
++#   distribution.
++# * Neither the name of olsr.org, olsrd nor the names of its 
++#   contributors may be used to endorse or promote products derived 
++#   from this software without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
++# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
++# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
++# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
++# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
++# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
++# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
++# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
++# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
++# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
++# POSSIBILITY OF SUCH DAMAGE.
++#
++# Visit http://www.olsr.org for more information.
++#
++# If you find this software useful feel free to make a donation
++# to the project. For more information see the website or contact
++# the copyright holders.
++#
++# $Id$
+ 
++PLUGIN_NAME = olsrd_httpinfo
++PLUGIN_VER =  0.1
+ 
+ CC ?= gcc
+ STRIP ?= strip
+-LIBDIR ?= $(INSTALL_PREFIX)/usr/lib
+-PLUGINFLAGS =  -fPIC -DOLSR_PLUGIN -I../../src
++
++# default CFLAGS and LDFLAGS, used if not externally set
++
++# used for compilation: yes
++# used for dependency file generation: no
++
++CFLAGS_SET =  -g -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes
++LDFLAGS_SET = -g
++
++# always appended to default or externally set CFLAGS and LDFLAGS
++
++# used for compilation: yes
++# used for dependency file generation: yes
++
++CFLAGS_ADD =  -DOLSR_PLUGIN -I../../src
++LDFLAGS_ADD = -Wall -shared -Wl,--version-script=version-script.txt
++
++# same as CFLAGS_ADD, but not used for dependency file generation
++
++# used for compilation: yes
++# used for dependency file generation: no
++
++CFLAGS_ADD2 = # nothing
++
++DEPFILE =     .depend
++
++SRCS =                $(wildcard src/*.c)
++OBJS =                $(patsubst %.c,%.o,$(SRCS))
++HDRS =                $(wildcard src/*.c)
++
++ifndef OS
++all:          help
++install:      help
++clean:                help
++endif
+ 
+ ifeq ($(OS), linux)
+-NAME ?= olsrd_httpinfo.so.0.1
+-NAMEFLAGS ?= -Wl,-soname,$(NAME)
+-CFLAGS ?= -g -O2 -fPIC -DOLSR_PLUGIN -Dlinux -Wall -Wmissing-prototypes -Wstrict-prototypes
+-LDFLAGS ?= -g -fPIC -shared
++
++NAME ?=               $(PLUGIN_NAME).so.$(PLUGIN_VER)
++
++CFLAGS_ADD += -Dlinux
++CFLAGS_ADD2 +=        -fPIC
++LDFLAGS_ADD +=        -fPIC -Wl,-soname,$(NAME)
++
++CFLAGS_SET += # nothing
++LDFLAGS_SET +=        # nothing
++
+ LIBS ?= -lc -lm
+-INSTALL_LIB =         install -D -m 755 $(NAME) $(LIBDIR)/$(NAME);\
++
++LIBDIR ?=     $(INSTALL_PREFIX)/usr/lib
++
++INSTALL_LIB = install -D -m 755 $(NAME) $(LIBDIR)/$(NAME); \
+               /sbin/ldconfig -n $(LIBDIR)
+-all:          plugin
+-install:        install_olsrd
+-else
+-ifeq ($(OS), win32)
+-NAME ?= olsrd_httpinfo.dll
+-NAMEFLAGS ?= -o $(NAME)
+-CFLAGS ?= -g -O2 -fPIC -DWIN32 -mno-cygwin -I../../src/win32 -Wall -Wmissing-prototypes -Wstrict-prototypes
+-LDFLAGS ?= -mno-cygwin -shared
+-LIBS ?= -lws2_32
+-COMPATOBJ = ../../src/win32/compat.o
+-INSTALL_LIB =         cp $(NAME) ../..
+-all:          plugin
+-install:        install_olsrd
++
++EXTRA_OBJS =  # nothing
++
++MAKEDEPEND =  makedepend -f $(DEPFILE) $(CFLAGS_ADD) -Y $(INCLUDES) \
++              $(SRCS) >/dev/null 2>&1
++
++all:          all2
++install:      install2
++clean:                clean2
++
+ else
+ ifeq ($(OS), fbsd)
+-NAME ?= olsrd_httpinfo.so.0.1
+-NAMEFLAGS ?= -Wl,-soname,$(NAME)
+-CFLAGS ?= -g -O2 -fPIC -Wall -Wmissing-prototypes -Wstrict-prototypes
+-LDFLAGS ?= -g -fPIC -shared
++
++NAME ?=               $(PLUGIN_NAME).so.$(PLUGIN_VER)
++
++CFLAGS_ADD += # nothing
++CFLAGS_ADD2 +=        -fPIC
++LDFLAGS_ADD +=        -fPIC -Wl,-soname,$(NAME)
++
++CFLAGS_SET += # nothing
++LDFLAGS_SET +=        # nothing
++
+ LIBS ?= -lc -lm
+-INSTALL_LIB =         install -m 755 $(NAME) $(LIBDIR)/$(NAME);\
++
++LIBDIR ?=     $(INSTALL_PREFIX)/usr/lib
++
++INSTALL_LIB = install -m 755 $(NAME) $(LIBDIR)/$(NAME); \
+               /sbin/ldconfig
+-all:          plugin
+-install:        install_olsrd
++
++EXTRA_OBJS =  # nothing
++
++MAKEDEPEND =  makedepend -f $(DEPFILE) $(CFLAGS_ADD) $(INCLUDES) $(SRCS)
++
++all:          all2
++install:      install2
++clean:                clean2
++
+ else
++ifeq ($(OS), win32)
++
++NAME ?=               $(PLUGIN_NAME).dll
++
++CFLAGS_ADD += -mno-cygwin -I../../src/win32 -DWIN32
++CFLAGS_ADD2 +=        # nothing
++LDFLAGS_ADD +=        -mno-cygwin -Wl,-soname,$(NAME)
++
++CFLAGS_SET += # nothing
++LDFLAGS_SET +=        # nothing
++
++LIBS ?=               -lws2_32
++
++INSTALL_LIB = cp $(NAME) ../..
++
++EXTRA_OBJS =  ../../src/win32/compat.o
++
++MAKEDEPEND =  makedepend -f $(DEPFILE) $(CFLAGS_ADD) $(INCLUDES) $(SRCS)
++
++all:          all2
++install:      install2
++clean:                clean2
++
++else
++
+ all:  help
+-install:help
++install:      help
++clean:                help
++
+ endif
+ endif
+ endif
+ 
++EXTRA_OBJS += ../../src/cfgparser/cfgfile_gen.o
++
+ ifneq ($(ADMIN_INTERFACE), )
+       @echo 'WARNING - BUILDING WITH ADMIN INTERFACE!'
+-CFLAGS += -DADMIN_INTERFACE
++CFLAGS_ADD += -DADMIN_INTERFACE
+ endif
+ 
+-CFLAGS += $(PLUGINFLAGS)
+-
+-#Sourcefiles
+-SRCS= src/olsrd_plugin.c src/olsrd_httpinfo.c src/admin_interface.c \
+-      ../../src/cfgparser/cfgfile_gen.c
+-
+-#Objectfiles
+-OBJS= src/olsrd_plugin.o src/olsrd_httpinfo.o src/admin_interface.o \
+-      ../../src/cfgparser/cfgfile_gen.o
++CFLAGS ?=     $(CFLAGS_SET)
++LDFLAGS ?=    $(LDFLAGS_SET)
+ 
+-#Headerfiles
+-HDRS= src/olsrd_plugin.h src/olsrd_httpinfo.h \
+-      src/gfx.h src/html.h src/admin_interface.h src/admin_html.h
++CFLAGS                += $(CFLAGS_ADD) $(CFLAGS_ADD2)
++LDFLAGS               += $(LDFLAGS_ADD)
+ 
++all2:         $(NAME)
+ 
+-plugin: $(OBJS)
+-      $(CC) $(LDFLAGS) $(NAMEFLAGS) \
+-      -Wl,--version-script=version-script.txt \
+-      -o $(NAME) $(OBJS) $(COMPATOBJ) $(LIBS)
++$(NAME):      $(OBJS) $(EXTRA_OBJS)
++              $(CC) $(LDFLAGS) -o $(NAME) $(OBJS) $(EXTRA_OBJS) $(LIBS)
+ 
+-
+-install_olsrd:
++install2:     $(NAME)
+       $(STRIP) $(NAME)
+       $(INSTALL_LIB)
+ 
++clean2:
++              rm -f $(OBJS) $(NAME) $(DEPFILE)
++
++$(DEPFILE):   $(SRCS) $(HDRS)
++ifdef MAKEDEPEND
++              echo "# Generated automatically. DO NOT EDIT." >$(DEPFILE)
++              $(MAKEDEPEND)
++endif
++
+ help:
+       @echo
+-      @echo '***** olsr.org HTTP plugin Make ****'
+-      @echo ' You must provide a valid target OS '
+-      @echo ' by setting the OS variable! Valid  '
+-      @echo ' target OSes are:                   '
+-      @echo ' ---------------------------------  '
+-      @echo ' linux - GNU/Linux                  '
+-      @echo ' win32 - MS Windows                 '
+-      @echo ' fbsd  - FreeBSD                    '
+-      @echo ' ---------------------------------  '
+-      @echo ' Example - build for windows:       '
+-      @echo ' make OS=win32                      '
+-      @echo '************************************'
++              @echo '                     * * * *  olsr.org Plugin Make  * * * *'
++              @echo
++              @echo '  Plugin: $(PLUGIN_NAME), version $(PLUGIN_VER)'
++              @echo
++              @echo '  You must provide a valid target OS by setting the OS variable.'
++              @echo
++              @echo '  Valid settings are:'
++              @echo
++              @echo '    linux - GNU/Linux'
++              @echo '    win32 - Microsoft Windows'
++              @echo '    fbsd  - FreeBSD'
++              @echo
++              @echo '  Example - Build on Windows:'
++              @echo
++              @echo '    make OS=win32'
++              @echo
++              @echo '  Example - Build and install on Linux:'
++              @echo
++              @echo '    make OS=linux install            '
+       @echo
+ 
+-clean:
+-      rm -f $(OBJS) $(NAME)
+-
+-src/olsrd_plugin.o: $(HDRS)
+-
+-src/olsrd_httpinfo.o: $(HDRS)
+-
+-src/admin_interface.o: $(HDRS)
++sinclude $(DEPFILE)

diff --git a/packages/olsrd/files/olsrd.conf b/packages/olsrd/files/olsrd.conf
index e69de29..dbd0472 100644 (file)
--- a/packages/olsrd/files/olsrd.conf
+++ b/packages/olsrd/files/olsrd.conf
@@ -0,0 +1,151 @@
+#
+# olsr.org configuration file
+#
+
+#
+# Periodically print the internal state, including information on
+# route calculation
+#
+
+DebugLevel             2
+
+#
+# Clear the screen each time the internal state changes
+#
+
+ClearScreen            yes
+
+#
+# IP version to use
+#
+
+IpVersion              4
+
+#
+# IPv4 HNAs - syntax: netaddr netmask
+#
+
+Hna4
+{
+#      0.0.0.0 0.0.0.0
+}
+
+#
+# Do not use hysteresis
+#
+
+UseHysteresis          no
+
+#
+# If using hysteresis, use "smooth" parameters
+#
+
+HystScaling            0.10
+HystThrHigh            0.80
+HystThrLow             0.30
+
+#
+# Which neighbours should be advertised via TC messages?
+#
+# 0 - only advertise our MPR selectors
+# 1 - advertise our MPR selectors and our MPRs
+# 2 - advertise all neighbors
+#
+
+TcRedundancy           2
+
+#
+# Specifies by how many MPRs each two-hop neighbour should be covered
+#
+
+MprCoverage            9
+
+#
+# Enable the link quality extensions?
+#
+# 0 - no
+# 1 - yes, use link quality for MPR selection
+# 2 - yes, use link quality for MPR selection and routing
+#
+
+LinkQualityLevel       2
+
+#
+# Windows size for packet loss calculation
+#
+
+LinkQualityWinSize     20
+
+#
+# Load the dot draw plugin
+#
+
+LoadPlugin "olsrd_httpinfo.so.0.1"
+{
+       PlParam "Port" "8080"
+       PlParam "Net" "192.168.0.0 255.255.255.0"
+}
+
+#LoadPlugin "olsrd_dot_draw.so.0.3"
+#{
+       # accept connection from IP:
+       # default 127.0.0.1 (localhost) 
+       #PlParam     "accept" "192.168.0.5"
+#}
+
+#
+# Interfaces - 
+# change to the name of your WLAN interface
+#
+
+Interface "eth0" "wlan0" "wlan1" "ath0" "ath1"
+{
+
+       #
+       # HELLO interval in seconds (float)
+       #
+
+       HelloInterval           2.0
+
+       #
+       # HELLO validity time
+       #
+
+       HelloValidityTime       40.0
+
+       #
+       # TC interval in seconds (float)
+       #
+
+       TcInterval              3.0
+
+       #
+       # TC validity time
+       #
+
+       TcValidityTime          15.0
+
+       #
+       # MID interval in seconds (float)
+       #
+
+       MidInterval             5.0
+
+       #
+       # MID validity time
+       #
+
+       MidValidityTime         15.0
+
+       #
+       # HNA interval in seconds (float)
+       #
+
+       HnaInterval             5.0
+
+       #
+       # HNA validity time
+       #
+
+       HnaValidityTime         15.0
+}

diff --git a/packages/olsrd/olsrd_0.4.9.bb b/packages/olsrd/olsrd_0.4.9.bb
index c81fba6..2fd3cec 100644 (file)
--- a/packages/olsrd/olsrd_0.4.9.bb
+++ b/packages/olsrd/olsrd_0.4.9.bb
@@ -5,6 +5,8 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "BSD"
+RDEPENDS_olsrd = "olsrd-libs"
+PR = "r1"
 
 SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \
        file://0.4.9-httpinfo-makefile.diff;patch=1 \