|
@@ -1,16 +1,20 @@
|
|
#!/usr/bin/lua
|
|
#!/usr/bin/lua
|
|
|
|
|
|
|
|
+local client_bridge = require 'gluon.client_bridge'
|
|
local site = require 'gluon.site_config'
|
|
local site = require 'gluon.site_config'
|
|
local sysconfig = require 'gluon.sysconfig'
|
|
local sysconfig = require 'gluon.sysconfig'
|
|
|
|
|
|
local uci = require('simple-uci').cursor()
|
|
local uci = require('simple-uci').cursor()
|
|
|
|
|
|
|
|
|
|
|
|
+local next_node = site.next_node or {}
|
|
|
|
+
|
|
|
|
+
|
|
uci:delete('network', 'local_node_dev')
|
|
uci:delete('network', 'local_node_dev')
|
|
uci:section('network', 'device', 'local_node_dev', {
|
|
uci:section('network', 'device', 'local_node_dev', {
|
|
type = 'veth',
|
|
type = 'veth',
|
|
name = 'local-node',
|
|
name = 'local-node',
|
|
- macaddr = site.next_node.mac,
|
|
|
|
|
|
+ macaddr = client_bridge.next_node_macaddr(),
|
|
peer_name = 'local-port',
|
|
peer_name = 'local-port',
|
|
peer_macaddr = sysconfig.primary_mac,
|
|
peer_macaddr = sysconfig.primary_mac,
|
|
})
|
|
})
|
|
@@ -18,13 +22,13 @@ uci:section('network', 'device', 'local_node_dev', {
|
|
|
|
|
|
local ip4, ip6
|
|
local ip4, ip6
|
|
|
|
|
|
-if site.next_node.ip4 then
|
|
|
|
|
|
+if next_node.ip4 then
|
|
local plen = site.prefix4:match('/%d+$')
|
|
local plen = site.prefix4:match('/%d+$')
|
|
- ip4 = site.next_node.ip4 .. plen
|
|
|
|
|
|
+ ip4 = next_node.ip4 .. plen
|
|
end
|
|
end
|
|
|
|
|
|
-if site.next_node.ip6 then
|
|
|
|
- ip6 = site.next_node.ip6 .. '/128'
|
|
|
|
|
|
+if next_node.ip6 then
|
|
|
|
+ ip6 = next_node.ip6 .. '/128'
|
|
end
|
|
end
|
|
|
|
|
|
uci:delete('network', 'local_node')
|
|
uci:delete('network', 'local_node')
|