From f78c78c9053e4134f42f3424dd506dcc0f3ff4bd Mon Sep 17 00:00:00 2001 From: Ycarus Date: Fri, 9 Mar 2018 22:52:03 +0100 Subject: [PATCH] Fix --- .../files/shadowsocks-libev.init | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init index 26fc661ea..361efe258 100644 --- a/shadowsocks-libev/files/shadowsocks-libev.init +++ b/shadowsocks-libev/files/shadowsocks-libev.init @@ -193,7 +193,7 @@ ss_rules() { local cfgtype local local_port_tcp local_port_udp local args - local ss_redir_servers4 src_default4 dst_default4 local_default4 dst_ips_bypass4 dst_ips_forward4 src_ips_bypass4 src_ips_forward4 src_ips_checkdst4 + local ss_redir_servers4 dst_ips_bypass4 dst_ips_forward4 src_ips_bypass4 src_ips_forward4 src_ips_checkdst4 [ -x "$bin" ] || return 1 config_get cfgtype "$cfg" TYPE @@ -210,9 +210,6 @@ ss_rules() { [ "$dst_forward_recentrst" = 0 ] || args="$args --dst-forward-recentrst" - src_default4="$(echo "$src_default" | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | sort -u)" - dst_default4="$(echo "$dst_default" | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | sort -u)" - local_default4="$(echo "$local_default" | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | sort -u)" dst_ips_bypass4="$(echo "$dst_ips_bypass" | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | sort -u)" dst_ips_forward4="$(echo "$dst_ips_forward" | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | sort -u)" src_ips_bypass4="$(echo "$src_ips_bypass" | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | sort -u)" @@ -223,9 +220,9 @@ ss_rules() { -s "$ss_redir_servers4" \ -l "$local_port_tcp" \ -L "$local_port_udp" \ - --src-default "$src_default4" \ - --dst-default "$dst_default4" \ - --local-default "$local_default4" \ + --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" \ @@ -245,7 +242,7 @@ ss_rules6() { local cfgtype local local_port_tcp local_port_udp local args - local ss_redir_servers6 src_default6 dst_default6 local_default6 dst_ips_bypass6 dst_ips_forward6 src_ips_bypass6 src_ips_forward6 src_ips_checkdst6 + local ss_redir_servers6 dst_ips_bypass6 dst_ips_forward6 src_ips_bypass6 src_ips_forward6 src_ips_checkdst6 [ -x "$bin" ] || return 1 config_get cfgtype "$cfg" TYPE @@ -262,9 +259,6 @@ ss_rules6() { [ "$dst_forward_recentrst" = 0 ] || args="$args --dst-forward-recentrst" - src_default6="$(echo "$src_default" | grep -o '\([0-9a-fA-F]\{0,4\}:\)\{1,7\}[0-9a-fA-F]\{0,4\}' | sort -u)" - dst_default6="$(echo "$dst_default" | grep -o '\([0-9a-fA-F]\{0,4\}:\)\{1,7\}[0-9a-fA-F]\{0,4\}' | sort -u)" - local_default6="$(echo "$local_default" | grep -o '\([0-9a-fA-F]\{0,4\}:\)\{1,7\}[0-9a-fA-F]\{0,4\}' | sort -u)" dst_ips_bypass6="$(echo "$dst_ips_bypass" | grep -o '\([0-9a-fA-F]\{0,4\}:\)\{1,7\}[0-9a-fA-F]\{0,4\}' | sort -u)" dst_ips_forward6="$(echo "$dst_ips_forward" | grep -o '\([0-9a-fA-F]\{0,4\}:\)\{1,7\}[0-9a-fA-F]\{0,4\}' | sort -u)" src_ips_bypass6="$(echo "$src_ips_bypass" | grep -o '\([0-9a-fA-F]\{0,4\}:\)\{1,7\}[0-9a-fA-F]\{0,4\}' | sort -u)" @@ -275,9 +269,9 @@ ss_rules6() { -s "$ss_redir_servers6" \ -l "$local_port_tcp" \ -L "$local_port_udp" \ - --src-default "$src_default6" \ - --dst-default "$dst_default6" \ - --local-default "$local_default6" \ + --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" \