Harmonize and sync default configs

[olsrd.git] / files / olsrd.conf.default.lq-fisheye

diff --git a/files/olsrd.conf.default.lq-fisheye b/files/olsrd.conf.default.lq-fisheye
index 21f0a0c..07a43fd 100644 (file)
--- a/files/olsrd.conf.default.lq-fisheye
+++ b/files/olsrd.conf.default.lq-fisheye
@@ -3,18 +3,28 @@
 #
 # Lines starting with a # are discarded
 #
 #
 # Lines starting with a # are discarded
 #

-# This file was shipped with olsrd 0.5.4
+# This file was shipped with olsrd 0.X.X

 #
 
 # This file is an example of a typical
 # configuration for a mostly static
 # network(regarding mobility) using
 #
 
 # This file is an example of a typical
 # configuration for a mostly static
 # network(regarding mobility) using

-# the LQ extention
+# the LQ extention with fisheye like
+# it's beeing used in freifunk meshes
+
+# Fisheye mechanism for TC messages 0=off, 1=on
+
+LinkQualityFishEye     1
+
+# Do not switch default route if LQ diff is small
+# _and_ if another NAT gateway is selected by this.
+
+NatThreshold           0.75

 
 # Debug level(0-9)
 # If set to 0 the daemon runs in the background
 
 
 # Debug level(0-9)
 # If set to 0 the daemon runs in the background
 

-DebugLevel     0
+DebugLevel     1

 
 # IP version to use (4 or 6)
 
 
 # IP version to use (4 or 6)
 


@@ -22,118 +32,7 @@ IpVersion   4
 
 # FIBMetric ("flat", "correct", or "approx")
 
 
 # FIBMetric ("flat", "correct", or "approx")
 

-FIBMetric "flat"
-
-# Interfaces and their rules
-# Omitted options will be set to the
-# default values. Multiple interfaces
-# can be specified in the same block
-# and multiple blocks can be set.
-
-# !!CHANGE THE INTERFACE LABEL(s) TO MATCH YOUR INTERFACE(s)!!
-# (eg. wlan0 or eth1):
-# 
-# this is (in most cases) the only configuration you need to change
-
-#Interface "eth1" "eth0" "wlan0" "wlan1" "ath0" "ath1"
-Interface "eth1"
-{
-
-    # IPv4 broadcast address to use. The
-    # one usefull example would be 255.255.255.255
-    # If not defined the broadcastaddress
-    # every card is configured with is used
-
-    # Ip4Broadcast             255.255.255.255
-
-    # IPv6 address scope to use.
-    # Must be 'site-local' or 'global'
-
-    # Ip6AddrType              site-local
-
-    # IPv6 multicast address to use when
-    # using site-local addresses.
-    # If not defined, ff05::15 is used
-
-    # Ip6MulticastSite         ff05::11
-
-    # IPv6 multicast address to use when
-    # using global addresses
-    # If not defined, ff0e::1 is used
-
-    # Ip6MulticastGlobal       ff0e::1
-
-
-    # Emission intervals.
-    # If not defined, RFC proposed values will
-    # be used in most cases.
-
-    # Hello interval in seconds(float)
-    HelloInterval    6.0
-
-    # HELLO validity time
-    HelloValidityTime  600.0
-
-
-    # TC interval in seconds(float) 0.5 is only viable when
-    # LinkQualityFishEye is enabled. Otherwise larger networks would
-    # suffocate from a massive protocol overhead of TC-messages
-
-    TcInterval        0.5
-
-    # TC validity time
-    TcValidityTime     300.0
-
-    # MID interval in seconds(float)
-    MidInterval                10.0
-
-    # MID validity time
-    MidValidityTime    300.0
-
-    # HNA interval in seconds(float)
-    HnaInterval                10.0
-
-    # HNA validity time
-    HnaValidityTime    300.0
-
-    # When multiple links exist between hosts
-    # the weight of interface is used to determine
-    # the link to use. Normally the weight is
-    # automatically calculated by olsrd based
-    # on the characteristics of the interface,
-    # but here you can specify a fixed value.
-    # Olsrd will choose links with the lowest value.
-
-    # Weight 0
-
-
-    # If a certain route should be preferred
-    # or ignored by the mesh, the Link Quality
-    # value of a node can be multiplied with a factor
-    # entered here. In the example the route
-    # using 192.168.0.1 would rather be ignored.
-    # A multiplier of 0.5 will result in a small
-    # (bad) LinkQuality value and a high (bad)
-    # ETX value.
-
-    # LinkQualityMult 192.168.0.1 0.5
-
-    # This multiplier applies to all other nodes 
-    # LinkQualityMult default 0.8
-}
-
-
-# Fisheye mechanism for TC messages 0=off, 1=on
-
-LinkQualityFishEye 1
-
-
-# ignore topology information from nodes further than 3 hops away
-#
-# update topology information every 3.0 seconds
-# (on slower embedded hardware with more than 100 nodes use something like 9 sec)
-# 
-LinkQualityDijkstraLimit 3 3.0
+FIBMetric "approx"

 
 # Clear the screen each time the internal state changes
 
 
 # Clear the screen each time the internal state changes
 


