diff --git a/apps/shadowsocks/bin/haproxy_linux_arm b/apps/shadowsocks/bin/haproxy_linux_arm new file mode 100755 index 0000000..c2c14ad Binary files /dev/null and b/apps/shadowsocks/bin/haproxy_linux_arm differ diff --git a/apps/shadowsocks/bin/haproxy_linux_mips b/apps/shadowsocks/bin/haproxy_linux_mips new file mode 100644 index 0000000..147edde Binary files /dev/null and b/apps/shadowsocks/bin/haproxy_linux_mips differ diff --git a/apps/shadowsocks/bin/haproxy_linux_x86_64 b/apps/shadowsocks/bin/haproxy_linux_x86_64 new file mode 100755 index 0000000..40b81e1 Binary files /dev/null and b/apps/shadowsocks/bin/haproxy_linux_x86_64 differ diff --git a/apps/shadowsocks/bin/obfs-local_linux_arm b/apps/shadowsocks/bin/obfs-local_linux_arm new file mode 100755 index 0000000..f52c99e Binary files /dev/null and b/apps/shadowsocks/bin/obfs-local_linux_arm differ diff --git a/apps/shadowsocks/bin/obfs-local_linux_mips b/apps/shadowsocks/bin/obfs-local_linux_mips new file mode 100644 index 0000000..17b83a8 Binary files /dev/null and b/apps/shadowsocks/bin/obfs-local_linux_mips differ diff --git a/apps/shadowsocks/config/mixbox.conf b/apps/shadowsocks/config/mixbox.conf index 0d0a661..b8f9692 100644 --- a/apps/shadowsocks/config/mixbox.conf +++ b/apps/shadowsocks/config/mixbox.conf @@ -90,6 +90,11 @@ shadowsocksAdd() { [ -z "$ss_method" ] && echo "输入错误!" && return fi + if [ "$proxy_type" = 'ss' ]; then + read -p "输入${appname}混淆协议obfs[如http](没有请回车):" ss_protocol_param + read -p "输入${appname}混淆参数obfs_host(没有请回车):" ss_obfs_param + fi + if [ "$proxy_type" = 'ssr' ]; then echo "选择ssr协议(不一定都支持):" echo $protocols | tr " " "\n" | grep -n . | sed -e "s/:/) /g" diff --git a/apps/shadowsocks/config/shadowsocks.uci b/apps/shadowsocks/config/shadowsocks.uci index aeb6b22..edfdb64 100644 --- a/apps/shadowsocks/config/shadowsocks.uci +++ b/apps/shadowsocks/config/shadowsocks.uci @@ -5,5 +5,5 @@ supports="linux_arm,linux_mips,linux_x86_64" openport="1" backupfiles="config/ssserver.conf,config/sscontrol.conf,config/customize_black.conf,config/customize_white.conf" appinfo="最好的翻墙工具,没有之一,还可以加速国内外游戏" -newinfo="修复kcptun配置错误" -version="0.1.1" +newinfo="增加ss混淆插件obfs-local" +version="0.1.2" diff --git a/apps/shadowsocks/scripts/shadowsocks.sh b/apps/shadowsocks/scripts/shadowsocks.sh index 623192a..1a89473 100644 --- a/apps/shadowsocks/scripts/shadowsocks.sh +++ b/apps/shadowsocks/scripts/shadowsocks.sh @@ -60,35 +60,52 @@ get_config() { if [ "$proxy_type" = "ss" ]; then APPPATH=${mbroot}/apps/${appname}/bin/ss-redir LOCALPATH=${mbroot}/apps/${appname}/bin/ss-local - cat > ${mbroot}/apps/${appname}/config/ss.conf <<-EOF - { - "server": "$ss_server", - "server_port": $ss_server_port, - "local_address": "0.0.0.0", - "local_port": 1081, - "password": "$ss_password", - "timeout": 600, - "method": "$ss_method" - } - EOF + # 如果启用了ss混淆 + if [ -n "$ssr_protocol_param" ]; then + cat > ${mbroot}/apps/${appname}/config/ss.conf <<-EOF +{ + "server": "$ss_server", + "server_port": $ss_server_port, + "local_address": "0.0.0.0", + "local_port": 1081, + "password": "$ss_password", + "timeout": 600, + "method": "$ss_method", + "plugin":"obfs-local", + "plugin_opts":"obfs=$ssr_protocol_param;obfs-host=$ssr_obfs_param" +} +EOF + else + cat > ${mbroot}/apps/${appname}/config/ss.conf <<-EOF +{ + "server": "$ss_server", + "server_port": $ss_server_port, + "local_address": "0.0.0.0", + "local_port": 1081, + "password": "$ss_password", + "timeout": 600, + "method": "$ss_method" +} +EOF + fi else APPPATH=${mbroot}/apps/${appname}/bin/ssr-redir LOCALPATH=${mbroot}/apps/${appname}/bin/ssr-local cat > ${mbroot}/apps/${appname}/config/ss.conf <<-EOF - { - "server": "$ss_server", - "server_port": $ss_server_port, - "local_address": "0.0.0.0", - "local_port": 1081, - "password": "$ss_password", - "timeout": 600, - "protocol": "$ssr_protocol", - "protocol_param": "$ssr_protocol_param", - "obfs": "$ssr_obfs", - "obfs_param": "$ssr_obfs_param", - "method": "$ss_method" - } - EOF +{ + "server": "$ss_server", + "server_port": $ss_server_port, + "local_address": "0.0.0.0", + "local_port": 1081, + "password": "$ss_password", + "timeout": 600, + "protocol": "$ssr_protocol", + "protocol_param": "$ssr_protocol_param", + "obfs": "$ssr_obfs", + "obfs_param": "$ssr_obfs_param", + "method": "$ss_method" +} +EOF fi cp ${mbroot}/apps/${appname}/config/ss.conf ${mbroot}/apps/${appname}/config/dns2socks.conf && sed -i 's/1081/1082/g' ${mbroot}/apps/${appname}/config/dns2socks.conf fi @@ -125,34 +142,51 @@ get_config() { fi if [ "$proxy_type_game" = "ss" ]; then cp -rf ${mbroot}/apps/${appname}/bin/ss-redir ${mbroot}/apps/${appname}/bin/ssg-redir - cat > ${mbroot}/apps/${appname}/config/ssg.conf <<-EOF - { - "server": "$ssg_server", - "server_port": $ssg_server_port, - "local_address": "0.0.0.0", - "local_port": 1085, - "password": "$ssg_password", - "timeout": 600, - "method": "$ssg_method" - } - EOF + # 如果启用了ss混淆 + if [ -n "$ssg_protocol_param" ]; then + cat > ${mbroot}/apps/${appname}/config/ssg.conf <<-EOF +{ + "server": "$ssg_server", + "server_port": $ssg_server_port, + "local_address": "0.0.0.0", + "local_port": 1085, + "password": "$ssg_password", + "timeout": 600, + "method": "$ssg_method", + "plugin":"obfs-local", + "plugin_opts":"obfs=$ssg_protocol_param;obfs-host=$ssg_obfs_param" +} +EOF + else + cat > ${mbroot}/apps/${appname}/config/ssg.conf <<-EOF +{ + "server": "$ssg_server", + "server_port": $ssg_server_port, + "local_address": "0.0.0.0", + "local_port": 1085, + "password": "$ssg_password", + "timeout": 600, + "method": "$ssg_method" +} +EOF + fi else cp -rf ${mbroot}/apps/${appname}/bin/ssr-redir ${mbroot}/apps/${appname}/bin/ssg-redir cat > ${mbroot}/apps/${appname}/config/ssg.conf <<-EOF - { - "server": "$ssg_server", - "server_port": $ssg_server_port, - "local_address": "0.0.0.0", - "local_port": 1085, - "password": "$ssg_password", - "timeout": 600, - "protocol": "$ssg_protocol", - "protocol_param": "$ssg_protocol_param", - "obfs": "$ssg_obfs", - "obfs_param": "$ssg_obfs_param", - "method": "$ssg_method" - } - EOF +{ + "server": "$ssg_server", + "server_port": $ssg_server_port, + "local_address": "0.0.0.0", + "local_port": 1085, + "password": "$ssg_password", + "timeout": 600, + "protocol": "$ssg_protocol", + "protocol_param": "$ssg_protocol_param", + "obfs": "$ssg_obfs", + "obfs_param": "$ssg_obfs_param", + "method": "$ssg_method" +} +EOF fi fi # 保存代理类型