nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-hoodselector: use VPN abstraction layer. the hoodselectore does

Browse Source 
not need to know about all individual VPN protocols.
This commit is contained in:
Jan-Tarek Butt 2018-08-24 14:43:25 +02:00
parent e40f8de09b
commit 459d1e03b4
2 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/gluon-hoodselector/luasrc/usr/lib/lua/hoodselector/util.lua
View File

@ -46,20 +46,6 @@ function M.getDefaultHood(jhood)
return nil return nil
end end
function M.fastd_installed()
if io.open("/usr/bin/fastd", 'r') ~= nil then
return true
end
return false
end
function M.tunneldigger_installed()
if io.open("/usr/bin/tunneldigger", 'r') ~= nil then
return true
end
return false
end
-- bool if direct VPN. The detection is realised by searching the fastd network interface inside the originator table -- bool if direct VPN. The detection is realised by searching the fastd network interface inside the originator table
function M.directVPN(vpnIfaceList) function M.directVPN(vpnIfaceList)
for _,vpnIface in ipairs(vpnIfaceList) do for _,vpnIface in ipairs(vpnIfaceList) do

34
package/gluon-hoodselector/luasrc/usr/sbin/hoodselector
View File

@ -3,8 +3,8 @@
local bit = require('bit') local bit = require('bit')
local unistd = require('posix.unistd') local unistd = require('posix.unistd')
local fcntl = require('posix.fcntl') local fcntl = require('posix.fcntl')
local uci = require('simple-uci').cursor() local vpn_util = require('gluon.vpn-util')
local hoodutil = require("hoodselector.util") local hoodutil = require('hoodselector.util')
-- PID file to ensure the hoodselector isn't running parallel -- PID file to ensure the hoodselector isn't running parallel
local lockfile = '/var/lock/hoodselector.lock' local lockfile = '/var/lock/hoodselector.lock'
@ -30,41 +30,13 @@ if not ok then
os.exit(1) os.exit(1)
end end
-- initialisation done
--
local function get_mesh_vpn_interface()
local ret = {}
if hoodutil.fastd_installed() then
local vpnifac = uci:get('fastd', 'mesh_vpn_backbone', 'net')
if vpnifac ~= nil then
vpnifac = vpnifac:gsub("%_",'-')
table.insert(ret,vpnifac)
else
hoodutil.log("fastd uci config broken! abort...")
os.exit(1)
end
end
if hoodutil.tunneldigger_installed() then
local vpnifac = uci:get('tunneldigger', 'mesh_vpn', 'interface')
if vpnifac ~= nil then
table.insert(ret,vpnifac)
else
hoodutil.log("tunneldigger uci config broken! abort...")
os.exit(1)
end
end
return ret
end
-- INITIALISE AND PREPARE DATA --
-- VPN MODE -- VPN MODE
-- If we have a VPN connection we will try to get the node's location and -- If we have a VPN connection we will try to get the node's location and
-- select the hood coresponding to this location. -- select the hood coresponding to this location.
-- If no hood for the location has been defined, we will select -- If no hood for the location has been defined, we will select
-- the default hood. -- the default hood.
-- If we can't determine the node's location, we will continue to the next mode. -- If we can't determine the node's location, we will continue to the next mode.
if hoodutil.directVPN(get_mesh_vpn_interface()) then if hoodutil.directVPN(vpn_util.get_mesh_vpn_interface()) then
io.stdout:write('VPN connection found.\n') io.stdout:write('VPN connection found.\n')
local geo = hoodutil.getGeolocation() local geo = hoodutil.getGeolocation()
if geo.lat ~= nil and geo.lon ~= nil then if geo.lat ~= nil and geo.lon ~= nil then