smeb_y/v2ray
1
0
Fork 0
mirror of https://github.com/tsingui/softcenter-1.git synced 2024-11-14 18:05:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
paldier 2019-01-27 20:20:52 +08:00
parent 2296f55ce2
commit fbef338ed5
8 changed files with 437 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -2,7 +2,7 @@
========= =========
仅限lantiq grx350/550 仅限lantiq grx350/550
目前仅支持小宝改版本的 Merlin 固件的插件。未来有望支持 Tomato/Ddwrt 等 arm 系列路由器的插件而成为类似 Entware 可以让大家安装并且有配置界面的插件列表。目前还远远达不到我们心中的设计目标，时间有限，只能一跳一跳的去完成，希望能有更多兄弟参与。 目前仅支持BLUECAVE/K3C Merlin 固件的插件。未来有望支持 Tomato/Ddwrt 等 arm 系列路由器的插件而成为类似 Entware 可以让大家安装并且有配置界面的插件列表。目前还远远达不到我们心中的设计目标，时间有限，只能一跳一跳的去完成，希望能有更多兄弟参与。
插件支持列表 插件支持列表
======== ========

4
shadowsocks/config.json.js
View File

@ -1,8 +1,8 @@
{ {
"version":"4.1.7", "version":"4.1.7",
"md5":"f8b25718146bccb438bd70d111f222fa", "md5":"9674685d2e3f867c32d07d13c1c354cd",
"home_url":"Main_Ss_Content.asp", "home_url":"Main_Ss_Content.asp",
"title":"科学上网", "title":"科学上网",
"description":"科学上网", "description":"科学上网",
"build_date":"2019-01-25_00:00:12" "build_date":"2019-01-27_20:20:28"
} }

BIN
shadowsocks/shadowsocks.tar.gz
View File

Binary file not shown.

64
shadowsocks/shadowsocks/scripts/ss_fix_conf.sh Normal file
View File

@ -0,0 +1,64 @@
#!/bin/sh
eval `dbus export ss`
# 此脚本用于升级3.6.4版本及其以下的ss插件储存数据
nodes=`dbus list ssc|grep port|cut -d "=" -f1|cut -d "_" -f4|sort -n`
for node in $nodes
do
if [ "`dbus get ssconf_basic_use_rss_$node`" == "1" ];then
#ssr
dbus remove ssconf_basic_ss_obfs_$node
dbus remove ssconf_basic_ss_obfs_host_$node
dbus remove ssconf_basic_koolgame_udp_$node
else
if [ -n "`dbus get ssconf_basic_koolgame_udp_$node`" ];then
#koolgame
dbus remove ssconf_basic_rss_protocol_$node
dbus remove ssconf_basic_rss_protocol_param_$node
dbus remove ssconf_basic_rss_obfs_$node
dbus remove ssconf_basic_rss_obfs_param_$node
dbus remove ssconf_basic_ss_obfs_$node
dbus remove ssconf_basic_ss_obfs_host_$node
else
#ss
dbus remove ssconf_basic_rss_protocol_$node
dbus remove ssconf_basic_rss_protocol_param_$node
dbus remove ssconf_basic_rss_obfs_$node
dbus remove ssconf_basic_rss_obfs_param_$node
dbus remove ssconf_basic_koolgame_udp_$node
[ -z "`dbus get ssconf_basic_ss_obfs_$node`" ] && dbus set ssconf_basic_ss_obfs_$node="0"
fi
fi
dbus remove ssconf_basic_use_rss_$node
done
use_node=`dbus get ssconf_basic_node`
if [ -n "$use_node" ];then
dbus remove ss_basic_server
dbus remove ss_basic_mode
dbus remove ss_basic_port
dbus remove ss_basic_method
dbus remove ss_basic_ss_obfs
dbus remove ss_basic_ss_obfs_host
dbus remove ss_basic_rss_protocol
dbus remove ss_basic_rss_protocol_param
dbus remove ss_basic_rss_obfs
dbus remove ss_basic_rss_obfs_param
dbus remove ss_basic_koolgame_udp
dbus remove ss_basic_use_rss
dbus remove ss_basic_use_kcp
sleep 1
[ -n "`dbus get ssconf_basic_server_$node`" ] && dbus set ss_basic_server=`dbus get ssconf_basic_server_$node`
[ -n "`dbus get ssconf_basic_mode_$node`" ] && dbus set ss_basic_mode=`dbus get ssconf_basic_mode_$node`
[ -n "`dbus get ssconf_basic_port_$node`" ] && dbus set ss_basic_port=`dbus get ssconf_basic_port_$node`
[ -n "`dbus get ssconf_basic_method_$node`" ] && dbus set ss_basic_method=`dbus get ssconf_basic_method_$node`
[ -n "`dbus get ssconf_basic_ss_obfs_$node`" ] && dbus set ss_basic_ss_obfs=`dbus get ssconf_basic_ss_obfs_$node`
[ -n "`dbus get ssconf_basic_ss_obfs_host_$node`" ] && dbus set ss_basic_ss_obfs_host=`dbus get ssconf_basic_ss_obfs_host_$node`
[ -n "`dbus get ssconf_basic_rss_protocol_$node`" ] && dbus set ss_basic_rss_protocol=`dbus get ssconf_basic_rss_protocol_$node`
[ -n "`dbus get ssconf_basic_rss_protocol_param_$node`" ] && dbus set ss_basic_rss_protocol_param=`dbus get ssconf_basic_rss_protocol_param_$node`
[ -n "`dbus get ssconf_basic_rss_obfs_$node`" ] && dbus set ss_basic_rss_obfs=`dbus get ssconf_basic_rss_obfs_$node`
[ -n "`dbus get ssconf_basic_rss_obfs_param_$node`" ] && dbus set ss_basic_rss_obfs_param=`dbus get ssconf_basic_rss_obfs_param_$node`
[ -n "`dbus get ssconf_basic_koolgame_udp_$node`" ] && dbus set ss_basic_koolgame_udp=`dbus get ssconf_basic_koolgame_udp_$node`
[ -n "`dbus get ssconf_basic_use_kcp_$node`" ] && dbus set ss_basic_koolgame_udp=`dbus get ssconf_basic_use_kcp_$node`
fi

591
shadowsocks/shadowsocks/ss/ssconfig.sh
View File

