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

Fix for shadowsocks simple-obs

This commit is contained in:
Ycarus 2018-02-16 20:18:00 +01:00
parent bd4ac15126
commit 16bcda0723
2 changed files with 7 additions and 1 deletions

View file

@ -15,7 +15,7 @@ include $(TOPDIR)/rules.mk
# #
PKG_NAME:=shadowsocks-libev PKG_NAME:=shadowsocks-libev
PKG_VERSION:=3.1.2 PKG_VERSION:=3.1.2
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION)

View file

@ -81,6 +81,8 @@ ss_mkjson_ss_local_conf() {
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"
[ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri" [ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri"
[ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open"
[ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp"
cat <<-EOF cat <<-EOF
${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},} ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},}
EOF EOF
@ -93,6 +95,8 @@ ss_mkjson_ss_redir_conf() {
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"
[ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri" [ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri"
[ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open"
[ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp"
cat <<-EOF cat <<-EOF
"disable_sni": $disable_sni, "disable_sni": $disable_sni,
${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},} ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},}
@ -103,6 +107,8 @@ ss_mkjson_ss_server_conf() {
ss_mkjson_server_conf_ ss_mkjson_server_conf_
[ "$obfs" = 0 ] && obfs=false || obfs=true [ "$obfs" = 0 ] && obfs=false || obfs=true
obfs_options="--obfs $obfs_type" obfs_options="--obfs $obfs_type"
[ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open"
[ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp"
cat <<-EOF cat <<-EOF
${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-server $obfs_options${q},} ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-server $obfs_options${q},}
EOF EOF