From 789ff4580e745cfdbab8f3c30b95b650bc79dbdc Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 24 Mar 2020 12:45:32 +0100 Subject: [PATCH 1/5] Fix shadowsocks init script --- shadowsocks-libev/files/shadowsocks-libev.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init index 7a8fa9efa..367b68615 100644 --- a/shadowsocks-libev/files/shadowsocks-libev.init +++ b/shadowsocks-libev/files/shadowsocks-libev.init @@ -185,9 +185,9 @@ ss_rules() { all_ss_redir_ports=$min_ss_redir_ports fi local_port_tcp="$all_ss_redir_ports" - eval local_port_udp="\$ss_rules_redir_udp_$redir_udp" + local_port_udp="$all_ss_redir_ports" local_port_tcp6="$all_ss_redir_ports" - eval local_port_udp6="\$ss_rules6_redir_udp_$redir_udp" + local_port_udp6="$all_ss_redir_ports" else eval local_port_tcp="\$ss_rules_redir_tcp_$redir_tcp" eval local_port_udp="\$ss_rules_redir_udp_$redir_udp" From 7409b1e13b67bb99994823eb865bc34d63465a37 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 24 Mar 2020 12:45:53 +0100 Subject: [PATCH 2/5] Fix OMR theme --- .../htdocs/luci-static/openmptcprouter/cascade.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/cascade.css b/luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/cascade.css index 546edbdf3..f185224cc 100644 --- a/luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/cascade.css +++ b/luci-theme-openmptcprouter/htdocs/luci-static/openmptcprouter/cascade.css @@ -141,7 +141,7 @@ body { .container { width: 100%; - max-width: 940px; + max-width: 1080px; margin-left: auto; margin-right: auto; zoom: 1; From 483b98fb24fdeb39c8628bfc83820b9288418cd0 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 24 Mar 2020 12:46:41 +0100 Subject: [PATCH 3/5] Fix little bug --- omr-tracker/files/bin/omr-tracker | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker index 306105b76..30a3e26d5 100755 --- a/omr-tracker/files/bin/omr-tracker +++ b/omr-tracker/files/bin/omr-tracker @@ -243,11 +243,11 @@ while true; do if [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "3g" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "qmi" ] || [ "$(uci -q get network.$OMR_TRACKER_INTERFACE.proto)" = "ncm" ]; then OMR_TRACKER_HOST=$(resolveip -4 $OMR_TRACKER_HOST | tr -d "\n") # Check if route is not used - while ! ip route add $OMR_TRACKER_HOST via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE src $OMR_TRACKER_DEVICE_IP > /dev/null 2&>1 + while ! ip route add $OMR_TRACKER_HOST via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE src $OMR_TRACKER_DEVICE_IP > /dev/null 2>&1 do logger -t "omr-tracker" "Can't create route to $OMR_TRACKER_HOST via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE src $OMR_TRACKER_DEVICE_IP. waiting..." sleep 2 - ip route del "$OMR_TRACKER_HOST" via "$OMR_TRACKER_DEVICE_GATEWAY" dev "$OMR_TRACKER_DEVICE" src "$OMR_TRACKER_DEVICE_IP" > /dev/null 2&>1 + ip route del "$OMR_TRACKER_HOST" via "$OMR_TRACKER_DEVICE_GATEWAY" dev "$OMR_TRACKER_DEVICE" src "$OMR_TRACKER_DEVICE_IP" > /dev/null 2>&1 _restart done fi @@ -261,7 +261,7 @@ while true; do _dns "$OMR_TRACKER_HOST" "$OMR_TRACKER_DEVICE_IP" "yes" statusb=$? fi - ip route del "$OMR_TRACKER_HOST" via "$OMR_TRACKER_DEVICE_GATEWAY" dev "$OMR_TRACKER_DEVICE" src "$OMR_TRACKER_DEVICE_IP" > /dev/null 2&>1 + ip route del "$OMR_TRACKER_HOST" via "$OMR_TRACKER_DEVICE_GATEWAY" dev "$OMR_TRACKER_DEVICE" src "$OMR_TRACKER_DEVICE_IP" > /dev/null 2>&1 if $(exit $statusb); then OMR_TRACKER_STATUS_MSG="" OMR_TRACKER_STATUS="OK" From 8fb774d517d34c2fb60d9cf3bdc0facbe9b0ff51 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 24 Mar 2020 19:39:36 +0100 Subject: [PATCH 4/5] Revert "Fix shadowsocks init script" This reverts commit 789ff4580e745cfdbab8f3c30b95b650bc79dbdc. --- shadowsocks-libev/files/shadowsocks-libev.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init index 367b68615..7a8fa9efa 100644 --- a/shadowsocks-libev/files/shadowsocks-libev.init +++ b/shadowsocks-libev/files/shadowsocks-libev.init @@ -185,9 +185,9 @@ ss_rules() { all_ss_redir_ports=$min_ss_redir_ports fi local_port_tcp="$all_ss_redir_ports" - local_port_udp="$all_ss_redir_ports" + eval local_port_udp="\$ss_rules_redir_udp_$redir_udp" local_port_tcp6="$all_ss_redir_ports" - local_port_udp6="$all_ss_redir_ports" + eval local_port_udp6="\$ss_rules6_redir_udp_$redir_udp" else eval local_port_tcp="\$ss_rules_redir_tcp_$redir_tcp" eval local_port_udp="\$ss_rules_redir_udp_$redir_udp" From d2b2adfefc790bbd4ece80a465bd5eaab609dd6f Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Tue, 24 Mar 2020 19:57:29 +0100 Subject: [PATCH 5/5] Fixes for shadowsocks rules --- .../files/shadowsocks-libev.init | 57 ++++++++++--------- shadowsocks-libev/files/ss-rules | 2 +- shadowsocks-libev/files/ss-rules6 | 2 +- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init index 7a8fa9efa..a40312443 100644 --- a/shadowsocks-libev/files/shadowsocks-libev.init +++ b/shadowsocks-libev/files/shadowsocks-libev.init @@ -185,8 +185,10 @@ ss_rules() { all_ss_redir_ports=$min_ss_redir_ports fi local_port_tcp="$all_ss_redir_ports" + #local_port_udp="$all_ss_redir_ports" eval local_port_udp="\$ss_rules_redir_udp_$redir_udp" local_port_tcp6="$all_ss_redir_ports" + #local_port_udp6="$all_ss_redir_ports" eval local_port_udp6="\$ss_rules6_redir_udp_$redir_udp" else eval local_port_tcp="\$ss_rules_redir_tcp_$redir_tcp" @@ -217,20 +219,20 @@ ss_rules() { ss_rules_call() { "$bin" "$@" \ -s "$ss_redir_servers4" \ - -l "$local_port_tcp" \ - -L "$local_port_udp" \ - --src-default "$src_default" \ - --dst-default "$dst_default" \ - --local-default "$local_default" \ - --dst-bypass-file "$dst_ips_bypass_file" \ - --dst-forward-file "$dst_ips_forward_file" \ - --dst-bypass "$dst_ips_bypass4" \ - --dst-forward "$dst_ips_forward4" \ - --src-bypass "$src_ips_bypass4" \ - --src-forward "$src_ips_forward4" \ - --src-checkdst "$src_ips_checkdst4" \ - --ifnames "$ifnames" \ - --ipt-extra "$ipt_args" \ + ${local_port_tcp:+-l "$local_port_tcp"} \ + ${local_port_udp:+-L "$local_port_udp"} \ + ${src_default:+--src-default "$src_default"} \ + ${dst_default:+--dst-default "$dst_default"} \ + ${local_default:+--local-default "$local_default"} \ + ${dst_ips_bypass_file:+--dst-bypass-file "$dst_ips_bypass_file"} \ + ${dst_ips_forward_file:+--dst-forward-file "$dst_ips_forward_file"} \ + ${dst_ips_bypass4:+--dst-bypass "$dst_ips_bypass4"} \ + ${dst_ips_forward4:+--dst-forward "$dst_ips_forward4"} \ + ${src_ips_bypass4:+--src-bypass "$src_ips_bypass4"} \ + ${src_ips_forward4:+--src-forward "$src_ips_forward4"} \ + ${src_ips_checkdst4:+--src-checkdst "$src_ips_checkdst4"} \ + ${ifnames:+--ifnames "$ifnames"} \ + ${ipt_args:+--ipt-extra "$ipt_args"} \ $args \ || "$bin" "$@" -f } @@ -238,20 +240,19 @@ ss_rules_call() { ss_rules_call6() { "$bin6" "$@" \ -s "$ss_redir_servers6" \ - -l "$local_port_tcp6" \ - -L "$local_port_udp6" \ - --src-default "$src_default" \ - --dst-default "$dst_default" \ - --local-default "$local_default" \ - --dst-bypass-file "$dst_ips_bypass_file" \ - --dst-forward-file "$dst_ips_forward_file" \ - --dst-bypass "$dst_ips_bypass6" \ - --dst-forward "$dst_ips_forward6" \ - --src-bypass "$src_ips_bypass6" \ - --src-forward "$src_ips_forward6" \ - --src-checkdst "$src_ips_checkdst6" \ - --ifnames "$ifnames" \ - --ipt-extra "$ipt_args" \ + ${local_port_tcp:+-l "$local_port_tcp6"} \ + ${local_port_udp:+-L "$local_port_udp6"} \ + ${src_default:+--src-default "$src_default" \ + ${dst_default:+--dst-default "$dst_default" \ + ${dst_ips_bypass_file:+--dst-bypass-file "$dst_ips_bypass_file"} \ + ${dst_ips_forward_file:+--dst-forward-file "$dst_ips_forward_file"} \ + ${dst_ips_bypass6:+--dst-bypass "$dst_ips_bypass6"} \ + ${dst_ips_forward6:+--dst-forward "$dst_ips_forward6"} \ + ${src_ips_bypass6:+--src-bypass "$src_ips_bypass6"} \ + ${src_ips_forward6:+--src-forward "$src_ips_forward6"} \ + ${src_ips_checkdst6:+--src-checkdst "$src_ips_checkdst6"} \ + ${ifnames:+--ifnames "$ifnames"} \ + ${ipt_args:+--ipt-extra "$ipt_args"} \ $args \ || "$bin6" "$@" -f } diff --git a/shadowsocks-libev/files/ss-rules b/shadowsocks-libev/files/ss-rules index b50eaeacd..5146316d9 100755 --- a/shadowsocks-libev/files/ss-rules +++ b/shadowsocks-libev/files/ss-rules @@ -123,7 +123,7 @@ ss_rules_flush() { iptables-save --counters | grep -v ss_rules_ | iptables-restore -w --counters while ip rule del fwmark 1 lookup 100 2>/dev/null; do true; done - ip route flush table 100 + ip route flush table 100 || true for setname in $(ipset -n list | grep "ss_rules_"); do ipset destroy "$setname" 2>/dev/null || true done diff --git a/shadowsocks-libev/files/ss-rules6 b/shadowsocks-libev/files/ss-rules6 index 3c78e9a73..796e3178e 100755 --- a/shadowsocks-libev/files/ss-rules6 +++ b/shadowsocks-libev/files/ss-rules6 @@ -105,7 +105,7 @@ ss_rules6_flush() { ip6tables-save --counters | grep -v ss_rules6_ | ip6tables-restore -w --counters while ip -f inet6 rule del fwmark 1 lookup 100 2>/dev/null; do true; done - ip -f inet6 route flush table 100 + ip -f inet6 route flush table 100 || true for setname in $(ipset -n list | grep "ss_rules6_"); do ipset destroy "$setname" 2>/dev/null || true done