X-Git-Url: http://olsr.org/git/?p=olsrd.git;a=blobdiff_plain;f=files%2Folsrd.conf.default.rfc;h=58f6c74c6a7b9ebcf9d31d20958aa00e2f5fb403;hp=7f97797914fd122e6df99d479fc7ee4de8dcf65e;hb=8cc364c130d14400090ad2207cbea62bbefeb6a2;hpb=3d710208794fbf0fa10074756df67e3de9bbf80b

diff --git a/files/olsrd.conf.default.rfc b/files/olsrd.conf.default.rfc
index 7f977979..58f6c74c 100644
--- a/files/olsrd.conf.default.rfc
+++ b/files/olsrd.conf.default.rfc
@@ -15,6 +15,10 @@ DebugLevel	1
 
 IpVersion	4
 
+# FIBMetric ("flat", "correct", or "approx")
+
+FIBMetric "flat"
+
 # Clear the screen each time the internal state changes
 
 ClearScreen     yes
@@ -118,16 +122,19 @@ HystThrLow	0.30
 
 #LinkQualityLevel	0
 
-# Link quality window size
-# Defaults to 10
-
-#LinkQualityWinSize	10
+# Link quality aging factor
+# Defaults to 0.05, smaller values mean larger LQ window size
+# LinkQualityAging 0.1 
 
 # Polling rate in seconds(float). 
 # Default value 0.05 sec
 
 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
@@ -200,6 +207,15 @@ Pollrate	0.05
 
 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
@@ -254,6 +270,7 @@ Interface "XXX" "YYY"
     # HNA validity time
     # HnaValidityTime 	15.0
 
+
     # When multiple links exist between hosts
     # the weight of interface is used to determine
     # the link to use. Normally the weight is
@@ -261,9 +278,29 @@ Interface "XXX" "YYY"
     # 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 set to 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
+
 }