mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-13 11:01:50 +00:00
Code Issues Releases Wiki Activity

Add timeout param to OBFS plugin

Browse source
This commit is contained in:
Ycarus 2018-07-09 14:58:05 +02:00
parent 5b3a2f091d
commit 227f76a6ee
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,8 +85,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" [ "$fast_open" = true ] && obfs_options="$obfs_options;fast-open"
[ "$mptcp" = 1 ] && obfs_options="$obfs_options;mptcp" [ "$mptcp" = true ] && obfs_options="$obfs_options;mptcp"
[ -z "$timeout" ] || obfs_options="$obfs_options;t=$timeout" [ -z "$timeout" ] || obfs_options="$obfs_options;t=$timeout"
cat <<-EOF cat <<-EOF
${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local${q},${q}plugin_opts${q}: ${q}$obfs_options${q},} ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local${q},${q}plugin_opts${q}: ${q}$obfs_options${q},}
@ -105,8 +105,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" [ "$fast_open" = true ] && obfs_options="$obfs_options;fast-open"
[ "$mptcp" = 1 ] && obfs_options="$obfs_options;mptcp" [ "$mptcp" = true ] && obfs_options="$obfs_options;mptcp"
[ -z "$timeout" ] || obfs_options="$obfs_options;t=$timeout" [ -z "$timeout" ] || obfs_options="$obfs_options;t=$timeout"
cat <<-EOF cat <<-EOF
${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local${q},${q}plugin_opts${q}: ${q}$obfs_options${q},} ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local${q},${q}plugin_opts${q}: ${q}$obfs_options${q},}
@ -119,8 +119,9 @@ ss_mkjson_ss_server_conf() {
[ "$obfs" = 0 ] && obfs=false || obfs=true [ "$obfs" = 0 ] && obfs=false || obfs=true
if $obfs; then if $obfs; then
obfs_options="obfs=$obfs_type" obfs_options="obfs=$obfs_type"
[ "$fast_open" = 1 ] && obfs_options="$obfs_options;fast-open" [ "$fast_open" = true ] && obfs_options="$obfs_options;fast-open"
[ "$mptcp" = 1 ] && obfs_options="$obfs_options;mptcp" [ "$mptcp" = true ] && obfs_options="$obfs_options;mptcp"
[ -z "$timeout" ] || obfs_options="$obfs_options;t=$timeout"
cat <<-EOF cat <<-EOF
${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-server${q},${q}plugin_opts${q}: ${q}$obfs_options${q},} ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-server${q},${q}plugin_opts${q}: ${q}$obfs_options${q},}
EOF EOF
@ -138,6 +139,7 @@ ss_mkjson_ss_tunnel_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"
[ -z "$timeout" ] || obfs_options="$obfs_options;t=$timeout"
cat <<-EOF cat <<-EOF
${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local${q},${q}plugin_opts${q}: ${q}$obfs_options${q},} ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local${q},${q}plugin_opts${q}: ${q}$obfs_options${q},}
EOF EOF