Skip to content
Snippets Groups Projects
Unverified Commit b520bf5c authored by lemoer's avatar lemoer Committed by Matthias Schiffer
Browse files

gluon-core: rename site_seed to domain_seed

[Matthias Schiffer: rebase]
parent 1dd9845d
No related branches found
No related tags found
No related merge requests found
......@@ -18,7 +18,7 @@
-- 32 bytes of random data, encoded in hexadecimal
-- Must be the same for all nodes in one mesh domain
-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
site_seed = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
domain_seed = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
-- Prefixes used within the mesh.
-- prefix6 is required, prefix4 can be omitted if next_node.ip4
......
......@@ -21,7 +21,7 @@ site_code
The code of your community. It is good practice to use the TLD of
your community here.
site_seed
domain_seed
32 bytes of random data, encoded in hexadecimal, used to seed other random
values specific to the mesh domain. It must be the same for all nodes of one
mesh, but should be different for firmwares that are not supposed to mesh with
......
need_string 'site_code'
need_string 'site_name'
need_string_match('site_seed', '^' .. ('%x'):rep(64) .. '$')
need_string_match('domain_seed', '^' .. ('%x'):rep(64) .. '$')
if need_table('opkg', nil, false) then
need_string('opkg.lede', false)
......
......@@ -44,7 +44,7 @@ proto_gluon_wired_setup() {
json_add_string tunlink "$config"
json_add_string ip6addr "$(interface_linklocal "$ifname")"
json_add_string peer6addr 'ff02::15c'
json_add_int vid "$(lua -lgluon.util -e 'print(tonumber(gluon.util.site_seed_bytes("gluon-mesh-vxlan", 3), 16))')"
json_add_int vid "$(lua -lgluon.util -e 'print(tonumber(gluon.util.domain_seed_bytes("gluon-mesh-vxlan", 3), 16))')"
json_close_object
ubus call network add_dynamic "$(json_dump)"
fi
......
......@@ -122,7 +122,7 @@ function node_id()
return string.gsub(sysconfig.primary_mac, ':', '')
end
function site_seed_bytes(key, length)
function domain_seed_bytes(key, length)
local ret = ''
local v = ''
local i = 0
......@@ -131,7 +131,7 @@ function site_seed_bytes(key, length)
-- cryptographic strength
while ret:len() < 2*length do
i = i + 1
v = hash.md5(v .. key .. site.site_seed():lower() .. i)
v = hash.md5(v .. key .. site.domain_seed():lower() .. i)
ret = ret .. v
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment