diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index ce5edb130..00c421517 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -1233,16 +1233,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") diff --git a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter index 8c75d0366..6a667e263 100755 --- a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter +++ b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter @@ -197,8 +197,8 @@ start_service() { set firewall.zone_vpn.auto_helper='1' commit firewall EOF - modprobe nf_conntrack_sip 2>&1 >/dev/null - modprobe nf_nat_sip 2>&1 >/dev/null + modprobe -q nf_conntrack_sip 2>&1 >/dev/null + modprobe -q nf_nat_sip 2>&1 >/dev/null fi if [ "$(uci -q get rpcd.@rpcd[0].socket)" != "/var/run/ubus/ubus.sock" ]; then diff --git a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall index c736e2b87..afde68d82 100755 --- a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall +++ b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall @@ -245,6 +245,7 @@ EOF if [ "$(uci -q get openmptcprouter.settings.sipalg)" = "" ]; then uci -q batch <<-EOF >/dev/null set openmptcprouter.settings.sipalg='1' + commit openmptcprouter EOF fi if [ "$(uci -q get openmptcprouter.settings.sipalg)" = "0" ]; then