Merge branch 'master' into batman-orig_interval

packages/lime-docs/files/www/docs/lime-example.txt

@@ -60,6 +60,7 @@ config lime network
 	option bmx7_wifi_rate_max 'auto'
 	option bmx7_enable_pki false			# Trust only nodes in /etc/bmx7/trustedNodes when set (default is to trust all nodes)
 	option batadv_orig_interval '2000'		# BATMAN-adv will send one Originator Message (OGM) packet every 2000 ms (2 s). This value should be ok for the static networks, in which the LibreMesh routers are not moving. If you have a LibreMesh node moving (e.g. in your backpack) consider decreasing this value. A smaller value means that BATMAN-adv will take less time for realizing which links are better, but will generate more background traffic on all the interfaces.
+	option batadv_routing_algo 'BATMAN_IV'		# BATMAN_V uses throughput rather than packet loss (as in BATMAN_IV) for evaluating the quality of a link 
 	option anygw_mac 'aa:aa:aa:%N1:%N2:aa'		# Parametrizable with %Nn. Keep in mind that the ebtables rule will use a mask of ff:ff:ff:00:00:00 so br-lan will not forward anything coming in that matches the first 3 bytes of it's own anygw_mac (aa:aa:aa: by default)
 #	option autoap_enabled 0				# Requires lime-ap-watchping installed. If enabled AP SSID is changed to ERROR when network issues
 #	option autoap_hosts "8.8.8.8 141.1.1.1"		# Requires lime-ap-watchping installed. Hosts used to check if the network is working fine

packages/lime-proto-batadv/files/usr/lib/lua/lime/proto/batadv.lua

@@ -18,6 +18,10 @@ function batadv.configure(args)
 
 	uci:set("network", "bat0", "interface")
 	uci:set("network", "bat0", "proto", "batadv")
+	-- BATMAN_V uses throughput rather than packet loss (as in BATMAN_IV) for evaluating
+	-- the quality of a link. Still, by default we continue selecting BATMAN_IV
+	local routing_algo = config.get("network", "batadv_routing_algo", "BATMAN_IV")
+	uci:set("network", "bat0", "routing_algo", routing_algo)
 	uci:set("network", "bat0", "bridge_loop_avoidance", "1")
 	uci:set("network", "bat0", "multicast_mode", "0")
 	-- by default, BATMAN-adv sends out one Originator Message (OGM) every second (orig_interval=1000)

packages/lime-proto-batadv/tests/test_batadv.lua

@@ -20,6 +20,7 @@ describe('LiMe proto Batman-adv #protobatadv', function()
         proto.configure()
 
         assert.is.equal('batadv', uci:get('network', 'bat0', 'proto'))
+        assert.is.equal('BATMAN_IV', uci:get('network', 'bat0', 'routing_algo'))
         assert.is.equal('1', uci:get('network', 'bat0', 'bridge_loop_avoidance'))
         assert.is.equal('0', uci:get('network', 'bat0', 'multicast_mode'))
         assert.is.equal('2000', uci:get('network', 'bat0', 'orig_interval'))

packages/lime-system/files/etc/config/lime-defaults

@@ -46,6 +46,7 @@ config lime network
 	option bmx7_wifi_rate_max 'auto'
 	option bmx7_enable_pki false
 	option batadv_orig_interval '2000'
+	option batadv_routing_algo 'BATMAN_IV'
 	option anygw_mac "aa:aa:aa:%N1:%N2:aa"
 	option use_odhcpd false
 

packages/shared-state-dnsmasq_servers/files/etc/uci-defaults/shared-state-dnsmasq_servers

@@ -1,7 +1,8 @@
 #!/bin/sh
 
 # dnsmasq upon SIGHUP will re-read this file containing "server=/example.com/1.2.3.4" lines
-echo "servers-file=/var/shared-state/dnsmasq_servers" > "/etc/dnsmasq.d/shared-state-dnsmasq_servers.conf"
+uci set dhcp.@dnsmasq[0].serversfile=/var/shared-state/dnsmasq_servers
+uci commit dhcp
 
 unique_append()
 {

packages/shared-state/files/etc/init.d/shared-state

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=98
+START=13
 
 start() {
     logger -p daemon.info  -t shared-state "Generating and publishing databases"