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

Squashed commit of the following:

commit 54cf729555
Merge: d45321af 218fb8a6
Author: suyuan <175338101@qq.com>
Date:   Tue Sep 13 14:02:03 2022 +0800

    Merge pull request #273 from Ysurac/develop

    sync

commit 218fb8a6e5
Author: Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
Date:   Mon Sep 12 19:55:17 2022 +0200

    Various small fixes

commit 70571e546b
Author: Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
Date:   Tue Aug 30 21:02:19 2022 +0200

    add a sleep between rmmod for sip alg

commit d7c59fffae
Author: Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
Date:   Tue Aug 30 21:01:54 2022 +0200

    Fix release on upgrade, header and status page

commit 58c4f6cb28
Author: Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
Date:   Mon Aug 29 20:08:59 2022 +0200

    Small SIP ALG fixes

commit 0023879724
Author: Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
Date:   Sat Aug 27 07:50:12 2022 +0200

    Fix SIP ALG
This commit is contained in:
suyuan 2022-09-13 14:02:43 +08:00
parent 7db05f73b1
commit d52a27df67
7 changed files with 41 additions and 16 deletions

View file

@ -634,6 +634,8 @@ function wizard_add()
ucic:set("unbound","ub_main","dns64","0")
end
ucic:save("unbound")
ucic:commit("unbound")
-- Get Proxy set by default
local default_proxy = luci.http.formvalue("default_proxy") or "shadowsocks"
@ -981,7 +983,7 @@ function wizard_add()
ucic:set("openvpn","omr","enabled",1)
ucic:set("network","omrvpn","proto","none")
else
ucic:set("openvpn","omr","enabled",0)
ucic:delete("openvpn","omr","enabled")
end
ucic:save("openvpn")
ucic:commit("openvpn")
@ -1156,7 +1158,7 @@ function settings_add()
ucic:set("openmptcprouter","settings","shadowsocksudp",shadowsocksudp)
-- Enable/disable v2ray udp
local shadowsocksudp = luci.http.formvalue("v2rayudp") or "1"
local v2rayudp = luci.http.formvalue("v2rayudp") or "1"
ucic:set("v2ray","main_transparent_proxy","redirect_udp",v2rayudp)
-- Enable/disable nDPI
@ -1233,16 +1235,6 @@ function settings_add()
-- Enable/disable SIP ALG
local sipalg = luci.http.formvalue("sipalg") or "0"
ucic:set("openmptcprouter","settings","sipalg",sipalg)
ucic:foreach("firewall", "zone", function (section)
ucic:set("firewall",section[".name"],"auto_helper",sipalg)
end)
if sipalg == "1" then
luci.sys.call("modprobe -q nf_conntrack_sip >/dev/null 2>/dev/null")
luci.sys.call("modprobe -q nf_nat_sip >/dev/null 2>/dev/null")
else
luci.sys.call("rmmod nf_nat_sip >/dev/null 2>/dev/null")
luci.sys.call("rmmod nf_conntrack_sip >/dev/null 2>/dev/null")
end
ucic:save("openmptcprouter")
ucic:commit("openmptcprouter")