From 5f8ba24fa76e583854626152fda26f4bafb2216d Mon Sep 17 00:00:00 2001 From: Jan-Tarek Butt Date: Fri, 24 Aug 2018 23:17:33 +0200 Subject: [PATCH] gluon-mesh-vpn-core: staticaly return 'mesh-vpn' and change lib name --- .../luasrc/usr/lib/lua/gluon/mesh-vpn.lua | 7 ++++++ .../luasrc/usr/lib/lua/gluon/vpn-util.lua | 24 ------------------- 2 files changed, 7 insertions(+), 24 deletions(-) create mode 100644 package/gluon-mesh-vpn-core/luasrc/usr/lib/lua/gluon/mesh-vpn.lua delete mode 100644 package/gluon-mesh-vpn-core/luasrc/usr/lib/lua/gluon/vpn-util.lua diff --git a/package/gluon-mesh-vpn-core/luasrc/usr/lib/lua/gluon/mesh-vpn.lua b/package/gluon-mesh-vpn-core/luasrc/usr/lib/lua/gluon/mesh-vpn.lua new file mode 100644 index 00000000..99d856c7 --- /dev/null +++ b/package/gluon-mesh-vpn-core/luasrc/usr/lib/lua/gluon/mesh-vpn.lua @@ -0,0 +1,7 @@ +local M = {} + +function M.get_mesh_vpn_interface() + return 'mesh-vpn' +end + +return M diff --git a/package/gluon-mesh-vpn-core/luasrc/usr/lib/lua/gluon/vpn-util.lua b/package/gluon-mesh-vpn-core/luasrc/usr/lib/lua/gluon/vpn-util.lua deleted file mode 100644 index 1a184e51..00000000 --- a/package/gluon-mesh-vpn-core/luasrc/usr/lib/lua/gluon/vpn-util.lua +++ /dev/null @@ -1,24 +0,0 @@ -local uci = require('simple-uci').cursor() -local unistd = require 'posix.unistd' - -local M = {} - -function M.get_mesh_vpn_interface() - local ret = {} - if unistd.access('/lib/gluon/mesh-vpn/fastd') then - local vpnifac = uci:get('fastd', 'mesh_vpn_backbone', 'net') - if vpnifac ~= nil then - vpnifac = vpnifac:gsub("%_",'-') - table.insert(ret,vpnifac) - end - end - if unistd.access('/lib/gluon/mesh-vpn/tunneldigger') then - local vpnifac = uci:get('tunneldigger', 'mesh_vpn', 'interface') - if vpnifac ~= nil then - table.insert(ret,vpnifac) - end - end - return ret -end - -return M