From 6dbf7cc73cd8d11c0d2544dab802cd740a76ac04 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 26 Mar 2021 19:32:00 +0100 Subject: [PATCH 1/5] Fix --- .../luasrc/view/openmptcprouter/wanstatus.htm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm index 0502faea3..cf6e3b7ab 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm @@ -428,7 +428,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm var whois = mArray.wans[i].whois; var whois6 = mArray.wans[i].whois6; var signal = mArray.wans[i].signal; - var status = mArray.wans[i].status; + var istatus = mArray.wans[i].status; var multipath = mArray.wans[i].multipath; if(multipath == 'master') { @@ -570,12 +570,12 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm { statusMessage += '<%:No Server http response after 1 second%>' + '
'; } - if (status == 'ERROR' && ipaddr != '' && ipaddr == mArray.wans[i].gateway) + if (istatus == 'ERROR' && ipaddr != '' && ipaddr == mArray.wans[i].gateway) { statusMessage += '<%:Wan IP and gateway are identical%>' + '
'; statusMessageClass = "error"; } - if (status == 'ERROR' && ip6addr != '' && ip6addr == mArray.wans[i].gateway6) + if (istatus == 'ERROR' && ip6addr != '' && ip6addr == mArray.wans[i].gateway6) { statusMessage += '<%:Wan IP and gateway are identical%>' + '
'; statusMessageClass = "error"; From 7e07f6396719d1d9393b33eda4725530b1dee66d Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 26 Mar 2021 20:10:49 +0100 Subject: [PATCH 2/5] Add option to restart interface if down --- .../luasrc/model/cbi/omr-tracker.lua | 14 ++++++++++++++ .../usr/share/omr/post-tracking.d/post-tracking | 8 ++++++++ omr-tracker/files/etc/config/omr-tracker | 1 + 3 files changed, 23 insertions(+) diff --git a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua index 9915e8516..bd83a2035 100644 --- a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua +++ b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua @@ -134,6 +134,13 @@ o.default = false o.disabled = 0 o.enabled = 1 +o = s:option(Flag, "restart_down", translate("Restart if down"), translate("Restart interface if detected as down")) +o.optional = false +o.rmempty = false +o.default = false +o.disabled = 0 +o.enabled = 1 + o = s:option(DynamicList, "hosts", translate("Hosts"), translate("Must be IPs and not domains")) o.placeholder = "4.2.2.1" o.default = { "4.2.2.1", "8.8.8.8" } @@ -202,6 +209,13 @@ o.default = false o.disabled = 0 o.enabled = 1 +o = s:option(Flag, "restart_down", translate("Restart if down"), translate("Restart interface if detected as down")) +o.optional = false +o.rmempty = false +o.default = false +o.disabled = 0 +o.enabled = 1 + o = s:option(DynamicList, "hosts", translate("Hosts"), translate("Must be IPs and not domains")) o.placeholder = "4.2.2.1" o.default = { "4.2.2.1", "8.8.8.8" } 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 6f95daece..0e3770797 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking +++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking @@ -678,6 +678,14 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then script_alert_down="$(uci -q get omr-tracker.$OMR_TRACKER_INTERFACE.script_alert_down)" [ -n "$script_alert_down" ] && eval $script_alert_down + restart_down="$(uci -q get omr-tracker.$OMR_TRACKER_INTERFACE.restart_down)" + [ -z "$restart_down" ] && restart_down="$(uci -q get omr-tracker.defaults.restart_down)" + [ "$restart_down" = "1" ] && { + ifdown $OMR_TRACKER_INTERFACE 2>&1 >/dev/null + sleep 5 + ifup $OMR_TRACKER_INTERFACE 2>&1 >/dev/null + } + if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "omrvpn" ]; then if [ "$OMR_TRACKER_STATUS_MSG" = "" ]; then _log "$OMR_TRACKER_INTERFACE down" diff --git a/omr-tracker/files/etc/config/omr-tracker b/omr-tracker/files/etc/config/omr-tracker index a88fb6a7c..df54c8416 100644 --- a/omr-tracker/files/etc/config/omr-tracker +++ b/omr-tracker/files/etc/config/omr-tracker @@ -24,6 +24,7 @@ config defaults 'defaults' option type 'ping' option wait_test '0' option server_http_test '1' + option restart_down '0' option options '' config proxy 'proxy' From 0edd91895c5979e00fd9f1307d312f22459009ee Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sat, 27 Mar 2021 08:18:27 +0100 Subject: [PATCH 3/5] Add more log --- mptcp/files/usr/share/omr/post-tracking.d/post-tracking | 1 + 1 file changed, 1 insertion(+) 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 0e3770797..1314ef6a5 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking +++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking @@ -681,6 +681,7 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then restart_down="$(uci -q get omr-tracker.$OMR_TRACKER_INTERFACE.restart_down)" [ -z "$restart_down" ] && restart_down="$(uci -q get omr-tracker.defaults.restart_down)" [ "$restart_down" = "1" ] && { + _log "Restart $OMR_TRACKER_INTERFACE" ifdown $OMR_TRACKER_INTERFACE 2>&1 >/dev/null sleep 5 ifup $OMR_TRACKER_INTERFACE 2>&1 >/dev/null From e1532f48ac71d3713390cf1564242ef5e4e03ff3 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sat, 27 Mar 2021 08:18:43 +0100 Subject: [PATCH 4/5] Remove duplicate in package --- shadowsocks-v2ray-plugin/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/shadowsocks-v2ray-plugin/Makefile b/shadowsocks-v2ray-plugin/Makefile index 9c0e125fd..f9e700fe1 100644 --- a/shadowsocks-v2ray-plugin/Makefile +++ b/shadowsocks-v2ray-plugin/Makefile @@ -19,7 +19,6 @@ PKG_SOURCE_VERSION:=6c0c5fb15851e13b36fe2eeaaba97fd27c9d291b PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=golang/host GO_PKG:=github.com/shadowsocks/v2ray-plugin #GO_PKG_BUILD_PKG:=github.com/shadowsocks/v2ray-plugin From 07b11eaa7f6ebeaab3f1327b15aef46018c2d1ac Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sat, 27 Mar 2021 08:19:01 +0100 Subject: [PATCH 5/5] Sysctl option --- openmptcprouter/files/etc/sysctl.d/default.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/openmptcprouter/files/etc/sysctl.d/default.conf b/openmptcprouter/files/etc/sysctl.d/default.conf index 8169c9b26..7bb3693e5 100644 --- a/openmptcprouter/files/etc/sysctl.d/default.conf +++ b/openmptcprouter/files/etc/sysctl.d/default.conf @@ -1,2 +1,3 @@ net.netfilter.nf_conntrack_helper=1 net.ipv4.tcp_fack=1 +net.core.fb_tunnels_only_for_init_net=1