From b9d286ce9468b6331c00bce3e416ac017147e269 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 26 Mar 2021 17:22:34 +0100
Subject: [PATCH] Add more log

---
 .../usr/share/omr/post-tracking.d/post-tracking     |  1 +
 .../files/etc/init.d/openmptcprouter-vps            | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
index 7d6c2315a..6f95daece 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -1344,6 +1344,7 @@ if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter
 fi
 
 if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then
+	_log "Set firewall on server"
 	/etc/init.d/openmptcprouter-vps set_vps_firewall >/dev/null 2>&1
 
 	run_fw_include() {
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 8e057ab96..a39ad887b 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -1768,7 +1768,10 @@ _config_service() {
 				EOF
 				config_foreach _set_ss_server server "method" "aes-256-gcm"
 				uci -q commit shadowsocks-libev
-				[ "$method" != "aes-256-gcm" ] && /etc/init.d/shadowsocks-libev restart
+				[ "$method" != "aes-256-gcm" ] && {
+					logger -t "OMR-VPS" "Shadowsocks restart"
+					/etc/init.d/shadowsocks-libev restart
+				}
 			fi
 		}
 	fi
@@ -1807,12 +1810,13 @@ _config_service() {
 	if [ "$(uci -q get openmptcprouter.settings.vpn)" != "openvpn" ] && [ "$(echo "$vps_config" | jsonfilter -q -e '@.client2client.enabled')" == "true" ]; then
 		_set_client2client
 	fi
-	[ "$error" = 0 ] && {
+	if [ "$error" = 0 ]; then
 		#logger -t "OMR-VPS" "No errors"
 		uci -q set openmptcprouter.${servername}.lastchange=$(date "+%s")
 		[ -n "$vps_config" ] && uci -q set openmptcprouter.settings.firstboot=0
-
-	}
+	else
+		logger -t "OMR-VPS" "Setting server config error, try again"
+	fi
 	#[ "$error" != 0 ] && logger -t "OMR-VPS" "Error !"
 	uci -q batch <<-EOF >/dev/null
 		set openmptcprouter.${servername}.admin_error=$error
@@ -1866,5 +1870,6 @@ start_service() {
 service_triggers() {
 	procd_add_reload_trigger openmptcprouter network shadowsocks-libev v2ray glorytun glorytun-udp mlspn openvpn dsvpn
 	procd_add_config_trigger "config.change" "firewall" /etc/init.d/openmptcprouter-vps set_vps_firewall
+	#procd_add_config_trigger "config.change" "network" /etc/init.d/openmptcprouter-vps set_gre_tunnel
 	#procd_add_reload_trigger openmptcprouter shadowsocks-libev network upnpd
 }
\ No newline at end of file