From 962ecf814a564e606479c222a99c5cccf361dfae Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 22 Apr 2021 18:11:57 +0200 Subject: [PATCH 1/3] Fix Shadowsocks-libev default config --- shadowsocks-libev/files/shadowsocks-libev.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shadowsocks-libev/files/shadowsocks-libev.config b/shadowsocks-libev/files/shadowsocks-libev.config index 719a9cc85..9423ef9bc 100644 --- a/shadowsocks-libev/files/shadowsocks-libev.config +++ b/shadowsocks-libev/files/shadowsocks-libev.config @@ -28,7 +28,7 @@ config ss_redir hi2 config ss_rules 'ss_rules' option disabled 0 - option redir_tcp 'hi' + option redir_tcp 'hi1' option src_default 'forward' option dst_default 'forward' option local_default 'forward' From a7996a90efedc6587a873de568f6d59a10bceed9 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 22 Apr 2021 18:27:18 +0200 Subject: [PATCH 2/3] Fix ModemManager --- modemmanager/files/modemmanager.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modemmanager/files/modemmanager.common b/modemmanager/files/modemmanager.common index dee9d934a..f91e94af2 100644 --- a/modemmanager/files/modemmanager.common +++ b/modemmanager/files/modemmanager.common @@ -5,7 +5,7 @@ ################################################################################ # If there is no interface that use modemmanager, exit -[ -n "$(uci -q show network | grep modemmanager)" ] && exit +[ -z "$(uci -q show network | grep modemmanager)" ] && exit . /lib/functions.sh . /lib/netifd/netifd-proto.sh From 13115def43e9322cf97d0b2b420fdd4576bc42ec Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 22 Apr 2021 18:27:48 +0200 Subject: [PATCH 3/3] Remove bond0 in interface choice --- .../luasrc/view/openmptcprouter/wizard.htm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm index fb2a7d09b..7796370ed 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm @@ -459,7 +459,7 @@ <% iffind=0 for _, ifacea in ipairs(ifaces) do - if not (ifacea == "lo" or ifacea == "6in4-omr6in4" or ifacea == "mlvpn0" or ifacea:match("^ifb.*") or ifacea:match("^sit.*") or ifacea:match("^gre.*") or ifacea:match("^ip6.*") or ifacea:match("^teql.*") or ifacea:match("^erspan.*") or ifacea:match("^tun.*")) and device_notvirtual(ifacea) then + if not (ifacea == "lo" or ifacea == "6in4-omr6in4" or ifacea == "mlvpn0" or ifacea:match("^ifb.*") or ifacea:match("^sit.*") or ifacea:match("^gre.*") or ifacea:match("^ip6.*") or ifacea:match("^teql.*") or ifacea:match("^erspan.*") or ifacea:match("^tun.*") or ifacea:match("^bond.*")) and device_notvirtual(ifacea) then if uci:get("network",ifname,"proto") ~= "macvlan" then %> @@ -564,7 +564,7 @@