Merge 2e80dffa68 into b3762fc61c

docs/site-example/site.conf

@@ -83,6 +83,7 @@
   -- connected to using a known IP address.
   next_node = {
     -- anycast IPs of all nodes
+    -- name = { 'nextnode.location.community.example.org', 'nextnode', 'nn' },
     ip4 = '10.xxx.0.xxx',
     ip6 = 'fdxx:xxxx:xxxx::xxxx',
   },

docs/user/site.rst

@@ -163,6 +163,7 @@ next_node \: package
     ::
 
       next_node = {
+        name = { 'nextnode.location.community.example.org', 'nextnode', 'nn' },
         ip4 = '10.23.42.1',
         ip6 = 'fdca:ffee:babe:1::1',
         mac = '16:41:95:40:f7:dc'
@@ -172,7 +173,13 @@ next_node \: package
     omitted, there will be no IPv4 or IPv6 anycast address. The MAC address
     defaults to ``16:41:95:40:f7:dc``; this value usually doesn't need to be
     changed, but it can be adjusted to match existing deployments that use a
-    different value.
+    different value. Each entry in the ``name``-field will be resolved to the
+    IPv4 and IPv6-address.
+    For this to work, clients must use the next-node as their resolver. In
+    batman-based networks this requires setting the central DHCP server to
+    deliver this address as DNS server via DHCP option. When running a radvd
+    inside the network, this should be set to deliver the next-node
+    IPv6-address via rdnss.
 
 mesh \: optional
     Options specific to routing protocols.

package/gluon-core/check_site.lua

@@ -70,6 +70,7 @@ if need_table({'dns'}, nil, false) then
 	need_number({'dns', 'cacheentries'}, false)
 end
 
+need_string_array(in_domain({'next_node', 'name'}), false)
 need_string_match(in_domain({'next_node', 'ip6'}), '^[%x:]+$', false)
 need_string_match(in_domain({'next_node', 'ip4'}), '^%d+.%d+.%d+.%d+$', false)
 

package/gluon-core/luasrc/lib/gluon/upgrade/820-dns-config

@@ -25,22 +25,21 @@ if dns.servers then
 	})
 end
 
-if next_node.name and next_node.ip4 then
+local function set_dns_record(name, ip, sectionname)
-	uci:section('dhcp', 'domain', 'nextnode4', {
+	if not ip then return end
-		name = next_node.name,
+	uci:section('dhcp', 'domain', sectionname, {
-		ip = next_node.ip4,
+		name = name,
+		ip = ip,
 	})
-else
-	uci:delete('dhcp', 'domain', 'nextnode4')
 end
 
-if next_node.name and next_node.ip6 then
+uci:delete_all('dhcp', 'domain', function(s)
-	uci:section('dhcp', 'domain', 'nextnode6', {
+	return (s['.name'] and string.match(s['.name'], "^nextnode[46]"))
-		name = next_node.name,
+end)
-		ip = next_node.ip6,
+
-	})
+for i, name in ipairs(next_node.name or {}) do
-else
+	set_dns_record(name, next_node.ip4, 'nextnode4_' .. i)
-	uci:delete('dhcp', 'domain', 'nextnode6')
+	set_dns_record(name, next_node.ip6, 'nextnode6_' .. i)
 end
 
 uci:save('dhcp')