X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=babeld%2Ffiles%2Fbabeld.config;h=0073f73f5667a49137a49fb48eb7f0edcde94a38;hb=89cdcd94a000075801a73ba7e5e4c231646c0168;hp=15365961e3d854f0237fbb1f529a7c999832240b;hpb=e291dcb7c382306e2d38378fbcce5b7f12c0f648;p=feed%2Frouting.git

diff --git a/babeld/files/babeld.config b/babeld/files/babeld.config
index 1536596..0073f73 100644
--- a/babeld/files/babeld.config
+++ b/babeld/files/babeld.config
@@ -1,10 +1,10 @@
 package babeld
 
-# Configuration set in this file ends up in /var/etc/babeld.conf.
-# Babeld is told to use both /etc/babeld.conf and /var/etc/babeld.conf, so
-# you can use one or the other, or even both at the same time.  If an
-# option is defined in both files, the version in /var/etc/babeld.conf
-# takes precedence.
+# Babeld reads options from the following files (the last one takes precedence
+# if an option is defined in several places):
+# - the file defined by the option conf_file (default: /etc/babeld.conf),
+# - *.conf files in the directory defined by conf_dir (default: /tmp/babel.d/),
+# - this UCI configuration file.
 
 # See "man babeld" for all available options ("Global options").
 # Important: remember to use '_' instead of '-' in option names.
@@ -13,10 +13,15 @@ config general
 	# option 'debug' '1'
 	# option 'local_port' '33123'
 	# option 'log_file' '/var/log/babeld.log'
-	## This seems somewhat buggy on BB.  If you need only one
-	## import-table statement, "option import_table 42" should work.
+	## Enable ipv6-subtrees by default since OpenWrt should ship with a
+	## recent enough kernel for it to work.
+	option 'ipv6_subtrees' 'true'
 	# list 'import_table' '42'
 	# list 'import_table' '100'
+	## Alternative configuration file and directory.
+	## See comment at the top of this file for more details.
+	# option 'conf_file' '/etc/babeld.conf'
+	# option 'conf_dir' '/tmp/babel.d/'
 
 config interface
 	## Remove this line to enable babeld on this interface
@@ -54,11 +59,12 @@ config filter
 	option 'ignore'	'true'
 	# Type
 	option 'type'	'redistribute'
-	# Selectors: ip, eq, le, ge, neigh, id, proto, local, if
+	# Selectors: ip, eq, le, ge, src_ip, src_eq, src_le, src_ge, neigh, id,
+	# proto, local, if.
 	option 'ip'	'0.0.0.0/0'
 	option 'eq'	'0'
 	option 'proto'	'3'
-	# Action 
+	# Action (one of: allow, deny, metric XXX, src-prefix XXX).
 	option 'action'	'metric 128'
 
 # Notice that the 'local' selector is a boolean.