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 OBFS enabled/disabled

Browse source
This commit is contained in:
Ycarus 2019-02-19 19:46:08 +01:00
parent 7ed4367cf5
commit 3f5b2a44d8
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,10 +87,12 @@ function wizard_add()
end end
local ointf = interface_from_device(defif) or "" local ointf = interface_from_device(defif) or ""
local wanif = defif
if ointf ~= "" then if ointf ~= "" then
if ucic:get("network",ointf,"type") == "" then if ucic:get("network",ointf,"type") == "" then
ucic:set("network",ointf,"type","macvlan") ucic:set("network",ointf,"type","macvlan")
end end
wanif = "wan" .. i
end end
ucic:set("network","wan" .. i,"interface") ucic:set("network","wan" .. i,"interface")
@ -119,7 +121,7 @@ function wizard_add()
ucic:commit("qos") ucic:commit("qos")
ucic:set("sqm","wan" .. i,"queue") ucic:set("sqm","wan" .. i,"queue")
ucic:set("sqm","wan" .. i,"interface",defif) ucic:set("sqm","wan" .. i,"interface",wanif)
ucic:set("sqm","wan" .. i,"qdisc","fq_codel") ucic:set("sqm","wan" .. i,"qdisc","fq_codel")
ucic:set("sqm","wan" .. i,"script","simple.qos") ucic:set("sqm","wan" .. i,"script","simple.qos")
ucic:set("sqm","wan" .. i,"qdisc_advanced","0") ucic:set("sqm","wan" .. i,"qdisc_advanced","0")
@ -132,7 +134,7 @@ function wizard_add()
ucic:save("sqm") ucic:save("sqm")
ucic:commit("sqm") ucic:commit("sqm")
luci.sys.call("uci -q add_list vnstat.@vnstat[-1].interface=" .. defif) luci.sys.call("uci -q add_list vnstat.@vnstat[-1].interface=" .. wanif)
luci.sys.call("uci -q commit vnstat") luci.sys.call("uci -q commit vnstat")
-- Dirty way to add new interface to firewall... -- Dirty way to add new interface to firewall...
@ -511,7 +513,7 @@ function settings_add()
set_ipv6_state(disable_ipv6) set_ipv6_state(disable_ipv6)
-- Enable/disable obfs -- Enable/disable obfs
local obfs = luci.http.formvalue("obfs") or 0 local obfs = luci.http.formvalue("obfs") or "0"
local obfs_plugin = luci.http.formvalue("obfs_plugin") or "v2ray" local obfs_plugin = luci.http.formvalue("obfs_plugin") or "v2ray"
ucic:foreach("shadowsocks-libev", "ss_redir", function (section) ucic:foreach("shadowsocks-libev", "ss_redir", function (section)
ucic:set("shadowsocks-libev",section[".name"],"obfs",obfs) ucic:set("shadowsocks-libev",section[".name"],"obfs",obfs)
@ -754,6 +756,7 @@ function interfaces_status()
mArray.openmptcprouter["vps_uptime"] = vpsinfo.vps.uptime or "" mArray.openmptcprouter["vps_uptime"] = vpsinfo.vps.uptime or ""
mArray.openmptcprouter["vps_mptcp"] = vpsinfo.vps.mptcp or "" mArray.openmptcprouter["vps_mptcp"] = vpsinfo.vps.mptcp or ""
mArray.openmptcprouter["vps_admin"] = true mArray.openmptcprouter["vps_admin"] = true
mArray.openmptcprouter["vps_mptcp"] = vpsinfo.mptcp.enabled or ""
mArray.openmptcprouter["vps_status"] = "UP" mArray.openmptcprouter["vps_status"] = "UP"
else else
uci:set("openmptcprouter",s[".name"],"admin_error","1") uci:set("openmptcprouter",s[".name"],"admin_error","1")