OpenWrt/kiddin9-packages
1
0
Fork 0
mirror of https://github.com/kiddin9/openwrt-packages.git synced 2025-01-09 10:07:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
github-actions[bot] 2021-03-15 12:18:31 +00:00
parent 3ee3f8c064
commit b57a92fe6f
35 changed files with 191 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UnblockNeteaseMusic-Go/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=0.2.7
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/cnsilvan/UnblockNeteaseMusic/tar.gz/$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/cnsilvan/UnblockNeteaseMusic/tar.gz/$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=GPL-3.0

2
brook/Makefile
View File

@ -12,7 +12,7 @@ PKG_VERSION:=20210214
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/txthinking/brook/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/txthinking/brook/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=skip
PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>

2
cdnspeedtest/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=1.4.9
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/XIU2/CloudflareSpeedTest/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/XIU2/CloudflareSpeedTest/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=GPL-3.0

2
cpp-httplib/Makefile
View File

@ -14,7 +14,7 @@ PKG_VERSION:=0.5.7
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/yhirose/cpp-httplib/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/yhirose/cpp-httplib/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=MIT

2
cxxopts/Makefile
View File

@ -12,7 +12,7 @@ PKG_VERSION:=2.2.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/jarro2783/cxxopts/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/jarro2783/cxxopts/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=MIT

2
gost/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=2.11.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/ginuerzh/gost/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/ginuerzh/gost/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=MIT

2
gotop/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=4.1.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/xxxserxxx/gotop/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/xxxserxxx/gotop/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=MIT

2
gowebdav/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=0.0.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/1715173329/gowebdav/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/1715173329/gowebdav/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=0a6a2af4f24905ffea247b6044d01129d938af4b3a256bf19b42c52bb452f947
PKG_MAINTAINER:=CN_SZTL <cnsztl@immortalwrt.org>

2
ipt2socks-alt/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=1.0.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/zfl9/ipt2socks/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/zfl9/ipt2socks/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=skip
PKG_BUILD_DIR:=$(BUILD_DIR)/$(firstword $(subst -, ,$(PKG_NAME)))-$(PKG_VERSION)

2
jpcre2/Makefile
View File

@ -12,7 +12,7 @@ PKG_VERSION:=10.32.01
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/jpcre2/jpcre2/tar.gz/$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/jpcre2/jpcre2/tar.gz/$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=BSD 3-Clause

2
luci-app-bypass/Makefile
View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-bypass
PKG_VERSION:=1.2
PKG_RELEASE:=57
PKG_RELEASE:=58
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

345
luci-app-bypass/root/etc/init.d/bypass
View File

@ -28,12 +28,12 @@ server_count=0
STATUS=Y
uci_get_by_name() {
uci_get_by_name(){
ret=$(uci -q get $NAME.$1.$2)
echo ${ret:=$3}
}
uci_get_by_type() {
uci_get_by_type(){
ret=$(uci -q get $NAME.@$1[0].$2)
echo ${ret:=$3}
}
@ -43,9 +43,8 @@ gfw_mode=$(uci_get_by_type global gfw_mode 0)
run_mode=$(uci_get_by_type global run_mode router)
SO_SERVER=$(uci_get_by_type socks5_proxy server 0)
dns_mode_d=$(uci_get_by_type global dns_mode_d doh)
threads=$(uci_get_by_type global threads 0)
[ $threads = 0 ] && threads=$(cat /proc/cpuinfo | grep 'processor' | wc -l)
firstdown() {
firstdown(){
[ $1 = 1 ] && A=$BIN_DIR/checknetwork && B=check
[ $1 = 2 ] && A=$BIN_DIR/update && B=--First
r=1
@ -57,12 +56,12 @@ firstdown() {
service_start ${A} ${B}
}
echolog() {
echolog(){
local d="$(date "+%Y-%m-%d %H:%M:%S")"
echo -e "$d: $*" >>$LOG
}
f_bin() {
f_bin(){
case $1 in
ss) ret=$(which ss-redir) ;;
ss-local) ret=$(which ss-local) ;;
@ -70,16 +69,16 @@ f_bin() {
ssr) ret=$(which ssr-redir) ;;
ssr-local) ret=$(which ssr-local) ;;
ssr-server) ret=$(which ssr-server) ;;
vmess | vless) ret=$(which xray) || ret=$(which v2ray) ;;
vmess|vless) ret=$(which xray) || ret=$(which v2ray) ;;
trojan) ret=$(which trojan-plus) ;;
trojan-go) ret=$(which trojan-go) ;;
naiveproxy) ret=$(which naive) ;;
socks5 | tun) ret=$(which redsocks2) ;;
socks5|tun) ret=$(which redsocks2) ;;
esac
echo ${ret:=0}
}
gen_config_file() {
gen_config_file(){
type=$(uci_get_by_name $1 type)
rtype=$2
ssport=$3
@ -116,7 +115,7 @@ gen_config_file() {
}
EOF
plugin=$(uci_get_by_name $1 plugin 0)
if [ $plugin != 0 -a -x "$(which $plugin)" ]; then
if [ $plugin != 0 -a -x "$(which $plugin)" ];then
sed -i "s@$hostip\",@$hostip\",\n\"plugin\":\"$plugin\",\n\"plugin_opts\":\"$(uci_get_by_name $1 plugin_opts)\",@" $config_file
fi
;;
@ -148,15 +147,15 @@ gen_config_file() {
}
EOF
;;
vmess | vless)
vmess|vless)
[ $rtype = udp ] && smode=udp || smode=tcp
[ $rtype = socks ] && lport=0
lua $BIN_DIR/genv2config $1 $smode $lport $ssport $serv_ip >$config_file
sed -i 's/\\//g' $config_file
;;
trojan | trojan-go)
trojan|trojan-go)
case "$rtype" in
tcp | udp | nf) smode="nat" ;;
tcp|udp|nf) smode="nat" ;;
socks) smode="client" ;;
esac
lua $BIN_DIR/gentrojanconfig $1 $smode $lport $serv_ip $threads >$config_file
@ -165,7 +164,7 @@ gen_config_file() {
esac
}
start_dns() {
start_dns(){
$(which smartdns) -c $DNS_T
case $dns_mode_o in
doh)
@ -186,37 +185,44 @@ start_dns() {
echolog "SmartDNS : Use $udp_dns_d to start in UDP mode (Domestic DNS)"
;;
esac
if [ $run_mode = router ]; then
if [ $run_mode = router ];then
service_start $(which chinadns-ng) -l 5337 -c '127.0.0.1#5336' -t '127.0.0.1#5335' -4 china_v4 -6 china_v6 -f -n $([ $gfw_mode = 1 ] && echo -g /tmp/bypass/gfw.list)
echolog "ChinaDNS : Start ChinaDNS-NG successful!"
fi
}
preload() {
if [ "$dns_a" = 1 -o "$dns_b" = 1 ]; then
preload(){
if [ "$dns_a" = 1 -o "$dns_b" = 1 ];then
[ "$dns_a" = 1 ] || doh_o_dom=
[ "$dns_b" = 1 ] || doh_nf_dom=
X=ns
Y=$doh_o_dom
Z=$doh_nf_dom
elif [ $run_mode = all -a "$dns_c" = 1 ]; then
elif [ $run_mode = all -a "$dns_c" = 1 ];then
X=ns
Y=$doh_d_dom
fi
service_start $BIN_DIR/by-preload $run_mode $X $Y $Z
}
rules() {
rules(){
[ -n "$GLOBAL_SERVER" ] || return 1
if ps -w | grep by-retcp | grep -v grep >/dev/null; then
if ps -w | grep by-retcp | grep -v grep >/dev/null;then
echolog "Bypass has Started."
return 1
fi
if ! cat $LOG 2>/dev/null | sed -n '$p' | grep -q 'Check network status...' && ! cat $LOG 2>/dev/null | sed -n '$p' | grep -q 'Download IP/GFW files...'; then
if ! cat $LOG 2>/dev/null | sed -n '$p' | grep -q 'Check network status...' && ! cat $LOG 2>/dev/null | sed -n '$p' | grep -q 'Download IP/GFW files...';then
[ -s $LOG ] && echo '------------------------------------------------------------------------------------------------------------------------------------------------------------' >>$LOG
echolog "Check network status..."
fi
if ! curl -so /dev/null -m 3 www.baidu.com; then
if netstat -unlp | grep smartdns | grep -q :5336;then
cat <<-EOF >> $FWI
iptables -t nat -I OUTPUT -p tcp --dport 53 -m comment --comment _SS_SPEC_RULE_ -j REDIRECT --to-ports 5336
iptables -t nat -I OUTPUT -p udp --dport 53 -m comment --comment _SS_SPEC_RULE_ -j REDIRECT --to-ports 5336
EOF
sh $FWI
fi
if ! curl -so /dev/null -m 3 www.baidu.com;then
echolog "Wait for network to connect..."
firstdown 1
exit 1
@ -226,7 +232,7 @@ rules() {
echolog "Check IP/GFW files..."
)
mkdir -p /var/run $TMP_PATH
if [ ! -s /tmp/bypass/china.txt ] || [ $run_mode = router -a ! -s /tmp/bypass/china_v6.txt ] || ([ $run_mode = gfw -o $gfw_mode = 1 ] && [ ! -s /tmp/bypass/gfw.list ]); then
if [ ! -s /tmp/bypass/china.txt ] || [ $run_mode = router -a ! -s /tmp/bypass/china_v6.txt ] || ([ $run_mode = gfw -o $gfw_mode = 1 ] && [ ! -s /tmp/bypass/gfw.list ]);then
echolog "Download IP/GFW files..."
firstdown 2
exit 1
@ -236,21 +242,17 @@ rules() {
[ $kcp_enable = 1 ] && kcp_server=$server
UDP_RELAY_SERVER=$(uci_get_by_type global udp_relay_server)
[ "$UDP_RELAY_SERVER" = same ] && UDP_RELAY_SERVER=$GLOBAL_SERVER
if [ "$(uci_get_by_name $UDP_RELAY_SERVER kcp_enable 0)" = 1 ]; then
if [ "$(uci_get_by_name $UDP_RELAY_SERVER kcp_enable 0)" = 1 ];then
echolog "UDP Relay: Can't use KCPTUN to start as UDP Relay Server!"
UDP_RELAY_SERVER=
fi
NF_SERVER=$(uci_get_by_type global nf_server)
[ "$NF_SERVER" = $GLOBAL_SERVER ] && NF_SERVER=
start_rules && return 0 || return 1
}
start_rules() {
server=$(uci_get_by_name $GLOBAL_SERVER server)
if ! echo $server | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >/dev/null; then
if ! echo $server | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$">/dev/null;then
r=1
while ! A=$(nslookup $server 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$");do
if ! A=$(nslookup $server 223.5.5.5 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$"); then
if ! A=$(nslookup $server 223.5.5.5 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$");then
[ $r -ge 10 ] && echo "$(eval $DATE) Main Node: Unable to get $server address. Check domain name!" >>$L; return 1 || let r++
sleep 1
else
@ -262,16 +264,16 @@ start_rules() {
local_port=$(uci_get_by_name $GLOBAL_SERVER local_port 1234)
lan_ac_ips=$(uci_get_by_type access_control lan_ac_ips)
lan_ac_mode=$(uci_get_by_type access_control lan_ac_mode b)
if [ $GLOBAL_SERVER = "$UDP_RELAY_SERVER" ]; then
if [ $GLOBAL_SERVER = "$UDP_RELAY_SERVER" ];then
UDP=1
udp_server=$server
udp_local_port=$local_port
elif [ -n "$UDP_RELAY_SERVER" ]; then
elif [ -n "$UDP_RELAY_SERVER" ];then
udp_server=$(uci_get_by_name $UDP_RELAY_SERVER server)
if ! echo $udp_server | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >/dev/null; then
if ! echo $udp_server | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$">/dev/null;then
r=1
while ! A=$(nslookup $udp_server 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$");do
if ! A=$(nslookup $udp_server 223.5.5.5 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$"); then
if ! A=$(nslookup $udp_server 223.5.5.5 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$");then
[ $r -ge 10 ] && echo "$(eval $DATE) UDP Relay: Unable to get $udp_server address. Check domain name!" >>$L; return 1 || let r++
sleep 1
else
@ -284,7 +286,7 @@ start_rules() {
UDP=1
fi
ttype=$(uci_get_by_name $GLOBAL_SERVER type)
utype=$(uci_get_by_name $UDP_RELAY_SERVER type 0)
utype=$(uci_get_by_name $UDP_RELAY_SERVER type)
if [ "$UDP" = 1 ];then
[ $ttype = trojan -o $utype = trojan ] && [ $udp_local_port = $local_port ] && let udp_local_port=local_port+1;UDP="-S $udp_server -L $udp_local_port"
fi
@ -293,12 +295,12 @@ start_rules() {
oversea) mode=-c ;;
all) mode=-z ;;
esac
if [ -n "$NF_SERVER" -a $run_mode != oversea ]; then
if [ -n "$NF_SERVER" -a $run_mode != oversea ];then
nf_ip=$(uci_get_by_name $NF_SERVER server)
if ! echo $nf_ip | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >/dev/null; then
if ! echo $nf_ip | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$">/dev/null;then
r=1
while ! A=$(nslookup $nf_ip 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$");do
if ! A=$(nslookup $nf_ip 223.5.5.5 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$"); then
if ! A=$(nslookup $nf_ip 223.5.5.5 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$");then
[ $r -ge 10 ] && echo "$(eval $DATE) NF Shunt: Unable to get $nf_ip address. Check domain name!" >>$L; return 1 || let r++
sleep 1
else
@ -310,17 +312,18 @@ start_rules() {
ntype=$(uci_get_by_name $NF_SERVER type)
nf_local_port=$(uci_get_by_name $NF_SERVER local_port 1234)
[ $nf_local_port = $local_port ] && let nf_local_port=local_port+1
[ $utype = trojan -o $ntype = trojan ] && [ $nf_local_port = "$udp_local_port" ] && let nf_local_port=nf_local_port+1
[ "$utype" = trojan -o $ntype = trojan ] && [ $nf_local_port = "$udp_local_port" ] && let nf_local_port=nf_local_port+1
NF=1
fi
[ "$NF" = 1 ] && NF="-N $nf_ip -P $nf_local_port"
if [ -n "$lan_ac_ips" ]; then
if [ -n "$lan_ac_ips" ];then
case $lan_ac_mode in
w | W | b | B) local ac_ips="$lan_ac_mode$lan_ac_ips" ;;
w|W|b|B) local ac_ips="$lan_ac_mode$lan_ac_ips" ;;
esac
fi
dports=$(uci_get_by_type global dports 1)
if [ $dports = 2 ]; then
if [ $dports = 2 ];then
proxyport="-m multiport --dports 22,53,587,465,995,993,143,80,443,853,9418"
fi
r=1
@ -335,11 +338,11 @@ start_rules() {
echolog "Start iptables rules successful!"
}
start_retcp() {
start_retcp(){
rtype="tcp"
if [ $kcp_enable = 1 ]; then
if [ $kcp_enable = 1 ];then
cmd=$(which kcptun-client) || cmd=0
if [ ! -x $cmd ]; then
if [ ! -x $cmd ];then
echolog "Main Node: Can't find KCPTUN program, start failed!"
return 1
fi
@ -351,15 +354,17 @@ start_retcp() {
[ -n "$password" ] && password="--key "${password}
service_start $cmd -r $kcp_server:$kcp_port -l :$server_port $password $kcp_param
fi
threads=$(uci_get_by_type global threads 0)
[ $threads = 0 ] && threads=$(cat /proc/cpuinfo | grep 'processor' | wc -l)
cmd=$(f_bin $ttype)
if [ ! -x $cmd ]; then
if [ ! -x $cmd ];then
echolog "Main Node: Can't find $(echo $ttype | tr a-z A-Z) program, start failed!"
return 1
fi
[ $SO_SERVER = same ] && SO_SERVER=$GLOBAL_SERVER
redir_tcp=1
case $ttype in
ss | ssr)
ss|ssr)
gen_config_file $GLOBAL_SERVER $rtype
redir_tcp=$threads
for i in $(seq 1 $threads); do
@ -368,8 +373,8 @@ start_retcp() {
[ $ttype = ss ] && name=Shadowsocks || name=ShadowsocksR
echolog "Main Node: $name $threads Threads Started!"
;;
vmess | vless)
if [ $SO_SERVER = $GLOBAL_SERVER ]; then
vmess|vless)
if [ $SO_SERVER = $GLOBAL_SERVER ];then
port=$(uci_get_by_type socks5_proxy local_port 1080)
socks5_start=1
else
@ -379,13 +384,13 @@ start_retcp() {
$cmd -c $config_file >$log_file 2>&1 &
echolog "Main Node: $($cmd -version | head -1 | awk '{print$1,$2}') Started!"
if [ "$socks5_start" = 1 ]; then
if [ "$socks5_start" = 1 ];then
echolog "Socks5 Node: $($cmd -version | head -1 | awk '{print$1,$2}') Started!"
fi
;;
trojan | trojan-go)
trojan|trojan-go)
gen_config_file $GLOBAL_SERVER $rtype "" $server
if [ $type = trojan ]; then
if [ $type = trojan ];then
redir_tcp=$threads
for i in $(seq 1 $threads); do
$cmd --config $config_file >$log_file 2>&1 &
@ -424,27 +429,27 @@ start_retcp() {
esac
}
start_reudp() {
start_reudp(){
rtype="udp"
cmd=$(f_bin $utype)
if [ ! -x $cmd ]; then
if [ ! -x $cmd ];then
echolog "UDP Relay: Can't find $(echo $utype | tr a-z A-Z) program, start failed!"
return 1
fi
redir_udp=1
case $utype in
ss | ssr)
ss|ssr)
gen_config_file $UDP_RELAY_SERVER $rtype
$cmd -c $config_file -U >$log_file 2>&1 &
[ $utype = ss ] && name=Shadowsocks || name=ShadowsocksR
echolog "UDP Relay: $name Started!"
;;
vmess | vless)
vmess|vless)
gen_config_file $UDP_RELAY_SERVER $rtype 0 $udp_server
$cmd -c $config_file >$log_file 2>&1 &
echolog "UDP Relay: $($cmd -version | head -1 | awk '{print$1,$2}') Started!"
;;
trojan | trojan-go)
trojan|trojan-go)
gen_config_file $UDP_RELAY_SERVER $rtype "" $udp_server
$cmd --config $config_file >$log_file 2>&1 &
[ $utype = trojan ] && {
@ -454,7 +459,7 @@ start_reudp() {
name="Trojan-Go"
ver="$($cmd --version 2>&1 | head -1 | awk '{print$2}')"
}
echolog "Main Node: $name (Ver $ver) $threads Threads Started!"
echolog "UDP Relay: $name (Ver $ver) Started!"
;;
naiveproxy)
gen_config_file $UDP_RELAY_SERVER $rtype
@ -474,27 +479,27 @@ start_reudp() {
esac
}
start_renf() {
start_renf(){
rtype="nf"
cmd=$(f_bin $ntype)
if [ ! -x $cmd ]; then
if [ ! -x $cmd ];then
echolog "NF Shunt : Can't find $(echo $ntype | tr a-z A-Z) program, start failed!"
return 1
fi
redir_nf=1
case $ntype in
ss | ssr)
ss|ssr)
gen_config_file $NF_SERVER $rtype
$cmd -c $config_file >$log_file 2>&1 &
[ $ntype = ss ] && name=Shadowsocks || name=ShadowsocksR
echolog "NF Shunt : $name Started!"
;;
vmess | vless)
vmess|vless)
gen_config_file $NF_SERVER $rtype 0 $nf_ip
$cmd -c $config_file >$log_file 2>&1 &
echolog "NF Shunt : $($cmd -version | head -1 | awk '{print$1,$2}') Started!"
;;
trojan | trojan-go)
trojan|trojan-go)
gen_config_file $NF_SERVER $rtype "" $nf_ip
$cmd --config $config_file >$log_file 2>&1 &
[ $ntype = trojan ] && {
@ -504,7 +509,7 @@ start_renf() {
name="Trojan-Go"
ver="$($cmd --version 2>&1 | head -1 | awk '{print$2}')"
}
echolog "Main Node: $name (Ver $ver) $threads Threads Started!"
echolog "NF Shunt : $name (Ver $ver) Started!"
;;
naiveproxy)
gen_config_file $NF_SERVER $rtype
@ -525,14 +530,14 @@ start_renf() {
esac
}
start_local() {
start_local(){
rtype="socks"
[ $SO_SERVER = 0 -o "$socks5_start" = 1 ] && return
socks5_ip=$(uci_get_by_name $SO_SERVER server)
if ! echo $socks5_ip | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$" >/dev/null; then
if ! echo $socks5_ip | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$">/dev/null;then
r=1
while ! A=$(nslookup $socks5_ip 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$");do
if ! A=$(nslookup $socks5_ip 223.5.5.5 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$"); then
if ! A=$(nslookup $socks5_ip 223.5.5.5 2>/dev/null | grep Address | awk -F' ' '{print$NF}' | grep -E "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$");then
[ $r -ge 10 ] && echo "$(eval $DATE) Socks5 Node: Unable to get $socks5_ip address. Check domain name!" >>$L; return 1 || let r++
sleep 1
else
@ -543,25 +548,25 @@ start_local() {
fi
type=$(uci_get_by_name $SO_SERVER type)
[ $type = ss -o $type = ssr ] && cmd=$(f_bin $type-local) || cmd=$(f_bin $type)
if [ ! -x $cmd ]; then
if [ ! -x $cmd ];then
echolog "Socks5 Node: Can't find $(echo $type | tr a-z A-Z) program, start failed!"
return 1
fi
local_enable=1
socks5_port=$(uci_get_by_type socks5_proxy local_port 1080)
case $type in
ss | ssr)
ss|ssr)
gen_config_file $SO_SERVER $rtype
$cmd -c $config_file -u >/dev/null 2>&1 &
[ $type = ss ] && name=Shadowsocks || name=ShadowsocksR
echolog "Socks5 Node: $name Started!"
;;
vmess | vless)
vmess|vless)
gen_config_file $SO_SERVER $rtype $socks5_port $socks5_ip
$cmd -c $config_file >$log_file 2>&1 &
echolog "Socks5 Node: $($cmd -version | head -1 | awk '{print$1,$2}') Started!"
;;
trojan | trojan-go)
trojan|trojan-go)
gen_config_file $SO_SERVER $rtype "" $socks5_ip
$cmd --config $config_file >$log_file 2>&1 &
[ $type = trojan ] && {
@ -571,7 +576,7 @@ start_local() {
name="Trojan-Go"
ver="$($cmd --version 2>&1 | head -1 | awk '{print$2}')"
}
echolog "Main Node: $name (Ver $ver) $threads Threads Started!"
echolog "Socks5 Node: $name (Ver $ver) Started!"
;;
naiveproxy)
gen_config_file $SO_SERVER $rtype
@ -582,9 +587,9 @@ start_local() {
ipset add ss_spec_wan_ac $socks5_ip 2>/dev/null
}
gen_dns() {
gen_dns(){
dns_mode_o=$(uci_get_by_type global dns_mode_o doh)
if [ $dns_mode_o = "doh" ]; then
if [ $dns_mode_o = "doh" ];then
doh_dns_o=$(uci_get_by_type global doh_dns_o cloudflare)
case $doh_dns_o in
cloudflare)
@ -607,22 +612,22 @@ gen_dns() {
doh_o_a=$doh_dns_o
doh_o_b=$(echo $doh_dns_o | awk -F[/:] '{print$4}')
doh_o_b=$(echo $doh_o_b | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
if [ -z "$doh_o_b" ]; then
if [ -z "$doh_o_b" ];then
doh_o_b="1.1.1.1 1.0.0.1"
dns_a=1
fi;;
esac
for i in $doh_o_b; do
case $run_mode in
gfw | oversea) ipset add blacklist $i 2>/dev/null ;;
gfw|oversea) ipset add blacklist $i 2>/dev/null ;;
*) ipset del ss_spec_wan_ac $i 2>/dev/null || ipset add ss_spec_wan_ac $i nomatch 2>/dev/null ;;
esac
done
[ -n "$NF" ] && doh_dns_nf="google"
if [ "$doh_dns_nf" = $doh_dns_o ]; then
if [ "$doh_dns_nf" = $doh_dns_o ];then
doh_dns_nf="cloudflare"
fi
if [ -n "$NF" ]; then
if [ -n "$NF" ];then
case $doh_dns_nf in
cloudflare)
doh_nf_a="https://cloudflare-dns.com/dns-query"
@ -638,23 +643,23 @@ gen_dns() {
else
tcp_dns_o=$(uci_get_by_type global tcp_dns_o 1.1.1.1,1.0.0.1)
tcp_dns_o=$(echo $tcp_dns_o | sed -e 's/，/,/g' -e 's/。/./g' -e 's/：/:/g' -e 's/,/ /g')
if ! dns_tmp=$(echo $tcp_dns_o | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | grep -v 0.0.0.0 | grep -v 127.0.0.1); then
if ! dns_tmp=$(echo $tcp_dns_o | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | grep -v 0.0.0.0 | grep -v 127.0.0.1);then
echolog "SmartDNS : Get Foreign DNS failed!"
return 1
fi
for i in $dns_tmp; do
case $run_mode in
gfw | oversea) ipset add blacklist $i 2>/dev/null ;;
gfw|oversea) ipset add blacklist $i 2>/dev/null ;;
*) ipset del ss_spec_wan_ac $i 2>/dev/null || ipset add ss_spec_wan_ac $i nomatch 2>/dev/null ;;
esac
done
[ -n "$NF" ] && tcp_dns_nf="8.8.8.8 8.8.4.4"
if [ "$tcp_dns_nf" = "$tcp_dns_o" ]; then
if [ "$tcp_dns_nf" = "$tcp_dns_o" ];then
tcp_dns_nf="1.1.1.1,1.0.0.1"
fi
if [ -n "$NF" ]; then
if [ -n "$NF" ];then
tcp_dns_nf=$(echo $tcp_dns_nf | sed -e 's/，/,/g' -e 's/。/./g' -e 's/：/:/g' -e 's/,/\n/g')
if ! dns_tmp=$(echo $tcp_dns_nf | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | grep -v 0.0.0.0 | grep -v 127.0.0.1); then
if ! dns_tmp=$(echo $tcp_dns_nf | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" | grep -v 0.0.0.0 | grep -v 127.0.0.1);then
echolog "SmartDNS : Get Netflix DNS failed!"
return 1
fi
@ -662,7 +667,7 @@ gen_dns() {
fi
fi
if [ $dns_mode_d = "doh" ]; then
if [ $dns_mode_d = "doh" ];then
doh_dns_d=$(uci_get_by_type global doh_dns_d alidns)
case $doh_dns_d in
alidns)
@ -677,7 +682,7 @@ gen_dns() {
doh_d_a=$doh_dns_d
doh_d_b=$(echo $doh_dns_d | awk -F[/:] '{print$4}')
doh_d_b=$(echo $doh_d_b | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
if [ -z "$doh_d_b" ]; then
if [ -z "$doh_d_b" ];then
doh_d_b="223.5.5.5 223.6.6.6 2400:3200::1 2400:3200:baba::1"
dns_c=1
fi;;
@ -685,12 +690,12 @@ gen_dns() {
for i in $doh_d_b; do ipset add ss_spec_wan_ac $i 2>/dev/null; done
else
udp_dns_d=$(uci_get_by_type global udp_dns_d 223.5.5.5,223.6.6.6)
if [ "$udp_dns_d" = "isp" ]; then
if [ "$udp_dns_d" = "isp" ];then
ref=/tmp/resolv.conf.d/resolv.conf.auto
[ -s $ref ] || ref=/tmp/resolv.conf.auto
udp_dns_d=$(cat $ref 2>/dev/null | grep nameserver | awk '{print$2}')
fi
if [ -z "$udp_dns_d" ]; then
if [ -z "$udp_dns_d" ];then
echolog "SmartDNS : Get Domestic DNS failed!"
return 1
fi
@ -710,19 +715,19 @@ gen_dns() {
EOF
echo "bind :5335 -group a -no-dualstack-selection" >>$DNS_T
echo "bind :5336 -group e -no-rule-soa" >>$DNS_T
if [ $dns_mode_o = "doh" ]; then
if [ "$dns_a" = 1 ]; then
if [ $dns_mode_o = "doh" ];then
if [ "$dns_a" = 1 ];then
echo "server-https $doh_o_a -group a -exclude-default-group -check-edns" >>$DNS_T
for i in $doh_o_b; do echo "server-tcp $i -group b -exclude-default-group" >>$DNS_T; done
doh_o_dom=$(echo $doh_o_a | awk -F[/:] '{print$4}')
case $run_mode in
router | all) echo "nameserver /$doh_o_dom/b" >>$DNS_T ;;
router|all) echo "nameserver /$doh_o_dom/b" >>$DNS_T ;;
*) echo "domain-rules /$doh_o_dom/ -nameserver b -ipset blacklist" >>$DNS_T ;;
esac
else
echo $doh_o_a | sed 's/,/\n/g' | sed -e 's/^/server-https /g' -e 's/$/ -group a -exclude-default-group -check-edns/g' >>$DNS_T
fi
if [ -n "$NF" ]; then
if [ -n "$NF" ];then
echo "server-https $doh_nf_a -group c -exclude-default-group -check-edns" >>$DNS_T
for i in $doh_nf_b; do echo "server-tcp $i -group d -exclude-default-group" >>$DNS_T; done
doh_nf_dom=$(echo $doh_nf_a | awk -F[/:] '{print$4}')
@ -733,8 +738,8 @@ gen_dns() {
[ -n "$NF" ] && for i in $tcp_dns_nf; do echo "server-tcp $i -group c -exclude-default-group -check-edns" >>$DNS_T; done
fi
if [ $dns_mode_d = "doh" ]; then
if [ "$dns_c" = 1 ]; then
if [ $dns_mode_d = "doh" ];then
if [ "$dns_c" = 1 ];then
echo "server-https $doh_d_a -group e -exclude-default-group -check-edns" >>$DNS_T
for i in $doh_d_b; do echo "server $i -group f -exclude-default-group" >>$DNS_T; done
doh_d_dom=$(echo $doh_d_a | awk -F[/:] '{print$4}')
@ -747,28 +752,28 @@ gen_dns() {
fi
case $run_mode in
all) port=5335 ;;
gfw | oversea) port=5336 ;;
gfw|oversea) port=5336 ;;
*) port=5337 ;;
esac
cat >/tmp/dnsmasq.d/dnsmasq-by.conf <<-EOF
no-resolv
server=127.0.0.1#$port
EOF
if [ $run_mode = oversea ]; then
if [ $run_mode = oversea ];then
awk '!/^$/&&!/^#/{printf("server=/%s/'"127.0.0.1#5335"'\n",$0)}' /etc/bypass/oversea.list >$DNS_DIR/oversea.conf
[ "$dns_a" = 1 ] && echo "server=/$doh_o_dom/127.0.0.1#5335" >>$DNS_DIR/oversea.conf
else
if [ $run_mode != all ]; then
if [ $run_mode != all ];then
cp -f /etc/bypass/black.list $DNS_DIR/tmp
awk '!/^$/&&!/^#/{printf("server=/%s/'"127.0.0.1#5335"'\n",$0)}' $DNS_DIR/tmp >$DNS_DIR/black.conf
if [ $run_mode = gfw ]; then
if [ $run_mode = gfw ];then
[ "$dns_a" = 1 ] && echo "server=/$doh_o_dom/127.0.0.1#5335" >>$DNS_DIR/black.conf
cp -f /tmp/bypass/gfw.list $DNS_DIR/tmp
awk '!/^$/&&!/^#/{printf("server=/%s/'"127.0.0.1#5335"'\n",$0)}' $DNS_DIR/tmp >>$DNS_DIR/black.conf
fi
fi
if [ -s $DNS_DIR/black.conf ]; then
if [ -s $DNS_DIR/black.conf ];then
[ "$dns_b" = 1 ] && sed -i -e "/\/$doh_nf_dom/d" -e "/\.$doh_nf_dom/d" $DNS_DIR/black.conf
echo "$(sort -u $DNS_DIR/black.conf)" >$DNS_DIR/black.conf
sed -e 's/.*=/ipset /g' -e 's/127.0.0.1#5335/blacklist/g' $DNS_DIR/black.conf >$CON_T
@ -776,7 +781,7 @@ gen_dns() {
rm -f $DNS_DIR/black.conf
fi
if [ -n "$NF" ]; then
if [ -n "$NF" ];then
cp -f /etc/bypass/netflix.list $DNS_DIR/tmp
D=$(cat $DNS_DIR/tmp)
for i in $D; do
@ -784,14 +789,14 @@ gen_dns() {
sed -i -e "/\/$i\//d" -e "/\.$i\//d" $CON_T 2>/dev/null
echo "domain-rules /$i/ -nameserver c -ipset netflix" >>$CON_T
done
if [ $run_mode = gfw ]; then
if [ $run_mode = gfw ];then
awk '!/^$/&&!/^#/{printf("server=/%s/'"127.0.0.1#5335"'\n",$0)}' $DNS_DIR/tmp >>$DNS_DIR/black.conf
[ "$dns_b" = 1 ] && echo "server=/$doh_nf_dom/127.0.0.1#5335" >>$DNS_DIR/black.conf
fi
fi
[ $run_mode = all -a "$dns_c" = 1 ] && echo "server=/$doh_d_dom/127.0.0.1#5336" >$DNS_DIR/white.conf
if [ -s /etc/bypass/white.list ]; then
if [ -s /etc/bypass/white.list ];then
cp -f /etc/bypass/white.list $DNS_DIR/tmp
D=$(cat $DNS_DIR/tmp)
for i in $D; do
@ -806,28 +811,26 @@ gen_dns() {
rm -f $DNS_DIR/tmp
[ $(find $DNS_DIR -name \* -exec cat {} \; 2>/dev/null | wc -l) = 0 ] && rm -rf $DNS_DIR || echo conf-dir=$DNS_DIR >>/tmp/dnsmasq.d/dnsmasq-by.conf
[ $run_mode = router ] && chinadns_flag=1
if [ $STATUS = Y ]; then
killall -q -9 smartdns
start_dns
/etc/init.d/dnsmasq restart >/dev/null 2>&1
preload
fi
killall -q -9 smartdns
start_dns
/etc/init.d/dnsmasq restart >/dev/null 2>&1
preload
}
start_switch() {
if [ $(uci_get_by_type global enable_switch 0) = 1 -a -z "$switch_server" ]; then
start_switch(){
if [ $(uci_get_by_type global enable_switch 0) = 1 -a -z "$switch_server" ];then
service_start $BIN_DIR/by-switch start
switch_enable=1
fi
}
add_cron() {
if ! grep -q $LOG $CRON_FILE; then
add_cron(){
if ! grep -q $LOG $CRON_FILE;then
echo "0 1 * * * rm -f $LOG" >>$CRON_FILE
A=1
fi
if [ $(uci_get_by_type server_subscribe auto_update 0) = 1 ]; then
if ! grep -wq "$(uci_get_by_type server_subscribe auto_update_time 6) \* \* \* .*$BIN_DIR" $CRON_FILE; then
if [ $(uci_get_by_type server_subscribe auto_update 0) = 1 ];then
if ! grep -wq "$(uci_get_by_type server_subscribe auto_update_time 6) \* \* \* .*$BIN_DIR" $CRON_FILE;then
eval $CRON
echo "0 $(uci_get_by_type server_subscribe auto_update_time 6) * * * $BIN_DIR/update" >>$CRON_FILE
echo "5 $(uci_get_by_type server_subscribe auto_update_time 6) * * * $BIN_DIR/subscribe" >>$CRON_FILE
@ -839,15 +842,9 @@ add_cron() {
[ "$A" = 1 ] && /etc/init.d/cron restart
}
del_cron() {
grep -q bypass $CRON_FILE && sed -i '/bypass/d' $CRON_FILE && B=1
eval $CRON && B=1
[ "$B" = 1 ] && /etc/init.d/cron restart
}
gen_service_file() {
gen_service_file(){
[ $(uci_get_by_name $1 fast_open 0) = 1 ] && fast=true || fast=false
if [ $2 = ss ]; then
if [ $2 = ss ];then
cat <<-EOF >$3
{
"server":"0.0.0.0",
@ -859,7 +856,7 @@ gen_service_file() {
}
EOF
plugin=$(uci_get_by_name $1 plugin 0)
if [ $plugin != 0 -a -x "$(which $plugin)" ]; then
if [ $plugin != 0 -a -x "$(which $plugin)" ];then
sed -i "s@0.0.0.0\",@0.0.0.0\",\n\"plugin\":\"$plugin\",\n\"plugin_opts\":\"$(uci_get_by_name $1 plugin_opts)\",@" $3
fi
else
@ -880,7 +877,7 @@ gen_service_file() {
fi
}
run_server() {
run_server(){
[ $(uci_get_by_name $1 enable 0) = 0 ] && return 1
let server_count=server_count+1
[ $server_count = 1 ] && iptables-save -t filter | grep BY-SERVER-RULE >/dev/null || iptables -N BY-SERVER-RULE && iptables -t filter -I INPUT -j BY-SERVER-RULE
@ -891,7 +888,7 @@ run_server() {
pass=$(uci_get_by_name $1 password)
name=by-server_$server_count
case $type in
ss | ssr)
ss|ssr)
timeout=$(uci_get_by_name $1 timeout 60)
gen_service_file $1 $type $TMP_PATH/$name.json
$cmd -c $TMP_PATH/$name.json -u >/dev/null 2>&1 &
@ -899,9 +896,9 @@ run_server() {
echolog "SSR server: $name Server$server_count Started!"
;;
*)
if [ $(uci_get_by_name $1 auth_enable 0) = 1 ]; then
if [ $(uci_get_by_name $1 auth_enable 0) = 1 ];then
username=$(uci_get_by_name $1 username)
if [ -n "$username" ]; then
if [ -n "$username" ];then
param="$([ $(uci_get_by_name $1 auth_once 0) = 1 ] && echo -1) -u $username -P $pass"
else
echolog "SSR server: Socks5 User and pass must be used together!"
@ -917,9 +914,9 @@ run_server() {
return 0
}
gen_serv_include() {
gen_serv_include(){
[ -s $FWI ] || echo '#!/bin/sh' >$FWI
extract_rules() {
extract_rules(){
echo "*filter"
iptables-save -t filter | grep BY-SERVER-RULE | sed -e "s/^-A INPUT/-I INPUT/"
echo 'COMMIT'
@ -932,7 +929,7 @@ gen_serv_include() {
EOF
}
start_server() {
start_server(){
[ $(uci_get_by_type server_global enable_server 0) = 0 ] && return
mkdir -p $TMP_PATH
config_load $NAME
@ -940,23 +937,22 @@ start_server() {
gen_serv_include
}
start_monitor() {
if [ $(uci_get_by_type global monitor_enable 0) = 1 ]; then
start_monitor(){
if [ $(uci_get_by_type global monitor_enable 0) = 1 ];then
let total=redir_tcp+kcp_enable+redir_udp+redir_nf+smartdns_flag+chinadns_flag+local_enable+server_count+switch_enable
[ $total -gt 0 ] && service_start $BIN_DIR/by-monitor $redir_tcp $kcp_enable $redir_udp $redir_nf $smartdns_flag $chinadns_flag $local_enable $server_count
fi
}
start() {
if [ -n "$switch_server" ]; then
start(){
if [ -n "$switch_server" ];then
GLOBAL_SERVER=$switch_server
switch_enable=1
fi
if rules; then
if start_retcp; then
if rules;then
if start_retcp;then
[ -n "$UDP_RELAY_SERVER" ] && start_reudp
[ -n "$NF" ] && start_renf
gen_dns
start_switch
@ -969,14 +965,14 @@ start() {
rm -f $LOCK
}
stop() {
stop(){
kill -9 $(ps -w | grep by-rules | grep -v grep | awk '{print$1}') 2>/dev/null
kill -9 $(ps -w | grep gfw.b64 | grep -v grep | awk '{print$1}') 2>/dev/null
kill -9 $(ps -w | grep $BIN_DIR/checknetwork | grep -v grep | awk '{print$1}') 2>/dev/null
kill -9 $(ps -w | grep $BIN_DIR/update | grep -v grep | awk '{print$1}') 2>/dev/null
$BIN_DIR/by-rules -f
srulecount=$(iptables -nL | grep BY-SERVER-RULE | wc -l)
if [ $srulecount -gt 0 ]; then
if [ $srulecount -gt 0 ];then
iptables -F BY-SERVER-RULE
iptables -t filter -D INPUT -j BY-SERVER-RULE
iptables -X BY-SERVER-RULE 2>/dev/null
@ -984,81 +980,26 @@ stop() {
[ -z "$switch_server" ] && kill -9 $(ps -w | grep by-switch | grep -v grep | awk '{print$1}') 2>/dev/null
kill -9 $(ps -w | grep by-monitor | grep -v grep | awk '{print$1}') 2>/dev/null
kill -9 $(ps -w | grep by-preload | grep -v grep | awk '{print$1}') 2>/dev/null
kill -9 $(ps -w | grep smartdns | grep -v grep | awk '{print$1}') 2>/dev/null
kill -9 $(ps -w | grep chinadns-ng | grep -v grep | awk '{print$1}') 2>/dev/null
ps -w | grep -v "grep" | grep "$TMP_PATH" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 &
kill -9 $(ps -w | grep $TMP_PATH | grep -v grep | awk '{print$1}') 2>/dev/null
killall -q -9 kcptun-client microsocks chinadns-ng
rm -rf $DNS_DIR $TMP_PATH /tmp/dnsmasq.d/dnsmasq-by.conf $CON_T /var/lock/bypass.lock
[ $run_mode = gfw -o $gfw_mode = 1 ] || rm -f /tmp/bypass/gfw.list
[ $run_mode = router ] || rm -f /tmp/bypass/china_v6.txt
if [ -z "$GLOBAL_SERVER" ]; then
del_cron
rm -rf /tmp/bypass $SDNS
fi
if [ $STATUS = Y ]; then
[ -z "$GLOBAL_SERVER" ] && grep -q bypass $CRON_FILE && sed -i '/bypass/d' $CRON_FILE && /etc/init.d/cron restart
if [ $STATUS = Y -o -z "$GLOBAL_SERVER" ];then
killall -q -9 smartdns
rm -rf /tmp/bypass $SDNS $PID
/etc/init.d/dnsmasq restart >/dev/null 2>&1
fi
}
restart() {
restart(){
STATUS=N
stop
if [ -s $DNS_T ]; then
[ "$(uci_get_by_type global global_server)" ] || exit 0
if [[ "$(uci get smartdns.@smartdns[0].enabled 2>/dev/null)" == "1" ]]; then
uci del smartdns.@smartdns[0].enabled 2>/dev/null
uci commit smartdns
/etc/init.d/smartdns stop 2>/dev/null
fi
cat >$DNS_T <<-EOF
speed-check-mode none
cache-persist no
cache-size 0
log-level fatal
log-file $LOG
bind :5335
bind :5336
bind :5337
EOF
dns_d_l=$(uci_get_by_type global udp_dns_d 223.5.5.5,223.6.6.6)
dns_d_l=$(echo $dns_d_l | sed -e 's/，/,/g' -e 's/。/./g' -e 's/：/:/g' -e 's/,/\n/g')
if [ "$dns_d_l" = "isp" -o $dns_mode_d = "udp" ]; then
if [ "$dns_d_l" = "isp" ]; then
ref=/tmp/resolv.conf.d/resolv.conf.auto
[ -s $ref ] || ref=/tmp/resolv.conf.auto
dns_d_l=$(cat $ref 2>/dev/null | grep nameserver | awk '{print$2}')
fi
if [ -z "$dns_d_l" ]; then
echolog "SmartDNS : Get Domestic DNS failed!"
exit 1
fi
for i in $dns_d_l; do echo "server $i" >>$DNS_T; done
else
for i in $dns_d_l; do echo "server-https https://$i/dns-query" >>$DNS_T; done
fi
$(which smartdns) -c $DNS_T
r=1
while ! ps -w | grep smartdns | grep -v grep >/dev/null; do
[ $r -ge 10 ] && return 1 || let r++
sleep 1
done
start
kill -9 $(ps -w | grep smartdns | grep -v grep | awk '{print$1}') 2>/dev/null
start_dns
/etc/init.d/dnsmasq restart >/dev/null 2>&1
preload
else
if [ -f $PID ]; then
rm -f $PID
/etc/init.d/dnsmasq restart >/dev/null 2>&1
fi
start
fi
start
}
boot() {
boot(){
echo '#!/bin/sh' >$FWI
touch $LOCK
start

4
luci-app-jd-dailybonus/Makefile
View File

@ -1,8 +1,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-jd-dailybonus
PKG_VERSION:=1.0.3
PKG_RELEASE:=20210125
PKG_VERSION:=1.0.4
PKG_RELEASE:=20210315
define Package/$(PKG_NAME)/conffiles
/etc/config/jd-dailybonus

11
luci-app-jd-dailybonus/README.md
View File

@ -2,15 +2,13 @@
Luci for JD dailybonus Script for Openwrt
一个运行在openwrt下的京东签到插件。
### gitee源目前已经被和谐，如显示【根据相关法律政策,该内容无法显示】请切换至github源或GitHub CDN源进行更新，近期将会取消gitee更新。
### Update Log 2021-01-25 v1.0.3
### Update Log 2021-03-15 v1.0.4
#### Updates
- UPD: 大量代码重构，去除lua-request 使用wget实现网络请求节省大量空间和依赖（感谢@Promix953的更新）
- FIX: 修复当使用master版本时 提交信息出错的问题
- FIX: 修复部分文件翻译
- UPD: 增加更多账号功能，双击cookie输入框即可调出二维码，扫码自动填入。【感谢[maple's sky](https://github.com/maplesky)】
详情见[具体日志](./relnotes.txt)。
@ -60,6 +58,9 @@ rm -rf /tmp/luci-indexcache /tmp/luci-modulecache/*
### 感谢
感谢[NobyDa](https://github.com/NobyDa) 的脚本。
感谢[Promix953](https://github.com/Promix953) 的二次开发。
感谢[maple's sky](https://github.com/maplesky) 的二次开发。
感谢[Mattraks](https://github.com/Mattraks) 的bug修复。
### 我的其它项目
Argon theme ：https://github.com/jerrykuku/luci-theme-argon

1
luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua
View File

@ -14,6 +14,7 @@ o.template = 'jd-dailybonus/cookie_tools'
o = s:option(DynamicList, "Cookies", translate("账号 Cookie 列表"))
o.rmempty = false
o.description = translate('双击输入框即可调出二维码，扫描后自动填入。')
o = s:option(Value, 'stop', translate('延迟签到'))
o.rmempty = false

2
luci-app-ssr-plus/Makefile
View File

@ -17,7 +17,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks
config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust
bool "Include Shadowsocks Rust (AEAD ciphers only)"
depends on aarch64||arm||i386||mips||mipsel||x86_64
default y if x86_64||aarch64
default y if aarch64
config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin
bool "Include Shadowsocks V2ray Plugin"

8
luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua
View File

@ -48,10 +48,10 @@ o = s:option(Flag, "adblock", translate("Enable adblock"))
o.rmempty = false
o = s:option(Value, "adblock_url", translate("adblock_url"))
o:value("https://neodev.team/lite_host_dnsmasq.conf", translate("NEO DEV HOST Lite"))
o:value("https://neodev.team/host_dnsmasq.conf", translate("NEO DEV HOST Full"))
o:value("https://anti-ad.net/anti-ad-for-dnsmasq.conf", translate("anti-AD"))
o.default = "https://neodev.team/lite_host_dnsmasq.conf"
o:value("https://raw.sevencdn.com/neodevpro/neodevhost/master/lite_host_dnsmasq.conf", translate("NEO DEV HOST Lite"))
o:value("https://raw.sevencdn.com/neodevpro/neodevhost/master/host_dnsmasq.conf", translate("NEO DEV HOST Full"))
o:value("https://raw.sevencdn.com/privacy-protection-tools/anti-AD/master/adblock-for-dnsmasq.conf", translate("anti-AD"))
o.default = "https://raw.sevencdn.com/neodevpro/neodevhost/master/lite_host_dnsmasq.conf"
o:depends("adblock", "1")
o.description = translate("Support AdGuardHome and DNSMASQ format list")

2
luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
View File

@ -256,7 +256,7 @@ o.rmempty = true
o:depends({type = "v2ray", v2ray_protocol = "shadowsocks"})
-- Shadowsocks Plugin
o = s:option(ListValue, "plugin", translate("Obfs"))
o = s:option(Value, "plugin", translate("Obfs"))
o:value("none", translate("None"))
if is_finded("obfs-local") then
o:value("obfs-local", translate("simple-obfs"))

2
luci-app-ssr-plus/root/etc/init.d/shadowsocksr
View File

@ -470,7 +470,7 @@ start_local() {
case "$type" in
ss | ssr)
gen_config_file $LOCAL_SERVER $type 4 $local_port
ss_program="$(first_type ${type}local ${type}-redir)"
ss_program="$(first_type ${type}local ${type}-local)"
[ "$(printf '%s' "$ss_program" | awk -F '/' '{print $NF}')" = "${type}local" ] && \
ss_extra_arg="-U" || ss_extra_arg="-u"
ln_start_bin $ss_program ${type}-local -c $local_config_file $ss_extra_arg

2
luci-app-vssr/root/etc/init.d/vssr
View File

@ -432,7 +432,7 @@ start_redir() {
;;
v2ray | vless)
$ucmd -config $last_config_file >/dev/null 2>&1 &
echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay: V2ray 已启动!" >>/tmp/vssr.log
echo "$(date "+%Y-%m-%d %H:%M:%S") UDP TPROXY Relay: $($sscmd -version | head -1) 已启动!" >>/tmp/vssr.log
;;
trojan)
$ucmd --config $last_config_file >/dev/null 2>&1 &

2
luci-app-vssr/root/www/luci-static/vssr/jquery.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
microsocks/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION=1.0.2
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/rofl0r/microsocks/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/rofl0r/microsocks/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=MIT

2
microsocks11/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=2.3.0
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/EvanMcBroom/microsocks11/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/EvanMcBroom/microsocks11/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=MIT

2
msgpack-c/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=3.3.0
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/msgpack/msgpack-c/tar.gz/cpp-$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/msgpack/msgpack-c/tar.gz/cpp-$(PKG_VERSION)?
PKG_HASH:=skip
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-cpp-$(PKG_VERSION)

2
n2n_v2/Makefile
View File

@ -15,7 +15,7 @@ PKG_VERSION:=2.8
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/ntop/n2n/tar.gz/$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/ntop/n2n/tar.gz/$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=GPL-3.0

2
nps/Makefile
View File

@ -12,7 +12,7 @@ PKG_VERSION:=0.26.9
PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/ehang-io/nps/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/ehang-io/nps/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=Apache-2.0

2
ps3netsrv/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=20200610
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/jhonathanc/ps3netsrv/tar.gz/$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/jhonathanc/ps3netsrv/tar.gz/$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=GPLv3

2
simple-torrent/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=1.2.14
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/boypt/simple-torrent/tar.gz/$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/boypt/simple-torrent/tar.gz/$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=AGPL-3.0

2
tinyportmapper/Makefile
View File

@ -12,7 +12,7 @@ PKG_VERSION:=20200818.0
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/wangyu-/tinyPortMapper/tar.gz/$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/wangyu-/tinyPortMapper/tar.gz/$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=MIT

2
v2ray-plugin/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=v2ray-plugin
PKG_VERSION:=4.35.1
PKG_VERSION:=4.36.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

2
v2ray/Makefile
View File

@ -14,7 +14,7 @@ PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION)
PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=MIT

2
vlmcsd/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=svn1113
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/Wind4/vlmcsd/tar.gz/$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/Wind4/vlmcsd/tar.gz/$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=MIT

2
webdav-go/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=4.0.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/hacdias/webdav/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE_URL:=@GHCODELOAD/hacdias/webdav/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=skip
PKG_LICENSE:=MIT

18
xray-core/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=xray-core
PKG_VERSION:=1.3.1
PKG_VERSION:=1.4.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -13,7 +13,6 @@ PKG_LICENSE:=MPL-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_CONFIG_DEPENDS:= \
CONFIG_XRAY_CORE_PROVIDE_V2RAY_CORE \
CONFIG_XRAY_CORE_COMPRESS_GOPROXY \
CONFIG_XRAY_CORE_COMPRESS_UPX \
@ -70,10 +69,6 @@ define Package/xray-core/config
menu "Xray-core Configuration"
depends on PACKAGE_xray-core
config XRAY_CORE_PROVIDE_V2RAY_CORE
bool "Provide V2Ray binary using XRay"
default y
config XRAY_CORE_COMPRESS_GOPROXY
bool "Compiling with GOPROXY proxy"
default n
@ -84,24 +79,24 @@ config XRAY_CORE_COMPRESS_UPX
endmenu
endef
GEOIP_VER:=202102250625
GEOIP_VER:=202103110015
GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
define Download/geoip
URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
URL_FILE:=geoip.dat
FILE:=$(GEOIP_FILE)
HASH:=ee41b3c624e27a47b611d7cbee9da605fb9cda7c23bec1326969eb137ca6ebe7
HASH:=8d2e8beaafd9aa07fce4900cc079cddf873d24658d1874de53417df33ab7f4b3
endef
GEOSITE_VER:=20210226210728
GEOSITE_VER:=20210314064711
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
define Download/geosite
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
URL_FILE:=dlc.dat
FILE:=$(GEOSITE_FILE)
HASH:=ef9c30bacc6989a0b9fae6043dcef1ec15af96c01eddfa1f1d1ad93d14864f81
HASH:=8b89b59b0a826cb24d6b18a4e5e1db2b990faa8a9a8fef0eb000a692a7cbf7bb
endef
ifneq ($(CONFIG_XRAY_CORE_COMPRESS_GOPROXY),)
@ -126,12 +121,9 @@ endef
define Package/xray-core/install
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
$(INSTALL_DIR) $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/main $(1)/usr/bin/xray
ifneq ($(CONFIG_XRAY_CORE_PROVIDE_V2RAY_CORE),)
$(LN) xray $(1)/usr/bin/v2ray
endif
endef
define Package/xray-geodata/install

2
xray-plugin/Makefile
View File

@ -9,7 +9,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=xray-plugin
PKG_VERSION:=1.3.1
PKG_VERSION:=1.4.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz