mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-02-13 11:01:50 +00:00
Fix
This commit is contained in:
parent
b3b37cc705
commit
68274e2b26
1 changed files with 38 additions and 26 deletions
|
@ -79,6 +79,7 @@ ss_mkjson_common_conf() {
|
||||||
ss_mkjson_ss_local_conf() {
|
ss_mkjson_ss_local_conf() {
|
||||||
ss_mkjson_server_conf
|
ss_mkjson_server_conf
|
||||||
[ "$obfs" = 0 ] && obfs=false || obfs=true
|
[ "$obfs" = 0 ] && obfs=false || obfs=true
|
||||||
|
if $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"
|
||||||
[ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri"
|
[ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri"
|
||||||
|
@ -87,45 +88,56 @@ ss_mkjson_ss_local_conf() {
|
||||||
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
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
ss_mkjson_ss_redir_conf() {
|
ss_mkjson_ss_redir_conf() {
|
||||||
ss_mkjson_server_conf || return 1
|
ss_mkjson_server_conf || return 1
|
||||||
[ "$disable_sni" = 0 ] && disable_sni=false || disable_sni=true
|
[ "$disable_sni" = 0 ] && disable_sni=false || disable_sni=true
|
||||||
|
cat <<-EOF
|
||||||
|
"disable_sni": $disable_sni,
|
||||||
|
EOF
|
||||||
[ "$obfs" = 0 ] && obfs=false || obfs=true
|
[ "$obfs" = 0 ] && obfs=false || obfs=true
|
||||||
|
if $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"
|
||||||
[ -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" = 1 ] && obfs_options="$obfs_options --fast-open"
|
||||||
[ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp"
|
[ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp"
|
||||||
cat <<-EOF
|
cat <<-EOF
|
||||||
"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},}
|
||||||
EOF
|
EOF
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
ss_mkjson_ss_server_conf() {
|
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
|
||||||
|
if $obfs; then
|
||||||
obfs_options="--obfs $obfs_type"
|
obfs_options="--obfs $obfs_type"
|
||||||
[ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open"
|
[ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open"
|
||||||
[ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp"
|
[ "$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
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
ss_mkjson_ss_tunnel_conf() {
|
ss_mkjson_ss_tunnel_conf() {
|
||||||
ss_mkjson_server_conf || return 1
|
ss_mkjson_server_conf || return 1
|
||||||
[ -n "$tunnel_address" ] || return 1
|
[ -n "$tunnel_address" ] || return 1
|
||||||
|
cat <<-EOF
|
||||||
|
${tunnel_address:+${q}tunnel_address${q}: ${q}$tunnel_address${q},}
|
||||||
|
EOF
|
||||||
[ "$obfs" = 0 ] && obfs=false || obfs=true
|
[ "$obfs" = 0 ] && obfs=false || obfs=true
|
||||||
|
if $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"
|
||||||
[ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri"
|
[ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri"
|
||||||
cat <<-EOF
|
cat <<-EOF
|
||||||
${tunnel_address:+${q}tunnel_address${q}: ${q}$tunnel_address${q},}
|
|
||||||
${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
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
ss_xxx() {
|
ss_xxx() {
|
||||||
|
|
Loading…
Reference in a new issue