Switch RTT-based metric for routing

debian/control

@@ -7,7 +7,7 @@ Standards-Version: 3.9.1
 
 Package: re6stnet
 Architecture: all
-Depends: ${misc:Depends}, python (>= 2.6.6-3), python (<< 2.8), python-argparse, python-openssl (>= 0.13), openvpn (>= 2.1.3), babeld (>= 1.3.1), iproute2 | iproute, openssl
+Depends: ${misc:Depends}, python (>= 2.6.6-3), python (<< 2.8), python-argparse, python-openssl (>= 0.13), openvpn (>= 2.1.3), babeld (= 1.5.0-nxd1), iproute2 | iproute, openssl
 Recommends: ${python:Recommends}
 Suggests: ndisc6
 Description: resilient, scalable, IPv6 network application

re6st/plib.py

@@ -59,6 +59,7 @@ def router(subnet, hello_interval, table, log_path, state_path, pidfile,
             '-S', state_path,
             '-I', pidfile,
             '-s',
+            '-C', 'default max-rtt-penalty 5000 rtt-max 500',
             '-C', 'redistribute local deny',
             '-C', 'redistribute ip %s/%u eq %u' % (s, n, n),
             '-C', 'redistribute deny']
@@ -67,7 +68,7 @@ def router(subnet, hello_interval, table, log_path, state_path, pidfile,
     else:
         cmd[-2:-2] = '-C', 'redistribute ip ::/0 eq 0'
     for iface in tunnel_interfaces:
-        cmd += '-C', 'interface %s rxcost 512' % iface
+        cmd += '-C', 'interface %s legacy-rxcost 512' % iface
     cmd += args
     # WKRD: babeld fails to start if pidfile already exists
     try:

re6stnet.spec

@@ -7,7 +7,7 @@ Release:   %(git rev-list --topo-order --count HEAD).g%(git rev-parse --short HE
 License:   GPLv2+
 Group:     Applications/Internet
 BuildArch: noarch
-Requires:  babeld >= 1.3.1
+Requires:  babeld = 1.5.0-nxd1
 Requires:  iproute
 Requires:  openssl
 Requires:  openvpn