Automated merge with http://gredler.at/hg/olsrd-linkset-refactoring

[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 2f1da31..9e170c4 100644 (file)
--- a/files/olsrd.conf.default.lq-fisheye
+++ b/files/olsrd.conf.default.lq-fisheye
@@ -16,6 +16,13 @@
 
 DebugLevel     0
 
 
 DebugLevel     0
 

+# IP version to use (4 or 6)
+
+IpVersion      4
+
+# FIBMetric ("flat", "correct", or "approx")
+
+FIBMetric "flat"

 
 # Interfaces and their rules
 # Omitted options will be set to the
 
 # Interfaces and their rules
 # Omitted options will be set to the


@@ -128,10 +135,6 @@ LinkQualityFishEye 1
 # 
 LinkQualityDijkstraLimit 3 3.0
 
 # 
 LinkQualityDijkstraLimit 3 3.0
 

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

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


@@ -236,10 +239,10 @@ UseHysteresis     no
 
 LinkQualityLevel       2
 
 
 LinkQualityLevel       2
 

-# Link quality window size
-# Defaults to 10
+# Link quality aging factor
+# Defaults to 0.05, smaller values mean larger LQ window size
+LinkQualityAging 0.1 

 
 

-LinkQualityWinSize     100

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