mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Fix shadowsocks init

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-06-18 21:30:41 +02:00
parent 9f000c1671
commit d2908c414c
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
shadowsocks-libev/files/shadowsocks-libev.init
View file

@ -29,11 +29,14 @@ ss_mkjson_server_conf_() {
[ -z "$server" ] || json_add_string server "$server" [ -z "$server" ] || json_add_string server "$server"
json_add_int server_port "$server_port" json_add_int server_port "$server_port"
[ -z "$method" ] || json_add_string method "$method" [ -z "$method" ] || json_add_string method "$method"
[ -z "$key" ] || json_add_string key "$key" [ -z "$key" ] || {
key="$(echo $key | sed 's/+/-/g; s/\//_/g;')"
json_add_string key "$key"
}
[ -z "$password" ] || json_add_string password "$password" [ -z "$password" ] || json_add_string password "$password"
[ -z "$plugin" ] || json_add_string plugin "$plugin" [ -z "$plugin" ] || json_add_string plugin "$plugin"
[ -z "$plugin_opts" ] || json_add_string plugin_opts "$plugin_opts" [ -z "$plugin_opts" ] || json_add_string plugin_opts "$plugin_opts"
if [ "$obfs" = 1; then if [ "$obfs" = 1 ]; then
if [ "$obfs_plugin" = "obfs" ]; then if [ "$obfs_plugin" = "obfs" ]; then
obfs_options="obfs=$obfs_type" obfs_options="obfs=$obfs_type"
[ -z "$obfs_host" ] || obfs_options="$obfs_options;obfs-host=$obfs_host" [ -z "$obfs_host" ] || obfs_options="$obfs_options;obfs-host=$obfs_host"
@ -220,7 +223,6 @@ rules_up() {
config_foreach ss_rules_restart "$cfgtype" "$cfgtype" config_foreach ss_rules_restart "$cfgtype" "$cfgtype"
done done
ss_rules ss_rules
[ "$(uci -q get openmptcprouter.settings.disable_ipv6)" = "1" ] || ss_rules6
[ -f /etc/init.d/omr-bypass ] && { [ -f /etc/init.d/omr-bypass ] && {
logger -t "Shadowsocks" "Reload omr-bypass rules" logger -t "Shadowsocks" "Reload omr-bypass rules"
/etc/init.d/omr-bypass reload /etc/init.d/omr-bypass reload
@ -231,9 +233,10 @@ rules_down() {
rules_exist || return 0 rules_exist || return 0
logger -t "Shadowsocks" "Rules DOWN" logger -t "Shadowsocks" "Rules DOWN"
local bin="$ss_bindir/ss-rules" local bin="$ss_bindir/ss-rules"
[ -x "$bin" ] && "$bin" -f >/dev/null 2>&1 [ -x "$bin" ] && {
local bin6="$ss_bindir/ss-rules6" "$bin" -f >/dev/null 2>&1
[ -x "$bin6" ] && "$bin6" -f >/dev/null 2>&1 "$bin" -6 -f >/dev/null 2>&1
}
} }
service_triggers() { service_triggers() {
@ -267,7 +270,7 @@ validate_common_server_options_() {
local cfgtype="$1"; shift local cfgtype="$1"; shift
local cfg="$1"; shift local cfg="$1"; shift
local func="$1"; shift local func="$1"; shift
local stream_methods='"table", "rc4", "rc4-md5", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "bf-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "salsa20", "chacha20", "chacha20-ietf"' local stream_methods='"none", "table", "rc4", "rc4-md5", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "bf-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "salsa20", "chacha20", "chacha20-ietf"'
local aead_methods='"aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305"' local aead_methods='"aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305"'
"${func:-ss_validate}" "$cfgtype" "$cfg" "$@" \ "${func:-ss_validate}" "$cfgtype" "$cfg" "$@" \