[Olsr-cvs] olsrd-current/files olsrd.conf.default.lq, 1.2, 1.3 olsrd.conf.default.lq-fisheye, 1.3, 1.4 olsrd.conf.default.rfc, 1.3, 1.4

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/files
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9104/files

Modified Files:
	olsrd.conf.default.lq olsrd.conf.default.lq-fisheye 
	olsrd.conf.default.rfc 
Log Message:
* added the rest if the olsrd-fixes-eric patch from Sven-Ola


Index: olsrd.conf.default.rfc
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.default.rfc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** olsrd.conf.default.rfc	17 Apr 2006 18:31:08 -0000	1.3
--- olsrd.conf.default.rfc	10 Feb 2007 19:27:32 -0000	1.4
***************
*** 268,271 ****
--- 268,272 ----
      # HnaValidityTime 	15.0
  
+ 
      # When multiple links exist between hosts
      # the weight of interface is used to determine
***************
*** 275,282 ****
      # but here you can specify a fixed value.
      # Olsrd will choose links with the lowest value.
! 
      # Weight 0
  
  
  }
  
--- 276,303 ----
      # 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
+ 
  }
  

Index: olsrd.conf.default.lq-fisheye
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.default.lq-fisheye,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** olsrd.conf.default.lq-fisheye	17 Apr 2006 18:31:08 -0000	1.3
--- olsrd.conf.default.lq-fisheye	10 Feb 2007 19:27:32 -0000	1.4
***************
*** 282,285 ****
--- 282,286 ----
      HnaValidityTime 	100.0
  
+ 
      # When multiple links exist between hosts
      # the weight of interface is used to determine
***************
*** 289,293 ****
      # but here you can specify a fixed value.
      # Olsrd will choose links with the lowest value.
! 
      # Weight 0
  
--- 290,297 ----
      # 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
  
***************
*** 301,304 ****
--- 305,311 ----
      # (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
***************
*** 306,311 ****
      # This multiplier applies to all other nodes 
      # LinkQualityMult default 0.8
-  
- 
  
  }
--- 313,316 ----

Index: olsrd.conf.default.lq
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/files/olsrd.conf.default.lq,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** olsrd.conf.default.lq	17 Apr 2006 18:31:08 -0000	1.2
--- olsrd.conf.default.lq	10 Feb 2007 19:27:32 -0000	1.3
***************
*** 273,276 ****
--- 273,277 ----
      HnaValidityTime 	30.0
  
+ 
      # When multiple links exist between hosts
      # the weight of interface is used to determine
***************
*** 280,287 ****
      # but here you can specify a fixed value.
      # Olsrd will choose links with the lowest value.
! 
      # Weight 0
  
  
  }
  
--- 281,308 ----
      # 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
+ 
  }