diff options
| author | Gabriel Kerneis <kerneis@google.com> | 2015-04-20 10:47:49 +0200 |
|---|---|---|
| committer | Gabriel Kerneis <kerneis@google.com> | 2015-04-21 10:29:58 +0200 |
| commit | c5f795cc38cd79e688bba70fe1fad9b460c4bca7 (patch) | |
| tree | 353af60bde707634bfc72cee2cf887a5857e5ab6 | |
| parent | b46e7f995f98cd8a669bbb08797ee5d7b9802fdb (diff) | |
babeld: tweak configuration for source-specific features
- Enable ipv6-subtrees by default.
- Add UCI options to configure source-specific filters.
Signed-off-by: Gabriel Kerneis <kerneis@google.com>
| -rw-r--r-- | babeld/Makefile | 2 | ||||
| -rw-r--r-- | babeld/files/babeld.config | 8 | ||||
| -rwxr-xr-x | babeld/files/babeld.init | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/babeld/Makefile b/babeld/Makefile index 1607b04..ba8d14d 100644 --- a/babeld/Makefile +++ b/babeld/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=babeld PKG_VERSION:=1.6.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pps.univ-paris-diderot.fr/~jch/software/files/ diff --git a/babeld/files/babeld.config b/babeld/files/babeld.config index 1536596..fa22fd6 100644 --- a/babeld/files/babeld.config +++ b/babeld/files/babeld.config @@ -13,6 +13,9 @@ config general # option 'debug' '1' # option 'local_port' '33123' # option 'log_file' '/var/log/babeld.log' + ## Enable ipv6-subtrees by default since OpenWrt should ship with a + ## recent enough kernel for it to work. + option 'ipv6_subtrees' 'true' ## This seems somewhat buggy on BB. If you need only one ## import-table statement, "option import_table 42" should work. # list 'import_table' '42' @@ -54,11 +57,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. diff --git a/babeld/files/babeld.init b/babeld/files/babeld.init index 164d967..ae1e678 100755 --- a/babeld/files/babeld.init +++ b/babeld/files/babeld.init @@ -127,6 +127,10 @@ babel_filter() { append_parm "$cfg" 'eq' 'eq' append_parm "$cfg" 'le' 'le' append_parm "$cfg" 'ge' 'ge' + append_parm "$cfg" 'src_ip' 'src-ip' + append_parm "$cfg" 'src_eq' 'src-eq' + append_parm "$cfg" 'src_le' 'src-le' + append_parm "$cfg" 'src_ge' 'src-ge' append_parm "$cfg" 'neigh' 'neigh' append_parm "$cfg" 'id' 'id' append_parm "$cfg" 'proto' 'proto' |