From 002387972493424341efdff24cf7eb5d77b20433 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 27 Aug 2022 07:50:12 +0200
Subject: [PATCH] Fix SIP ALG

---
 .../root/etc/init.d/openmptcprouter           | 20 +++++++++++++++++++
 .../files/etc/uci-defaults/1980-omr-firewall  |  7 ++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
index 9954d850a..8c75d0366 100755
--- a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
+++ b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter
@@ -181,6 +181,26 @@ start_service() {
 		rmmod fast_classifier 2>&1 >/dev/null
 	fi
 
+	if [ "$(uci -q get openmptcprouter.settings.sipalg)" = "0" ]; then
+		uci -q batch <<-EOF >/dev/null
+			set firewall.zone_lan.auto_helper='0'
+			set firewall.zone_wan.auto_helper='0'
+			set firewall.zone_vpn.auto_helper='0'
+			commit firewall
+		EOF
+		rmmod nf_nat_sip 2>&1 >/dev/null
+		rmmod nf_conntrack_sip 2>&1 >/dev/null
+	else
+		uci -q batch <<-EOF >/dev/null
+			set firewall.zone_lan.auto_helper='1'
+			set firewall.zone_wan.auto_helper='1'
+			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
+	fi
+
 	if [ "$(uci -q get rpcd.@rpcd[0].socket)" != "/var/run/ubus/ubus.sock" ]; then
 		uci -q batch <<-EOF >/dev/null
 			set rpcd.@rpcd[0].socket='/var/run/ubus/ubus.sock'
diff --git a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
index b4493bb18..c736e2b87 100755
--- a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
+++ b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
@@ -242,7 +242,12 @@ uci -q batch <<-EOF >/dev/null
 	set firewall.@include[0].reload='1'
 	commit firewall
 EOF
-if [ "$(uci -q get openmptcprouter.settings.sipalg)" != "1" ]; then
+if [ "$(uci -q get openmptcprouter.settings.sipalg)" = "" ]; then
+	uci -q batch <<-EOF >/dev/null
+		set openmptcprouter.settings.sipalg='1'
+	EOF
+fi
+if [ "$(uci -q get openmptcprouter.settings.sipalg)" = "0" ]; then
 	uci -q batch <<-EOF >/dev/null
 		set firewall.zone_lan.auto_helper='0'
 		set firewall.zone_wan.auto_helper='0'