@@ -182,7 +81,7 @@ AllowNoInt   yes
 # dynamically based on battery/power status
 # if such information is available
 
 # dynamically based on battery/power status
 # if such information is available
 

-Willingness            7
+#Willingness           4

 
 # Allow processes like the GUI front-end
 # to connect to the daemon.
 
 # Allow processes like the GUI front-end
 # to connect to the daemon.


@@ -213,7 +112,6 @@ IpcConnect
 # Hysteresis adds more robustness to the
 # link sensing but delays neighbor registration.
 # Used by default. 'yes' or 'no'
 # Hysteresis adds more robustness to the
 # link sensing but delays neighbor registration.
 # Used by default. 'yes' or 'no'

-# Do not use hysteresis with ETX!

 
 UseHysteresis  no
 
 
 UseHysteresis  no
 


@@ -247,13 +145,17 @@ LinkQualityLevel  2
 # Link quality algorithm
 # Defaults to "etx_fpm" for fixpoint based etx algorithm
 
 # Link quality algorithm
 # Defaults to "etx_fpm" for fixpoint based etx algorithm
 

-#LinkQualityAlgorithm    "etx_fpm"
+LinkQualityAlgorithm    "etx_ff"

 
 # Polling rate in seconds(float). 
 # Default value 0.05 sec
 
 
 # Polling rate in seconds(float). 
 # Default value 0.05 sec
 

-Pollrate       0.1
+Pollrate       0.05

 
 

+# Interval to poll network interfaces for configuration 
+# changes. Defaults to 2.5 seconds
+
+NicChgsPollInt  3.0

 
 # TC redundancy
 # Specifies how much neighbor info should
 
 # TC redundancy
 # Specifies how much neighbor info should


@@ -277,7 +179,7 @@ TcRedundancy        2
 #
 # defaults to 1
 
 #
 # defaults to 1
 

-MprCoverage    5
+MprCoverage    7

 
 
 # Olsrd plugins to load
 
 
 # Olsrd plugins to load


@@ -288,56 +190,174 @@ MprCoverage      5
 # - The list of libraries cached in /etc/ld.so.cache
 # - /lib, followed by /usr/lib
 
 # - The list of libraries cached in /etc/ld.so.cache
 # - /lib, followed by /usr/lib
 

-# Configuration examples for plugins:
-# see /usr/share/doc/olsrd-plugins/ for some for documentation
+# Example plugin entries with parameters:

 
 

-#LoadPlugin "olsrd_httpinfo.so.0.1"
+#LoadPlugin "olsrd_arprefresh.so.0.1"

 #{
 #{

-#      # defaults to 1978
-#      PlParam     "Port"   "8080"
-#      # if you dont set these, the default is to listen only on the loopback device
-#      #PlParam "Host"   "80.23.53.22"
-#      #PlParam "Net"    "10.0.0.0 255.0.0.0"
-#      #PlParam "Net" "0.0.0.0 0.0.0.0"

 #}
 
 #}
 

-# useful if your machine has an uplink
-#LoadPlugin "olsrd_dyn_gw.so.0.4"
+#LoadPlugin "olsrd_dyn_gw_plain.so.0.4"

 #{
 #{

-    # Here parameters are set to be sent to the
-    # plugin. Theese are on the form "key" "value".
-    # Parameters ofcause, differs from plugin to plugin.
-    # Consult the documentation of your plugin for details.
-
-    # Example: dyn_gw params
-
-    # how often to check for Internet connectivity
-    # defaults to 5 secs
-#   PlParam     "Interval"   "40"
-    
-    # if one or more IPv4 addresses are given, do a ping on these in
-    # descending order to validate that there is not only an entry in
-    # routing table, but also a real internet connection. If any of
-    # these addresses could be pinged successfully, the test was
-    # succesful, i.e. if the ping on the 1st address was successful,the
-    # 2nd won't be pinged
-#   PlParam     "Ping"       "141.1.1.1"
-#   PlParam     "Ping"       "194.25.2.129"

 #}
 
 #}
 

-#LoadPlugin "olsrd_nameservice.so.0.2"
+#LoadPlugin "olsrd_nameservice.so.0.3"

 #{
 #{

-        #PlParam "name" "xxx"
-        #PlParam "a.b.c.d" "xxx-eth"
-        #PlParam "a.b.c.e" "xxx-bbb"
-        #PlParam "a.b.c.f" "xxx-olsr"
-        #PlParam "suffix" ".olsr"
+#      PlParam "name"          "your-pc-hostname"
+#      PlParam "hosts-file"    "/var/run/hosts"
+#      PlParam "suffix"        ".olsr"
+#      PlParam "interval"      "180"
+#      PlParam "timeout"       "3600"
+#      PlParam "latlon-file"   "/var/run/latlon.js"
+#      PlParam "lat"           "52.000001"
+#      PlParam "lon"           "13.000001"
+#}
+
+#LoadPlugin "olsrd_txtinfo.so.0.1"
+#{
+#      PlParam "Accept" "127.0.0.1"

 #}
 
 #LoadPlugin "olsrd_dot_draw.so.0.3"
 #{
 #}
 
 #LoadPlugin "olsrd_dot_draw.so.0.3"
 #{

