diff --git a/package/gluon-mesh-babel/check_site.lua b/package/gluon-mesh-babel/check_site.lua index 5a7bf95a..289e3420 100644 --- a/package/gluon-mesh-babel/check_site.lua +++ b/package/gluon-mesh-babel/check_site.lua @@ -1,6 +1,8 @@ need_string_match(in_domain({'node_prefix6'}), '^[%x:]+/64$') need_string_match(in_domain({'node_client_prefix6'}), '^[%x:]+/64$') +need_string_match(in_domain({'clat_range'}), '^[%x:]+/48$', 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-mesh-babel/luasrc/lib/gluon/upgrade/300-gluon-mesh-babel-mkconfig b/package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/300-gluon-mesh-babel-mkconfig index e9a62dbe..488bfea8 100755 --- a/package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/300-gluon-mesh-babel-mkconfig +++ b/package/gluon-mesh-babel/luasrc/lib/gluon/upgrade/300-gluon-mesh-babel-mkconfig @@ -17,6 +17,10 @@ file:write("redistribute ip " .. site.prefix6() .. " eq 128 allow\n") file:write("redistribute ip " .. site.node_client_prefix6() .. " eq 128 allow\n") file:write("redistribute ip " .. site.node_prefix6() .. " eq 128 allow\n") file:write("redistribute ip 2000::/3 allow\n") + +if site.clat_range() ~= nil and site.clat_range() ~= '' then + file:write("redistribute ip " .. site.clat_range() .. " eq 96 allow\n") +end file:write("redistribute local if br-wan deny\n") file:write("redistribute local ip 0.0.0.0/0 deny\n") file:write("install pref-src " .. nodeip .."\n")