mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Fix MLVPN wizard support

Browse source
This commit is contained in:
Ycarus 2018-06-07 17:10:52 +02:00
parent 63b6036ad6
commit 924584c751
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -55,6 +55,19 @@ function wizard_add()
end end
gostatus = false gostatus = false
end end
-- Set interfaces settings
local interfaces = luci.http.formvaluetable("intf")
for intf, _ in pairs(interfaces) do
local ipaddr = luci.http.formvalue("cbid.network.%s.ipaddr" % intf)
local netmask = luci.http.formvalue("cbid.network.%s.netmask" % intf)
local gateway = luci.http.formvalue("cbid.network.%s.gateway" % intf)
ucic:set("network",intf,"ipaddr",ipaddr)
ucic:set("network",intf,"netmask",netmask)
ucic:set("network",intf,"gateway",gateway)
end
ucic:save("network")
ucic:commit("network")
local server_ip = luci.http.formvalue("server_ip") local server_ip = luci.http.formvalue("server_ip")
@ -93,9 +106,9 @@ function wizard_add()
local mlvpn_password = luci.http.formvalue("mlvpn_password") local mlvpn_password = luci.http.formvalue("mlvpn_password")
if mlvpn_password ~= "" then if mlvpn_password ~= "" then
if glorytun_key ~= "" then if glorytun_key ~= "" then
ucic:set("mlvpn","general","enable",1)
else
ucic:set("mlvpn","general","enable",0) ucic:set("mlvpn","general","enable",0)
else
ucic:set("mlvpn","general","enable",1)
end end
ucic:set("mlvpn","general","password",mlvpn_password) ucic:set("mlvpn","general","password",mlvpn_password)
ucic:set("mlvpn","general","firstport","65201") ucic:set("mlvpn","general","firstport","65201")
@ -104,20 +117,9 @@ function wizard_add()
ucic:commit("mlvpn") ucic:commit("mlvpn")
end end
-- Set interfaces settings
local interfaces = luci.http.formvaluetable("intf")
for intf, _ in pairs(interfaces) do
local ipaddr = luci.http.formvalue("cbid.network.%s.ipaddr" % intf)
local netmask = luci.http.formvalue("cbid.network.%s.netmask" % intf)
local gateway = luci.http.formvalue("cbid.network.%s.gateway" % intf)
ucic:set("network",intf,"ipaddr",ipaddr)
ucic:set("network",intf,"netmask",netmask)
ucic:set("network",intf,"gateway",gateway)
end
ucic:save("network")
ucic:commit("network")
luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null") luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/glorytun restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/glorytun restart >/dev/null 2>/dev/null")
luci.sys.call("/etc/init.d/mlvpn restart >/dev/null 2>/dev/null")
if gostatus == true then if gostatus == true then
luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/status")) luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/status"))
else else