-        # accept connection from IP:
-        # default 127.0.0.1 (localhost)        
-        #PlParam     "accept" "192.168.0.5"
-        #PlParam     "port" "2004"
+#      PlParam "Accept" "127.0.0.1"
+#}
+
+#LoadPlugin "olsrd_httpinfo.so.0.1"
+#{
+#      PlParam     "port"   "8080"
+#      PlParam     "Host"   "127.0.0.1"
+#      PlParam     "Net"    "104.0.0.0 255.0.0.0"
+#      PlParam     "Net"    "192.168.0.0 255.255.0.0"
+#}
+
+#LoadPlugin "olsrd_dyn_gw.so.0.3"
+#{
+#      # Here parameters are set to be sent to the
+#      # plugin. Theese are on the form "key" "value".
+#      # Parameters ofcause, differs from plugin to plugin.
+#      # Consult the documentation of your plugin for details.
+#
+#      # Example: dyn_gw params
+#
+#      # how often to check for Internet connectivity
+#      # defaults to 5 secs
+#      PlParam     "Interval"   "40"
+#    
+#      # if one or more IPv4 addresses are given, do a ping on these in
+#      # descending order to validate that there is not only an entry in
+#      # routing table, but also a real internet connection. If any of
+#      # these addresses could be pinged successfully, the test was
+#      # succesful, i.e. if the ping on the 1st address was successful,the
+#      # 2nd won't be pinged
+#      PlParam     "Ping"       "141.1.1.1"
+#      PlParam     "Ping"       "194.25.2.129"

 #}
 #}

+
+
+# Interfaces and their rules
+# Omitted options will be set to the
+# default values. Multiple interfaces
+# can be specified in the same block
+# and multiple blocks can be set.
+
+# !!CHANGE THE INTERFACE LABEL(s) TO MATCH YOUR INTERFACE(s)!!
+# (eg. wlan0 or eth1):
+
+Interface "XXX" "YYY"
+{
+    # Olsrd can autodetect changes in NIC
+    # configurations(IP address changes etc.). 
+    # This is Enabled by default and the interval
+    # to poll for changes on is defined by 
+    # NicChgsPollInt.
+    # This polling can be disabled pr. NIC by setting
+    # AutoDetectChanges to no.
+
+    # AutoDetectChanges            yes
+
+    # IPv4 broadcast address to use. The
+    # one usefull example would be 255.255.255.255
+    # If not defined the broadcastaddress
+    # every card is configured with is used
+
+    # Ip4Broadcast             255.255.255.255
+
+    # IPv6 address scope to use.
+    # Must be 'site-local' or 'global'
+
+    # Ip6AddrType              site-local
+
+    # IPv6 multicast address to use when
+    # using site-local addresses.
+    # If not defined, ff05::15 is used
+
+    # Ip6MulticastSite         ff05::11
+
+    # IPv6 multicast address to use when
+    # using global addresses
+    # If not defined, ff0e::1 is used
+
+    # Ip6MulticastGlobal       ff0e::1
+
+
+    # Emission intervals.
+    # If not defined, RFC proposed values will
+    # be used in most cases.
+
+    # Hello interval in seconds(float)
+    HelloInterval      3.0
+
+    # HELLO validity time
+    HelloValidityTime  150.0
+
+    # TC interval in seconds(float)
+    TcInterval         2.0
+
+    # TC validity time
+    TcValidityTime     500.0
+
+    # MID interval in seconds(float)
+    MidInterval                25.0
+
+    # MID validity time
+    MidValidityTime    500.0
+
+    # HNA interval in seconds(float)
+    HnaInterval                10.0
+
+    # HNA validity time
+    HnaValidityTime    125.0
+
+
+    # When multiple links exist between hosts
+    # the weight of interface is used to determine
+    # the link to use. Normally the weight is
+    # automatically calculated by olsrd based
+    # on the characteristics of the interface,
+    # but here you can specify a fixed value.
+    # Olsrd will choose links with the lowest value.
+    # Note:
+    # Interface weight is used only when LinkQualityLevel is 0.
+    # For any other value of LinkQualityLevel, the interface ETX
+    # value is used instead.
+    # Weight 0
+
+
+    # If a certain route should be preferred 
+    # or ignored by the mesh, the Link Quality 
+    # value of a node can be multiplied with a factor 
+    # entered here. In the example the route 
+    # using 192.168.0.1 would rather be ignored.
+    # A multiplier of 0.5 will result in a small
+    # (bad) LinkQuality value and a high (bad)
+    # ETX value.
+    # Note:
+    # Link quality multiplier is used only when
+    # LinkQualityLevel is > 0.
+
+    # LinkQualityMult 192.168.0.1 0.5
+
+    # This multiplier applies to all other nodes 
+    # LinkQualityMult default 0.8
+
+}