From 122bd5138c16d1f5b13355841e1b4ccfc548903e Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Sat, 3 Feb 2018 12:27:20 +0100 Subject: [PATCH] fixup! Gluon-core: Allow multiple domain names for next_node-feature --- docs/user/site.rst | 7 ++++++- package/gluon-core/check_site.lua | 7 +------ package/gluon-core/luasrc/lib/gluon/upgrade/820-dns-config | 6 ++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/docs/user/site.rst b/docs/user/site.rst index 8756ab8e..688c0715 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -173,8 +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. Each entry in the ``name``-field will be resolved as the + 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. diff --git a/package/gluon-core/check_site.lua b/package/gluon-core/check_site.lua index ed4cffea..6c074c34 100644 --- a/package/gluon-core/check_site.lua +++ b/package/gluon-core/check_site.lua @@ -70,12 +70,7 @@ if need_table({'dns'}, nil, false) then need_number({'dns', 'cacheentries'}, false) end -if need_table('next_node', nil, false) then - need_string_match('next_node.ip6', '^[%x:]+$', false) - need_string_match('next_node.ip4', '^%d+.%d+.%d+.%d+$', false) - need_string_array('next_node.name', 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) diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/820-dns-config b/package/gluon-core/luasrc/lib/gluon/upgrade/820-dns-config index 34cbcc01..742846d8 100755 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/820-dns-config +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/820-dns-config @@ -34,10 +34,8 @@ local function set_dns_record(name, ip, sectionname) end uci:foreach("dhcp", "domain", function(s) - for key, value in pairs(s) do - if (key == ".name" and string.gmatch(value, "^nextnode[46]")) then - uci:delete("dhcp", value) - end + if (s['.name'] and string.match(s['.name'], "^nextnode[46]_")) then + uci:delete("dhcp", s['.name']) end end)