@ -4,6 +4,7 @@ eval `dbus export ss`
source /jffs/softcenter/scripts/base.sh source /jffs/softcenter/scripts/base.sh
source helper.sh source helper.sh
# Variable definitions # Variable definitions
THREAD=$(grep -c '^processor' /proc/cpuinfo)
alias echo_date='echo 【$(TZ=UTC-8 date -R +%Y年%m月%d日\ %X)】:' alias echo_date='echo 【$(TZ=UTC-8 date -R +%Y年%m月%d日\ %X)】:'
dbus set ss_basic_version_local=`cat /jffs/softcenter/ss/version` dbus set ss_basic_version_local=`cat /jffs/softcenter/ss/version`
LOG_FILE=/tmp/syslog.log LOG_FILE=/tmp/syslog.log
@ -16,19 +17,38 @@ ISP_DNS1=$(nvram get wan0_dns|sed 's/ /\n/g'|grep -v 0.0.0.0|grep -v 127.0.0.1|s
ISP_DNS2=$(nvram get wan0_dns|sed 's/ /\n/g'|grep -v 0.0.0.0|grep -v 127.0.0.1|sed -n 2p) ISP_DNS2=$(nvram get wan0_dns|sed 's/ /\n/g'|grep -v 0.0.0.0|grep -v 127.0.0.1|sed -n 2p)
IFIP_DNS1=`echo $ISP_DNS1|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"` IFIP_DNS1=`echo $ISP_DNS1|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"`
IFIP_DNS2=`echo $ISP_DNS2|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"` IFIP_DNS2=`echo $ISP_DNS2|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"`
gfw_on=`dbus list ss_acl_mode_|cut -d "=" -f 2 | grep -E "1"`
chn_on=`dbus list ss_acl_mode_|cut -d "=" -f 2 | grep -E "2|3|4"`
all_on=`dbus list ss_acl_mode_|cut -d "=" -f 2 | grep -E "5"`
lan_ipaddr=$(nvram get lan_ipaddr) lan_ipaddr=$(nvram get lan_ipaddr)
ip_prefix_hex=`nvram get lan_ipaddr | awk -F "." '{printf ("0x%02x", $1)} {printf ("%02x", $2)} {printf ("%02x", $3)} {printf ("00/0xffffff00\n")}'` ip_prefix_hex=`nvram get lan_ipaddr | awk -F "." '{printf ("0x%02x", $1)} {printf ("%02x", $2)} {printf ("%02x", $3)} {printf ("00/0xffffff00\n")}'`
[ "$ss_basic_mode" == "4" ] && ss_basic_mode=3
game_on=`dbus list ss_acl_mode|cut -d "=" -f 2 | grep 3`
[ -n "$game_on" ] || [ "$ss_basic_mode" == "3" ] && mangle=1
ss_basic_password=`echo $ss_basic_password|base64_decode`
ARG_OBFS="" ARG_OBFS=""
#-----------------------------------------------
get_config(){
local cur_node=$ssconf_basic_node
local base_1 base_2 config key_1 key_2 tmp
base_1="type mode server port method password ss_obfs ss_obfs_host koolgame_udp rss_protocol rss_protocol_param rss_obfs rss_obfs_param v2ray_uuid v2ray_alterid v2ray_security v2ray_network v2ray_headtype_tcp v2ray_headtype_kcp v2ray_network_path v2ray_network_host v2ray_network_security v2ray_mux_concurrency v2ray_json"
base_2="enable use_kcp v2ray_use_json v2ray_mux_enable"
for config in $base_1 $base_2
do
key_1=ssconf_basic_${config}_${cur_node}
key_2=ss_basic_${config}
#echo key_1: $key_1
#echo key_2: $key_2
tmp="export $key_2=\$$key_1"
#echo_date $tmp
eval $tmp
unset key_1 key_2
done
gfw_on=`dbus list ss_acl_mode_|cut -d "=" -f 2 | grep -E "1"`
chn_on=`dbus list ss_acl_mode_|cut -d "=" -f 2 | grep -E "2|3|4"`
all_on=`dbus list ss_acl_mode_|cut -d "=" -f 2 | grep -E "5"`
game_on=`dbus list ss_acl_mode|cut -d "=" -f 2 | grep 3`
[ -n "$game_on" ] || [ "$ss_basic_mode" == "3" ] && mangle=1
ss_basic_password=`echo $ss_basic_password|base64_decode`
ss_basic_server_orig=$ss_basic_server
# 兼容3.8.9及其以下 # 兼容3.8.9及其以下
[ -z "$ss_basic_type" ] && { [ -z "$ss_basic_type" ] && {
if [ -n "$ss_basic_rss_protocol" ];then if [ -n "$ss_basic_rss_protocol" ];then
ss_basic_type="1" ss_basic_type="1"
else else
@ -42,54 +62,12 @@ ARG_OBFS=""
fi fi
fi fi
fi fi
}
get_lan_cidr(){
netmask=`nvram get lan_netmask`
local x=${netmask##*255.}
set -- 0^^^128^192^224^240^248^252^254^ $(( (${#netmask} - ${#x})*2 )) ${x%%.*}
x=${1%%$3*}
suffix=$(( $2 + (${#x}/4) ))
#prefix=`nvram get lan_ipaddr | cut -d "." -f1,2,3`
echo $lan_ipaddr/$suffix
}
get_wan0_cidr(){
netmask=`nvram get wan0_netmask`
local x=${netmask##*255.}
set -- 0^^^128^192^224^240^248^252^254^ $(( (${#netmask} - ${#x})*2 )) ${x%%.*}
x=${1%%$3*}
suffix=$(( $2 + (${#x}/4) ))
prefix=`nvram get wan0_ipaddr`
if [ -n "$prefix" -a -n "$netmask" ];then
echo $prefix/$suffix
else
echo ""
fi
}
get_server_resolver(){
if [ "$ss_basic_server_resolver" == "1" ];then
if [ -n "$IFIP_DNS1" ];then
RESOLVER="$ISP_DNS1"
else
RESOLVER="114.114.114.114"
fi
fi
[ "$ss_basic_server_resolver" == "2" ] && RESOLVER="223.5.5.5"
[ "$ss_basic_server_resolver" == "3" ] && RESOLVER="223.6.6.6"
[ "$ss_basic_server_resolver" == "4" ] && RESOLVER="114.114.114.114"
[ "$ss_basic_server_resolver" == "5" ] && RESOLVER="114.114.115.115"
[ "$ss_basic_server_resolver" == "6" ] && RESOLVER="1.2.4.8"
[ "$ss_basic_server_resolver" == "7" ] && RESOLVER="210.2.4.8"
[ "$ss_basic_server_resolver" == "8" ] && RESOLVER="117.50.11.11"
[ "$ss_basic_server_resolver" == "9" ] && RESOLVER="117.50.22.22"
[ "$ss_basic_server_resolver" == "10" ] && RESOLVER="180.76.76.76"
[ "$ss_basic_server_resolver" == "11" ] && RESOLVER="119.29.29.29"
[ "$ss_basic_server_resolver" == "12" ] && {
[ -n "$ss_basic_server_resolver_user" ] && RESOLVER="$ss_basic_server_resolver_user" || RESOLVER="114.114.114.114"
} }
echo $RESOLVER }
cmd() {
echo_date "$*" 2>&1
"$@"
} }
set_lock(){ set_lock(){
@ -102,20 +80,39 @@ unset_lock(){
rm -rf "$LOCK_FILE" rm -rf "$LOCK_FILE"
} }
get_lan_cidr(){
local netmask=`nvram get lan_netmask`
local x=${netmask##*255.}
set -- 0^^^128^192^224^240^248^252^254^ $(( (${#netmask} - ${#x})*2 )) ${x%%.*}
x=${1%%$3*}
suffix=$(( $2 + (${#x}/4) ))
#prefix=`nvram get lan_ipaddr | cut -d "." -f1,2,3`
echo $lan_ipaddr/$suffix
}
get_wan0_cidr(){
local netmask=`nvram get wan0_netmask`
local x=${netmask##*255.}
set -- 0^^^128^192^224^240^248^252^254^ $(( (${#netmask} - ${#x})*2 )) ${x%%.*}
x=${1%%$3*}
suffix=$(( $2 + (${#x}/4) ))
prefix=`nvram get wan0_ipaddr`
if [ -n "$prefix" -a -n "$netmask" ];then
echo $prefix/$suffix
else
echo ""
fi
}
close_in_five(){ close_in_five(){
echo_date "插件将在5秒后自动关闭！！" echo_date "插件将在5秒后自动关闭！！"
local i=5
while [ $i -ge 0 ]
do
sleep 1 sleep 1
echo_date 5 echo_date $i
sleep 1 let i--
echo_date 4 done
sleep 1
echo_date 3
sleep 1
echo_date 2
sleep 1
echo_date 1
sleep 1
echo_date 0
dbus set ss_basic_enable="0" dbus set ss_basic_enable="0"
disable_ss >/dev/null disable_ss >/dev/null
echo_date "插件已关闭！！" echo_date "插件已关闭！！"
@ -124,6 +121,126 @@ close_in_five(){
exit exit
} }
__get_type_full_name() {
case "$1" in
0)
echo "shadowsocks-libev"
;;
1)
echo "shadowsocksR-libev"
;;
2)
echo "koolgame"
;;
3)
echo "v2ray"
;;
esac
}
__get_type_abbr_name() {
case "$ss_basic_type" in
0)
echo "ss"
;;
1)
echo "ssr"
;;
2)
echo "koolgame"
;;
3)
echo "v2ray"
;;
esac
}
__valid_ip(){
# 验证是否为ipv4或者ipv6地址，是则正确返回，不是返回空值
local format_4=`echo "$1"|grep -Eo "([0-9]{1,3}[\.]){3}[0-9]{1,3}"`
local format_6=`echo "$1"|grep -Eo '^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*'`
if [ -n "$format_4" ] && [ -z "$format_6" ];then
echo "$format_4"
return 0
elif [ -z "$format_4" ] && [ -n "$format_6" ];then
echo "$format_6"
return 0
else
echo ""
return 1
fi
}
__get_server_resolver(){
local value_1="$ss_basic_server_resolver"
local value_2="$ss_basic_server_resolver_user"
local res
if [ "$value_1" == "1" ];then
if [ -n "$IFIP_DNS1" ];then
res="$ISP_DNS1"
else
res="114.114.114.114"
fi
fi
[ "$value_1" == "2" ] && res="223.5.5.5"
[ "$value_1" == "3" ] && res="223.6.6.6"
[ "$value_1" == "4" ] && res="114.114.114.114"
[ "$value_1" == "5" ] && res="114.114.115.115"
[ "$value_1" == "6" ] && res="1.2.4.8"
[ "$value_1" == "7" ] && res="210.2.4.8"
[ "$value_1" == "8" ] && res="117.50.11.11"
[ "$value_1" == "9" ] && res="117.50.22.22"
[ "$value_1" == "10" ] && res="180.76.76.76"
[ "$value_1" == "11" ] && res="119.29.29.29"
if [ "$value_1" == "12" ];then
if [ -n "$value_2" ];then
res=$(__valid_ip "$value_2")
[ -z "$res" ] && res="114.114.114.114"
else
res="114.114.114.114"
fi
fi
echo $res
}
__get_server_resolver_port(){
local port
if [ "$ss_basic_server_resolver" == "12" ];then
if [ -n "$ss_basic_server_resolver_user" ];then
port=`echo "$ss_basic_server_resolver_user"|awk -F"#|:" '{print $2}'`
[ -z "$port" ] && port="53"
else
port="53"
fi
else
port="53"
fi
echo $port
}
__resolve_ip(){
local domain1=`echo "$1"|grep -E "^https://|^http://|/"`
local domain2=`echo "$1"|grep -E "\."`
if [ -n "$domain1" ] || [ -z "$domain2" ];then
# not ip, not domain
echo ""
return 2
else
# domain format
SERVER_IP=`nslookup "$1" $(__get_server_resolver):$(__get_server_resolver_port) | sed '1,4d' | awk '{print $3}' | grep -v :|awk 'NR==1{print}' 2>/dev/null`
SERVER_IP=$(__valid_ip $SERVER_IP)
if [ -n "$SERVER_IP" ];then
# success resolved
echo "$SERVER_IP"
return 0
else
# resolve failed
echo ""
return 1
fi
fi
}
# ================================= ss stop =============================== # ================================= ss stop ===============================
restore_conf(){ restore_conf(){
echo_date 删除ss相关的名单配置文件. echo_date 删除ss相关的名单配置文件.
@ -246,23 +363,24 @@ kill_process(){
echo_date 关闭haveged进程... echo_date 关闭haveged进程...
killall haveged >/dev/null 2>&1 killall haveged >/dev/null 2>&1
fi fi
echo 1 > /proc/sys/net/ipv4/tcp_fastopen
} }
# ================================= ss prestart =========================== # ================================= ss prestart ===========================
ss_pre_start(){ ss_pre_start(){
lb_enable=`dbus get ss_lb_enable` if [ "$ss_lb_enable" == "1" ];then
if [ "$lb_enable" == "1" ];then
echo_date ---------------------- 【科学上网】 启动前触发脚本 ---------------------- echo_date ---------------------- 【科学上网】 启动前触发脚本 ----------------------
if [ `dbus get ss_basic_server | grep -o "127.0.0.1"` ] && [ `dbus get ss_basic_port` == `dbus get ss_lb_port` ];then if [ `echo $ss_basic_server | grep -o "127.0.0.1"` ] && [ "$ss_basic_port" == "$ss_lb_port" ];then
echo_date ss启动前触发:触发启动负载均衡功能！ echo_date 插件启动前触发:触发启动负载均衡功能！
#start haproxy #start haproxy
sh /jffs/softcenter/scripts/ss_lb_config.sh sh /jffs/softcenter/scripts/ss_lb_config.sh
else else
echo_date ss启动前触发:未选择负载均衡节点，不触发负载均衡启动！ echo_date 插件启动前触发:未选择负载均衡节点，不触发负载均衡启动！
fi fi
else else
if [ `dbus get ss_basic_server | grep -o "127.0.0.1"` ] && [ `dbus get ss_basic_port` == `dbus get ss_lb_port` ];then if [ `echo $ss_basic_server | grep -o "127.0.0.1"` ] && [ "$ss_basic_port" == "$ss_lb_port" ];then
echo_date ss启动前触发【警告】：你选择了负载均衡节点，但是负载均衡开关未启用！！ echo_date 插件启动前触发【警告】：你选择了负载均衡节点，但是负载均衡开关未启用！！
#else #else
#echo_date ss启动前触发：你选择了普通节点，不触发负载均衡启动！ #echo_date ss启动前触发：你选择了普通节点，不触发负载均衡启动！
fi fi
@ -271,44 +389,50 @@ ss_pre_start(){
# ================================= ss start ============================== # ================================= ss start ==============================
resolv_server_ip(){ resolv_server_ip(){
local tmp server_ip
if [ "$ss_basic_type" == "3" ] && [ "$ss_basic_v2ray_use_json" == "1" ];then if [ "$ss_basic_type" == "3" ] && [ "$ss_basic_v2ray_use_json" == "1" ];then
#echo_date "你使用的v2ray json配置，请自行将v2ray服务器ip地址添加到IP/CIDR白名单！" #v2ray json配置在后面单独处理
return 1 return 1
else else
IFIP=`echo $ss_basic_server|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"` # 判断服务器域名格式
if [ -z "$IFIP" ];then tmp=$(__valid_ip "$ss_basic_server")
# 服务器地址强制由114解析，以免插件还未开始工作而导致解析失败 if [ $? == 0 ];then
echo "server=/$ss_basic_server/$(get_server_resolver)#53" > /tmp/etc/dnsmasq.user/ss_server.conf # server is ip address format, not need to resolve.
echo_date 尝试解析SS服务器的ip地址，DNS：$(get_server_resolver) echo_date "检测到你的$(__get_type_abbr_name)服务器已经是IP格式：$ss_basic_server,跳过解析... "
server_ip=`nslookup "$ss_basic_server" $(get_server_resolver) | sed '1,4d' | awk '{print $3}' | grep -v :|awk 'NR==1{print}'` ss_basic_server_ip="$ss_basic_server"
if [ "$?" == "0" ];then dbus set ss_basic_server_ip=$ss_basic_server
server_ip=`echo $server_ip|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"`
else else
echo_date SS服务器域名解析失败！ echo_date "检测到你的$(__get_type_abbr_name)服务器：【$ss_basic_server】不是ip格式！"
echo_date 尝试用resolveip方式解析，DNS：系统 echo_date "尝试解析$(__get_type_abbr_name)服务器的ip地址，使用DNS：$(__get_server_resolver):$(__get_server_resolver_port)"
server_ip=`resolveip -4 -t 2 $ss_basic_server|awk 'NR==1{print}'` echo_date "如果此处等待时间较久，建议在【节点域名解析DNS服务器】处更换DNS服务器..."
if [ "$?" == "0" ];then server_ip=$(__resolve_ip "$ss_basic_server")
server_ip=`echo $server_ip|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"` case $? in
fi 0)
fi echo_date "$(__get_type_abbr_name)服务器【$ss_basic_server】的ip地址解析成功：$server_ip"
echo "server=/$ss_basic_server/$(__get_server_resolver)#$(__get_server_resolver_port)" > /tmp/etc/dnsmasq.user/ss_server.conf
if [ -n "$server_ip" ];then # server is domain format and success resolved.
echo_date SS服务器的ip地址解析成功：$server_ip # 记录解析结果到/tmp/ss_host.conf，方便插件触发重启设定工作
# 解析并记录一次ip，方便插件触发重启设定工作
echo "address=/$ss_basic_server/$server_ip" > /tmp/ss_host.conf echo "address=/$ss_basic_server/$server_ip" > /tmp/ss_host.conf
# 去掉此功能，以免ip发生变更导致问题，或者影响域名对应的其它二级域名 # 去掉此功能，以免ip发生变更导致问题，或者影响域名对应的其它二级域名
#ln -sf /tmp/ss_host.conf /tmp/etc/dnsmasq.user/ss_host.conf #ln -sf /tmp/ss_host.conf /tmp/etc/dnsmasq.user/ss_host.conf
ss_basic_server="$server_ip" ss_basic_server="$server_ip"
ss_basic_server_ip="$server_ip" ss_basic_server_ip="$server_ip"
dbus set ss_basic_server_ip="$server_ip" dbus set ss_basic_server_ip="$server_ip"
else ;;
1)
# server is domain format and failed to resolve.
echo_date "$(__get_type_abbr_name)服务器的ip地址解析失败，将由ss-redir自己解析... "
echo "server=/$ss_basic_server/$(__get_server_resolver)#$(__get_server_resolver_port)" > /tmp/etc/dnsmasq.user/ss_server.conf
unset ss_basic_server_ip
dbus remvoe ss_basic_server_ip dbus remvoe ss_basic_server_ip
echo_date SS服务器的ip地址解析失败，将由ss-redir自己解析. ;;
fi 2)
else # server is not ip either domain!
ss_basic_server_ip="$ss_basic_server" echo_date "错误！！检测到你设置的服务器域名既不是ip地址，也不是域名格式！"
dbus set ss_basic_server_ip=$ss_basic_server echo_date "请更正你的错误然后重试！！"
echo_date 检测到你的SS服务器已经是IP格式：$ss_basic_server,跳过解析... close_in_five
;;
esac
fi fi
fi fi
} }
@ -393,23 +517,6 @@ creat_ss_json(){
fi fi
} }
get_type_name() {
case "$1" in
0)
echo "shadowsocks-libev"
;;
1)
echo "shadowsocksR-libev"
;;
2)
echo "koolgame"
;;
3)
echo "v2ray"
;;
esac
}
get_dns_name() { get_dns_name() {
case "$1" in case "$1" in
1) 1)
@ -574,7 +681,7 @@ start_dns(){
if [ "$ss_basic_type" == "3" ];then if [ "$ss_basic_type" == "3" ];then
return 0 return 0
else else
echo_date $(get_type_name $ss_basic_type)下不支持v2ray dns，改用dns2socks！ echo_date $(__get_type_full_name $ss_basic_type)下不支持v2ray dns，改用dns2socks！
dbus set ss_foreign_dns=3 dbus set ss_foreign_dns=3
start_sslocal start_sslocal
echo_date 开启dns2socks，用于dns解析... echo_date 开启dns2socks，用于dns解析...
@ -834,40 +941,8 @@ start_haveged(){
} }
auto_start(){ auto_start(){
# nat_auto_start [ ! -e "/koolshare/init.d/S99shadowsocks.sh" ] && cp -rf /koolshare/ss/ssconfig.sh /koolshare/init.d/S99shadowsocks.sh
mkdir -p /jffs/scripts [ ! -e "/koolshare/init.d/N99shadowsocks.sh" ] && cp -rf /koolshare/ss/ssconfig.sh /koolshare/init.d/N99shadowsocks.sh
# creating iptables rules to nat-start
if [ ! -f /jffs/scripts/nat-start ]; then
cat > /jffs/scripts/nat-start <<-EOF
#!/bin/sh
/usr/bin/onnatstart.sh
EOF
fi
writenat=$(cat /jffs/scripts/nat-start | grep "ssconfig")
if [ -z "$writenat" ];then
echo_date 添加nat-start触发事件...用于ss的nat规则重启后或网络恢复后的加载...
sed -i '2a sh /jffs/softcenter/ss/ssconfig.sh' /jffs/scripts/nat-start
chmod +x /jffs/scripts/nat-start
fi
# wan_auto_start
# Add service to auto start
if [ ! -f /jffs/scripts/wan-start ]; then
cat > /jffs/scripts/wan-start <<-EOF
#!/bin/sh
/usr/bin/onwanstart.sh
EOF
fi
startss=$(cat /jffs/scripts/wan-start | grep "/jffs/softcenter/scripts/ss_config.sh")
if [ -z "$startss" ];then
echo_date 添加wan-start触发事件...用于ss的各种程序的开机启动...
sed -i '2a sh /jffs/softcenter/scripts/ss_config.sh' /jffs/scripts/wan-start
fi
chmod +x /jffs/scripts/wan-start
} }
start_kcp(){ start_kcp(){
@ -1075,13 +1150,13 @@ start_ss_redir(){
# tcp udp go ss # tcp udp go ss
echo_date $BIN的 tcp 走$BIN. echo_date $BIN的 tcp 走$BIN.
echo_date $BIN的 udp 走$BIN. echo_date $BIN的 udp 走$BIN.
$BIN -c $CONFIG_FILE $ARG_OBFS -u -f /var/run/shadowsocks.pid >/dev/null 2>&1 fire_redir "$BIN -c $CONFIG_FILE $ARG_OBFS -u"
fi fi
else else
# tcp only go ss # tcp only go ss
echo_date $BIN的 tcp 走$BIN. echo_date $BIN的 tcp 走$BIN.
echo_date $BIN的 udp 未开启. echo_date $BIN的 udp 未开启.
$BIN -c $CONFIG_FILE $ARG_OBFS -f /var/run/shadowsocks.pid >/dev/null 2>&1 fire_redir "$BIN -c $CONFIG_FILE $ARG_OBFS"
fi fi
fi fi
echo_date $BIN 启动完毕！. echo_date $BIN 启动完毕！.
@ -1089,6 +1164,36 @@ start_ss_redir(){
start_speeder start_speeder
} }
fire_redir(){
[ "$ss_basic_type" == "0" ] && [ "$ss_basic_mcore" == "1" ] && local ARG_1="--reuse-port" || local ARG_1=""
if [ "$ss_basic_type" == "0" ] && [ "$ss_basic_tfo" == "1" ];then
local ARG_2="--fast-open"
echo_date $BIN开启tcp fast open支持.
echo 3 > /proc/sys/net/ipv4/tcp_fastopen
else
local ARG_2=""
fi
if [ "$ss_basic_type" == "0" ] && [ "$ss_basic_tnd" == "1" ];then
echo_date $BIN开启TCP_NODELAY支持.
local ARG_3="--no-delay"
else
local ARG_3=""
fi
if [ "$ss_basic_mcore" == "1" ];then
echo_date $BIN开启$THREAD线程支持.
local i=1
while [ $i -le $THREAD ]
do
cmd $1 $ARG_1 $ARG_2 $ARG_3 -f /var/run/ss_$i.pid
let i++
done
else
cmd $1 -f /var/run/ss.pid
fi
}
start_koolgame(){ start_koolgame(){
# Start koolgame # Start koolgame
pdu=`ps|grep pdu|grep -v grep` pdu=`ps|grep pdu|grep -v grep`
@ -1119,12 +1224,12 @@ start_koolgame(){
get_function_switch() { get_function_switch() {
case "$1" in case "$1" in
0)
echo "false"
;;
1) 1)
echo "true" echo "true"
;; ;;
0|*)
echo "false"
;;
esac esac
} }
@ -1153,6 +1258,7 @@ get_path(){
} }
creat_v2ray_json(){ creat_v2ray_json(){
local tmp v2ray_server_ip
rm -rf "$V2RAY_CONFIG_FILE_TMP" rm -rf "$V2RAY_CONFIG_FILE_TMP"
rm -rf "$V2RAY_CONFIG_FILE" rm -rf "$V2RAY_CONFIG_FILE"
if [ "$ss_basic_v2ray_use_json" == "0" ];then if [ "$ss_basic_v2ray_use_json" == "0" ];then
@ -1307,7 +1413,7 @@ creat_v2ray_json(){
"settings": { "settings": {
"vnext": [ "vnext": [
{ {
"address": "`dbus get ss_basic_server`", "address": "$ss_basic_server_orig",
"port": $ss_basic_port, "port": $ss_basic_port,
"users": [ "users": [
{ {
@ -1378,13 +1484,9 @@ creat_v2ray_json(){
} }
] ]
}" }"
#local TEMPLATE=`cat /jffs/softcenter/ss/rules/v2ray_template.json`
echo_date 解析V2Ray配置文件... echo_date 解析V2Ray配置文件...
echo $TEMPLATE | jq --argjson args "$OUTBOUND" '. + {outbound: $args}' > "$V2RAY_CONFIG_FILE" echo $TEMPLATE | jq --argjson args "$OUTBOUND" '. + {outbound: $args}' > "$V2RAY_CONFIG_FILE"
#echo $TEMPLATE | jq --argjson args "$JSON_INFO" '. + $args' > "$V2RAY_CONFIG_FILE"
echo_date V2Ray配置文件写入成功到"$V2RAY_CONFIG_FILE" echo_date V2Ray配置文件写入成功到"$V2RAY_CONFIG_FILE"
#close_in_five
# 检测用户json的服务器ip地址 # 检测用户json的服务器ip地址
v2ray_protocal=`cat "$V2RAY_CONFIG_FILE" | jq -r .outbound.protocol` v2ray_protocal=`cat "$V2RAY_CONFIG_FILE" | jq -r .outbound.protocol`
@ -1404,41 +1506,42 @@ creat_v2ray_json(){
esac esac
if [ -n "$v2ray_server" -a "$v2ray_server" != "null" ];then if [ -n "$v2ray_server" -a "$v2ray_server" != "null" ];then
IFIP_VS=`echo $v2ray_server|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"` # 服务器地址强制由用户选择的DNS解析，以免插件还未开始工作而导致解析失败
if [ -n "$IFIP_VS" ];then echo "server=/$v2ray_server/$(__get_server_resolver)#$(__get_server_resolver_port)" > /tmp/etc/dnsmasq.user/ss_server.conf
ss_basic_server_ip="$v2ray_server" # 判断服务器域名格式
tmp=$(__valid_ip "$v2ray_server")
if [ $? == 0 ];then
echo_date "检测到你的json配置的v2ray服务器是：$v2ray_server" echo_date "检测到你的json配置的v2ray服务器是：$v2ray_server"
ss_basic_server_ip="$v2ray_server"
else else
echo_date "检测到你的json配置的v2ray服务器：$v2ray_server不是ip格式！" echo_date "检测到你的json配置的v2ray服务器：【$v2ray_server】不是ip格式！"
echo_date "为了确保v2ray的正常工作，建议配置ip格式的v2ray服务器地址！" echo_date "尝试解析v2ray服务器的ip地址，使用DNS：$(__get_server_resolver):$(__get_server_resolver_port)"
echo_date "尝试解析v2ray服务器的ip地址，DNS：$(get_server_resolver)" echo_date "如果此处等待时间较久，建议在【节点域名解析DNS服务器】处更换DNS服务器..."
# 服务器地址强制由114解析，以免插件还未开始工作而导致解析失败 v2ray_server_ip=$(__resolve_ip "$v2ray_server")
echo "server=/$v2ray_server/$(get_server_resolver)#53" > /tmp/etc/dnsmasq.user/ss_server.conf case $? in
v2ray_server_ip=`nslookup "$v2ray_server" $(get_server_resolver) | sed '1,4d' | awk '{print $3}' | grep -v :|awk 'NR==1{print}'` 0)
if [ "$?" == "0" ]; then # server is domain format and success resolved.
v2ray_server_ip=`echo $v2ray_server_ip|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"`
else
echo_date v2ray服务器域名解析失败！
echo_date 尝试用resolveip方式解析，DNS：系统
v2ray_server_ip=`resolveip -4 -t 2 $ss_basic_server|awk 'NR==1{print}'`
if [ "$?" == "0" ];then
v2ray_server_ip=`echo $v2ray_server_ip|grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"`
fi
fi
if [ -n "$v2ray_server_ip" ];then
echo_date "v2ray服务器的ip地址解析成功：$v2ray_server_ip" echo_date "v2ray服务器的ip地址解析成功：$v2ray_server_ip"
# 解析并记录一次ip，方便插件触发重启设定工作 # 解析并记录一次ip，方便插件触发重启设定工作
echo "address=/$v2ray_server/$v2ray_server_ip" > /tmp/ss_host.conf echo "address=/$v2ray_server/$v2ray_server_ip" > /tmp/ss_host.conf
# 去掉此功能，以免ip发生变更导致问题，或者影响域名对应的其它二级域名 # 去掉此功能，以免ip发生变更导致问题，或者影响域名对应的其它二级域名
#ln -sf /tmp/ss_host.conf /tmp/etc/dnsmasq.user/ss_host.conf #ln -sf /tmp/ss_host.conf /tmp/etc/dnsmasq.user/ss_host.conf
ss_basic_server_ip="$v2ray_server_ip" ss_basic_server_ip="$v2ray_server_ip"
else ;;
1)
# server is domain format and failed to resolve.
unset ss_basic_server_ip
echo_date "v2ray服务器的ip地址解析失败!插件将继续运行，域名解析将由v2ray自己进行！" echo_date "v2ray服务器的ip地址解析失败!插件将继续运行，域名解析将由v2ray自己进行！"
echo_date "请自行将v2ray服务器的ip地址填入IP/CIDR白名单中!" echo_date "请自行将v2ray服务器的ip地址填入IP/CIDR白名单中!"
echo_date "为了确保v2ray的正常工作，建议配置ip格式的v2ray服务器地址！" echo_date "为了确保v2ray的正常工作，建议配置ip格式的v2ray服务器地址！"
#close_in_five ;;
fi 2)
# server is not ip either domain!
echo_date "错误！！检测到json配置内的v2ray服务器既不是ip地址，也不是域名格式！"
echo_date "请更正你的错误然后重试！！"
close_in_five
;;
esac
fi fi
else else
echo_date "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" echo_date "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
@ -1471,9 +1574,9 @@ creat_v2ray_json(){
echo_date $result echo_date $result
echo_date V2Ray配置文件通过测试!!! echo_date V2Ray配置文件通过测试!!!
else else
rm -rf "$V2RAY_CONFIG_FILE_TMP"
rm -rf "$V2RAY_CONFIG_FILE"
echo_date V2Ray配置文件没有通过测试，请检查设置!!! echo_date V2Ray配置文件没有通过测试，请检查设置!!!
#rm -rf "$V2RAY_CONFIG_FILE_TMP"
#rm -rf "$V2RAY_CONFIG_FILE"
close_in_five close_in_five
fi fi
} }
@ -1482,7 +1585,7 @@ start_v2ray(){
cd /jffs/softcenter/bin cd /jffs/softcenter/bin
#export GOGC=30 #export GOGC=30
v2ray --config=/jffs/softcenter/ss/v2ray.json >/dev/null 2>&1 & v2ray --config=/jffs/softcenter/ss/v2ray.json >/dev/null 2>&1 &
local V2PID
local i=10 local i=10
until [ -n "$V2PID" ] until [ -n "$V2PID" ]
do do
@ -1511,7 +1614,7 @@ write_cron_job(){
cru a ssnodeupdate "0 $ss_basic_node_update_hr * * * /jffs/softcenter/scripts/ss_online_update.sh 3" cru a ssnodeupdate "0 $ss_basic_node_update_hr * * * /jffs/softcenter/scripts/ss_online_update.sh 3"
echo_date "设置订阅服务器自动更新订阅服务器在每天 $ss_basic_node_update_hr 点。" echo_date "设置订阅服务器自动更新订阅服务器在每天 $ss_basic_node_update_hr 点。"
else else
cru a ssnodeupdate "0 $ss_basic_node_update_hr * * ss_basic_node_update_day /jffs/softcenter/scripts/ss_online_update.sh 3" cru a ssnodeupdate "0 $ss_basic_node_update_hr * * $ss_basic_node_update_day /jffs/softcenter/scripts/ss_online_update.sh 3"
echo_date "设置订阅服务器自动更新订阅服务器在星期 $ss_basic_node_update_day 的 $ss_basic_node_update_hr 点。" echo_date "设置订阅服务器自动更新订阅服务器在星期 $ss_basic_node_update_day 的 $ss_basic_node_update_hr 点。"
fi fi
fi fi
@ -1635,7 +1738,7 @@ add_white_black_ip(){
fi fi
if [ -n "$ss_wan_black_ip" ];then if [ -n "$ss_wan_black_ip" ];then
ss_wan_black_ip=`dbus get ss_wan_black_ip|base64_decode|sed '/\#/d'` ss_wan_black_ip=`echo $ss_wan_black_ip|base64_decode|sed '/\#/d'`
echo_date 应用IP/CIDR黑名单 echo_date 应用IP/CIDR黑名单
for ip in $ss_wan_black_ip for ip in $ss_wan_black_ip
do do
@ -1734,11 +1837,11 @@ lan_acess_control(){
if [ -n "$acl_nu" ]; then if [ -n "$acl_nu" ]; then
for acl in $acl_nu for acl in $acl_nu
do do
ipaddr=`dbus get ss_acl_ip_$acl` ipaddr=$(eval echo \$ss_acl_ip_$acl)
ipaddr_hex=`dbus get ss_acl_ip_$acl | awk -F "." '{printf ("0x%02x", $1)} {printf ("%02x", $2)} {printf ("%02x", $3)} {printf ("%02x\n", $4)}'` ipaddr_hex=$(echo $ipaddr | awk -F "." '{printf ("0x%02x", $1)} {printf ("%02x", $2)} {printf ("%02x", $3)} {printf ("%02x\n", $4)}')
ports=`dbus get ss_acl_port_$acl` ports=$(eval echo \$ss_acl_port_$acl)
proxy_mode=`dbus get ss_acl_mode_$acl` proxy_mode=$(eval echo \$ss_acl_mode_$acl)
proxy_name=`dbus get ss_acl_name_$acl` proxy_name=$(eval echo \$ss_acl_name_$acl)
if [ "$ports" == "all" ];then if [ "$ports" == "all" ];then
ports="" ports=""
echo_date 加载ACL规则：【$ipaddr】【全部端口】模式为：$(get_mode_name $proxy_mode) echo_date 加载ACL规则：【$ipaddr】【全部端口】模式为：$(get_mode_name $proxy_mode)
@ -1914,8 +2017,7 @@ set_ulimit(){
remove_ss_reboot_job(){ remove_ss_reboot_job(){
if [ -n "`cru l|grep ss_reboot`" ]; then if [ -n "`cru l|grep ss_reboot`" ]; then
echo_date 删除插件自动重启定时任务... echo_date "【科学上网】：删除插件自动重启定时任务..."
#cru d ss_reboot >/dev/null 2>&1
sed -i '/ss_reboot/d' /var/spool/cron/crontabs/* >/dev/null 2>&1 sed -i '/ss_reboot/d' /var/spool/cron/crontabs/* >/dev/null 2>&1
fi fi
} }
@ -1924,51 +2026,51 @@ set_ss_reboot_job(){
if [[ "${ss_reboot_check}" == "0" ]]; then if [[ "${ss_reboot_check}" == "0" ]]; then
remove_ss_reboot_job remove_ss_reboot_job
elif [[ "${ss_reboot_check}" == "1" ]]; then elif [[ "${ss_reboot_check}" == "1" ]]; then
echo_date 设置每天${ss_basic_time_hour}时${ss_basic_time_min}分重启插件... echo_date "【科学上网】：设置每天${ss_basic_time_hour}时${ss_basic_time_min}分重启插件..."
cru a ss_reboot ${ss_basic_time_min} ${ss_basic_time_hour}" * * * /jffs/softcenter/ss/ssconfig.sh restart" cru a ss_reboot ${ss_basic_time_min} ${ss_basic_time_hour}" * * * /bin/sh/jffs/softcenter/ss/ssconfig.sh restart"
elif [[ "${ss_reboot_check}" == "2" ]]; then elif [[ "${ss_reboot_check}" == "2" ]]; then
echo_date 设置每周${ss_basic_week}的${ss_basic_time_hour}时${ss_basic_time_min}分重启插件... echo_date "【科学上网】：设置每周${ss_basic_week}的${ss_basic_time_hour}时${ss_basic_time_min}分重启插件..."
cru a ss_reboot ${ss_basic_time_min} ${ss_basic_time_hour}" * * "${ss_basic_week}" /jffs/softcenter/ss/ssconfig.sh restart" cru a ss_reboot ${ss_basic_time_min} ${ss_basic_time_hour}" * * "${ss_basic_week}" /bin/sh /jffs/softcenter/ss/ssconfig.sh restart"
elif [[ "${ss_reboot_check}" == "3" ]]; then elif [[ "${ss_reboot_check}" == "3" ]]; then
echo_date 设置每月${ss_basic_day}日${ss_basic_time_hour}时${ss_basic_time_min}分重启插件... echo_date "【科学上网】：设置每月${ss_basic_day}日${ss_basic_time_hour}时${ss_basic_time_min}分重启插件..."
cru a ss_reboot ${ss_basic_time_min} ${ss_basic_time_hour} ${ss_basic_day}" * * /jffs/softcenter/ss/ssconfig.sh restart" cru a ss_reboot ${ss_basic_time_min} ${ss_basic_time_hour} ${ss_basic_day}" * * /bin/sh /jffs/softcenter/ss/ssconfig.sh restart"
elif [[ "${ss_reboot_check}" == "4" ]]; then elif [[ "${ss_reboot_check}" == "4" ]]; then
if [[ "${ss_basic_inter_pre}" == "1" ]]; then if [[ "${ss_basic_inter_pre}" == "1" ]]; then
echo_date 设置每隔${ss_basic_inter_min}分钟重启插件... echo_date "【科学上网】：设置每隔${ss_basic_inter_min}分钟重启插件..."
cru a ss_reboot "*/"${ss_basic_inter_min}" * * * * /jffs/softcenter/ss/ssconfig.sh restart" cru a ss_reboot "*/"${ss_basic_inter_min}" * * * * /bin/sh /jffs/softcenter/ss/ssconfig.sh restart"
elif [[ "${ss_basic_inter_pre}" == "2" ]]; then elif [[ "${ss_basic_inter_pre}" == "2" ]]; then
echo_date 设置每隔${ss_basic_inter_hour}小时重启插件... echo_date "【科学上网】：设置每隔${ss_basic_inter_hour}小时重启插件..."
cru a ss_reboot "0 */"${ss_basic_inter_hour}" * * * /jffs/softcenter/ss/ssconfig.sh restart" cru a ss_reboot "0 */"${ss_basic_inter_hour}" * * * /bin/sh /jffs/softcenter/ss/ssconfig.sh restart"
elif [[ "${ss_basic_inter_pre}" == "3" ]]; then elif [[ "${ss_basic_inter_pre}" == "3" ]]; then
echo_date 设置每隔${ss_basic_inter_day}天${ss_basic_inter_hour}小时${ss_basic_time_min}分钟重启插件... echo_date "【科学上网】：设置每隔${ss_basic_inter_day}天${ss_basic_inter_hour}小时${ss_basic_time_min}分钟重启插件..."
cru a ss_reboot ${ss_basic_time_min} ${ss_basic_time_hour}" */"${ss_basic_inter_day} " * * /jffs/softcenter/ss/ssconfig.sh restart" cru a ss_reboot ${ss_basic_time_min} ${ss_basic_time_hour}" */"${ss_basic_inter_day} " * * /bin/sh /jffs/softcenter/ss/ssconfig.sh restart"
fi fi
elif [[ "${ss_reboot_check}" == "5" ]]; then elif [[ "${ss_reboot_check}" == "5" ]]; then
check_custom_time=`dbus get ss_basic_custom | base64_decode` check_custom_time=`echo ss_basic_custom | base64_decode`
echo_date 设置每天${check_custom_time}时的${ss_basic_time_min}分重启插件... echo_date "【科学上网】：设置每天${check_custom_time}时的${ss_basic_time_min}分重启插件..."
cru a ss_reboot ${ss_basic_time_min} ${check_custom_time}" * * * /jffs/softcenter/ss/ssconfig.sh restart" cru a ss_reboot ${ss_basic_time_min} ${check_custom_time}" * * * /bin/sh /jffs/softcenter/ss/ssconfig.sh restart"
else
remove_ss_reboot_job
fi fi
} }
remove_ss_trigger_job(){ remove_ss_trigger_job(){
if [ -n "`cru l|grep ss_tri_check`" ]; then if [ -n "`cru l|grep ss_tri_check`" ]; then
echo_date 删除插件触发重启定时任务... echo_date "删除插件触发重启定时任务..."
#cru d ss_tri_check >/dev/null 2>&1
sed -i '/ss_tri_check/d' /var/spool/cron/crontabs/* >/dev/null 2>&1 sed -i '/ss_tri_check/d' /var/spool/cron/crontabs/* >/dev/null 2>&1
else
echo_date "插件触发重启定时任务已经删除..."
fi fi
} }
set_ss_trigger_job(){ set_ss_trigger_job(){
if [ "$ss_basic_tri_reboot_time" == "0" ] || [ -z "$ss_basic_tri_reboot_time" ];then if [ "$ss_basic_tri_reboot_time" == "0" ];then
remove_ss_trigger_job remove_ss_trigger_job
else else
if [ "$ss_basic_tri_reboot_policy" == "1" ];then if [ "$ss_basic_tri_reboot_policy" == "1" ];then
echo_date 设置每隔$ss_basic_tri_reboot_time分钟检查服务器IP地址，如果IP发生变化，则重启科学上网插件... echo_date "设置每隔$ss_basic_tri_reboot_time分钟检查服务器IP地址，如果IP发生变化，则重启科学上网插件..."
else else
echo_date 设置每隔$ss_basic_tri_reboot_time分钟检查服务器IP地址，如果IP发生变化，则重启dnsmasq... echo_date "设置每隔$ss_basic_tri_reboot_time分钟检查服务器IP地址，如果IP发生变化，则重启dnsmasq..."
fi fi
echo_date "科学上网插件触发重启功能的日志将显示再系统日志内。"
cru d ss_tri_check >/dev/null 2>&1 cru d ss_tri_check >/dev/null 2>&1
cru a ss_tri_check "*/$ss_basic_tri_reboot_time * * * * /jffs/softcenter/scripts/ss_reboot_job.sh check_ip" cru a ss_tri_check "*/$ss_basic_tri_reboot_time * * * * /jffs/softcenter/scripts/ss_reboot_job.sh check_ip"
fi fi
@ -2010,6 +2112,7 @@ ss_post_start(){
ss_pre_stop(){ ss_pre_stop(){
# 在SS插件关闭前触发脚本 # 在SS插件关闭前触发脚本
local i
mkdir -p /jffs/softcenter/ss/postscripts && cd /jffs/softcenter/ss/postscripts mkdir -p /jffs/softcenter/ss/postscripts && cd /jffs/softcenter/ss/postscripts
for i in $(find ./ -name 'P*' | sort -r) ; for i in $(find ./ -name 'P*' | sort -r) ;
do do
@ -2023,6 +2126,7 @@ ss_pre_stop(){
} }
detect(){ detect(){
MODEL=`nvram get productid`
# 检测jffs2脚本是否开启，如果没有开启，将会影响插件的自启和DNS部分（dnsmasq.postconf） # 检测jffs2脚本是否开启，如果没有开启，将会影响插件的自启和DNS部分（dnsmasq.postconf）
if [ "`nvram get jffs2_scripts`" != "1" ];then if [ "`nvram get jffs2_scripts`" != "1" ];then
echo_date "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" echo_date "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
@ -2032,6 +2136,22 @@ detect(){
echo_date "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" echo_date "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
close_in_five close_in_five
fi fi
#检测v2ray模式下是否启用虚拟内存
if [ "$ss_basic_type" == "3" -a -z "$WAN_ACTION" ];then
if [ "$MODEL" != "BLUECAVE" ];then
SWAPSTATUS=`free|grep Swap|awk '{print $2}'`
if [ "$SWAPSTATUS" != "0" ];then
echo_date "你选择了v2ray节点，当前系统已经启用虚拟内存！！符合启动条件！"
else
echo_date "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
echo_date "+ 你选择了v2ray节点，而当前系统未启用虚拟内存！ +"
echo_date "+ v2ray程序对路由器开销极大，请挂载虚拟内存后再开启！ +"
echo_date "+ 如果使用 ws + tls + web 方案，建议1G虚拟内存，以保证稳定！ +"
echo_date "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
close_in_five
fi
fi
fi
# 检测是否在lan设置中是否自定义过dns,如果有给干掉 # 检测是否在lan设置中是否自定义过dns,如果有给干掉
if [ -n "`nvram get dhcp_dns1_x`" ];then if [ -n "`nvram get dhcp_dns1_x`" ];then
@ -2059,7 +2179,7 @@ umount_dnsmasq(){
mount_dnsmasq_now(){ mount_dnsmasq_now(){
MOUNTED=`mount|grep -o dnsmasq` local MOUNTED=`mount|grep -o dnsmasq`
case $ss_basic_dnsmasq_fastlookup in case $ss_basic_dnsmasq_fastlookup in
0) 0)
if [ -n "$MOUNTED" ];then if [ -n "$MOUNTED" ];then
@ -2076,7 +2196,7 @@ mount_dnsmasq_now(){
fi fi
;; ;;
2) 2)
if [ -L "/jffs/configs/cdn.conf" ];then if [ -L "/tmp/etc/dnsmasq.user/cdn.conf" ];then
if [ -z "$MOUNTED" ];then if [ -z "$MOUNTED" ];then
echo_date "【dnsmasq替换】：检测到cdn.conf，用dnsmasq-fastlookup替换原版dnsmasq！" echo_date "【dnsmasq替换】：检测到cdn.conf，用dnsmasq-fastlookup替换原版dnsmasq！"
mount_dnsmasq mount_dnsmasq
@ -2094,7 +2214,7 @@ mount_dnsmasq_now(){
} }
umount_dnsmasq_now(){ umount_dnsmasq_now(){
MOUNTED=`mount|grep -o dnsmasq` local MOUNTED=`mount|grep -o dnsmasq`
case $ss_basic_dnsmasq_fastlookup in case $ss_basic_dnsmasq_fastlookup in
0|1|2) 0|1|2)
if [ -n "$MOUNTED" ];then if [ -n "$MOUNTED" ];then
@ -2114,6 +2234,8 @@ umount_dnsmasq_now(){
} }
disable_ss(){ disable_ss(){
get_config
ss_pre_stop
echo_date ======================= 梅林固件 - 【科学上网】 ======================== echo_date ======================= 梅林固件 - 【科学上网】 ========================
echo_date echo_date
echo_date ------------------------- 关闭【科学上网】 ----------------------------- echo_date ------------------------- 关闭【科学上网】 -----------------------------
@ -2135,11 +2257,12 @@ disable_ss(){
apply_ss(){ apply_ss(){
# router is on boot # router is on boot
WAN_ACTION=`ps|grep /jffs/scripts/wan-start|grep -v grep` WAN_ACTION=`ps|grep /jffs/scripts/wan-start|grep -v grep`
get_config
ss_pre_stop
# now stop first # now stop first
echo_date ======================= 梅林固件 - 【科学上网】 ======================== echo_date ======================= 梅林固件 - 【科学上网】 ========================
echo_date echo_date
echo_date ------------------------- 启动【科学上网】 ----------------------------- echo_date ------------------------- 启动【科学上网】 -----------------------------
ss_pre_stop
nvram set ss_mode=0 nvram set ss_mode=0
dbus set dns2socks=0 dbus set dns2socks=0
nvram commit nvram commit
@ -2157,6 +2280,7 @@ apply_ss(){
# start # start
#echo_date ------------------------- 启动 【科学上网】 ---------------------------- #echo_date ------------------------- 启动 【科学上网】 ----------------------------
detect detect
set_ulimit
resolv_server_ip resolv_server_ip
ss_arg ss_arg
load_module load_module
@ -2179,6 +2303,7 @@ apply_ss(){
write_cron_job write_cron_job
set_ss_reboot_job set_ss_reboot_job
set_ss_trigger_job set_ss_trigger_job
write_numbers
# post-start # post-start
ss_post_start ss_post_start
echo_date ------------------------ 【科学上网】 启动完毕 ------------------------ echo_date ------------------------ 【科学上网】 启动完毕 ------------------------
@ -2222,37 +2347,29 @@ start)
set_lock set_lock
if [ "$ss_basic_enable" == "1" ];then if [ "$ss_basic_enable" == "1" ];then
logger "[软件中心]: 启动科学上网插件！" logger "[软件中心]: 启动科学上网插件！"
set_ulimit >> "$LOG_FILE"
apply_ss >> "$LOG_FILE" apply_ss >> "$LOG_FILE"
write_numbers >> "$LOG_FILE"
else else
logger "[软件中心]: 科学上网插件未开启，不启动！" logger "[软件中心]: 科学上网插件未开启，不启动！"
fi fi
#get_status >> /tmp/ss_start.txt
unset_lock unset_lock
;; ;;
stop) stop)
set_lock set_lock
ss_pre_stop
disable_ss disable_ss
echo_date echo_date
echo_date 你已经成功关闭shadowsocks服务~ echo_date 你已经成功关闭科学上网服务~
echo_date See you again! echo_date See you again!
echo_date echo_date
echo_date ======================= 梅林固件 - 【科学上网】 ======================== echo_date ======================= 梅林固件 - 【科学上网】 ========================
#get_status >> /tmp/ss_start.txt
unset_lock unset_lock
;; ;;
restart) restart)
set_lock set_lock
set_ulimit
apply_ss apply_ss
write_numbers
echo_date echo_date
echo_date "Across the Great Wall we can reach every corner in the world!" echo_date "Across the Great Wall we can reach every corner in the world!"
echo_date echo_date
echo_date ======================= 梅林固件 - 【科学上网】 ======================== echo_date ======================= 梅林固件 - 【科学上网】 ========================
#get_status >> /tmp/ss_start.txt
unset_lock unset_lock
;; ;;
flush_nat) flush_nat)
@ -2263,11 +2380,11 @@ flush_nat)
*) *)
set_lock set_lock
if [ "$ss_basic_enable" == "1" ];then if [ "$ss_basic_enable" == "1" ];then
set_ulimit logger "[软件中心]: 启动科学上网插件！"
apply_ss apply_ss >> "$LOG_FILE"
write_numbers else
logger "[软件中心]: 科学上网插件未开启，不启动！"
fi fi
#get_status >> /tmp/ss_start.txt
unset_lock unset_lock
;; ;;
esac esac

2
shadowsocks/shadowsocks/webs/Main_Ss_Content.asp
View File

@ -447,6 +447,7 @@ function push_data(obj) {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: '/applydb.cgi?p=ss', url: '/applydb.cgi?p=ss',
contentType: "application/x-www-form-urlencoded",
dataType: 'text', dataType: 'text',
data: $.param(obj), data: $.param(obj),
success: function(response) { success: function(response) {
@ -1296,6 +1297,7 @@ function add_ss_node_conf(flag) { //点击添加按钮动作
} }
$.ajax({ $.ajax({
url: '/applydb.cgi?p=ssconf_basic', url: '/applydb.cgi?p=ssconf_basic',
contentType: "application/x-www-form-urlencoded",
dataType: 'text', dataType: 'text',
data: $.param(ns), data: $.param(ns),
success: function(response) { success: function(response) {

2
shadowsocks/version
View File

@ -1,2 +1,2 @@
4.1.7 4.1.7
f8b25718146bccb438bd70d111f222fa 9674685d2e3f867c32d07d13c1c354cd

4
softcenter/app.json.js
View File

@ -11,10 +11,10 @@
"version": "0.2.3" "version": "0.2.3"
}, },
{ {
"build_date": "2019-01-25_00:00:12", "build_date": "2019-01-27_20:20:28",
"description": "科学上网", "description": "科学上网",
"home_url": "Main_Ss_Content.asp", "home_url": "Main_Ss_Content.asp",
"md5": "f8b25718146bccb438bd70d111f222fa", "md5": "9674685d2e3f867c32d07d13c1c354cd",
"name": "shadowsocks", "name": "shadowsocks",
"tar_url": "shadowsocks/shadowsocks.tar.gz", "tar_url": "shadowsocks/shadowsocks.tar.gz",
"title": "科学上网", "title": "科学上网",