From 16bcda0723b232a0b9ca68ca6713e8d2d7b3ee20 Mon Sep 17 00:00:00 2001 From: Ycarus Date: Fri, 16 Feb 2018 20:18:00 +0100 Subject: [PATCH] Fix for shadowsocks simple-obs --- shadowsocks-libev/Makefile | 2 +- shadowsocks-libev/files/shadowsocks-libev.init | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/shadowsocks-libev/Makefile b/shadowsocks-libev/Makefile index 5ed57b95e..4a1192bac 100644 --- a/shadowsocks-libev/Makefile +++ b/shadowsocks-libev/Makefile @@ -15,7 +15,7 @@ include $(TOPDIR)/rules.mk # PKG_NAME:=shadowsocks-libev PKG_VERSION:=3.1.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION) diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init index 23402b288..d3f9b8909 100644 --- a/shadowsocks-libev/files/shadowsocks-libev.init +++ b/shadowsocks-libev/files/shadowsocks-libev.init @@ -81,6 +81,8 @@ ss_mkjson_ss_local_conf() { obfs_options="--obfs $obfs_type" [ -z "$obfs_host" ] || obfs_options="$obfs_options --obfs-host $obfs_host" [ -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 ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},} EOF @@ -93,6 +95,8 @@ ss_mkjson_ss_redir_conf() { obfs_options="--obfs $obfs_type" [ -z "$obfs_host" ] || obfs_options="$obfs_options --obfs-host $obfs_host" [ -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 "disable_sni": $disable_sni, ${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_ [ "$obfs" = 0 ] && obfs=false || obfs=true obfs_options="--obfs $obfs_type" + [ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open" + [ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp" cat <<-EOF ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-server $obfs_options${q},} EOF