Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

增加插件v2ray for lede software center #32796

Closed
wants to merge 37 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ce53fe1
add trojan binary for hnd platform
hq450 Apr 7, 2020
73955e2
Merge pull request #1 from hq450/trojan
Apr 17, 2020
444e40a
Merge pull request #2 from hq450/master
Apr 17, 2020
2f02fe7
Merge pull request #3 from hq450/master
Jun 27, 2020
1fc5745
Modify fwlist.py gfwlist source baseurl address.
BenjaminX Jun 21, 2020
e37c0fa
修复了插件不更新的bug
hq450 Jul 1, 2020
8324730
bump version 1.8.7 for ZenWiFi AX(灵耀 AX6600M/RT-AX95Q)support
hq450 Sep 16, 2020
eee6611
update README.md
hq450 Sep 16, 2020
e3a497b
update rules
hq450 Sep 16, 2020
1d28704
add ZenWiFi_XD4(灵耀AX魔方/RT-AX56_XD4)support
hq450 Sep 17, 2020
a6f846a
bump version
hq450 Sep 17, 2020
5ba3ed2
update fancys_qca
hq450 Sep 28, 2020
eaabf8a
update
hq450 Sep 28, 2020
4ad9534
update qca
hq450 Sep 28, 2020
6f0c3e3
update fancyss_hnd 1.8.9
hq450 Oct 12, 2020
6ebf7d2
update fancyss_hnd 1.9.0
hq450 Oct 19, 2020
d99ceea
update install.sh
hq450 Dec 7, 2020
fc54615
adapt to asuswrt/merlin 386 firmware
hq450 Dec 7, 2020
6665b14
fix script error
hq450 Dec 7, 2020
07763ed
update fancyss_hnd 1.9.1
hq450 Dec 7, 2020
e199820
Update Changelog.txt
hq450 Dec 8, 2020
70d0122
Update Changelog.txt
hq450 Dec 8, 2020
ae0aba6
update rules & remove apple.com in gfwlist & fix ss_online_update.sh …
hq450 Dec 12, 2020
7b4c30c
update fancyss_hnd 1.9.2
hq450 Dec 12, 2020
42a1850
Auto synchronizing
Dec 15, 2020
516c7a6
add v2ray for softcenter of Lede
Dec 17, 2020
66dc4bb
add v2ray plugins for lede software center
Dec 17, 2020
6d24972
更 arguments into ''
Dec 17, 2020
c86bd4f
try to change encoding of v2ray to assii
Dec 18, 2020
b966099
change the file encoding
Dec 21, 2020
7bbc58d
Auto synchronizing
Dec 21, 2020
665b395
Auto synchronizing
Dec 21, 2020
11aa6c2
$msg
Dec 21, 2020
16685fa
test
Dec 21, 2020
eb64e06
Batch synchronizing
Dec 21, 2020
1409600
Auto synchronizing
Dec 21, 2020
1232373
Auto synchronizing
Dec 21, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix script error
hq450 authored and Jimbo Tang committed Dec 15, 2020
commit 6665b14b9aacc44cb13c797bc5a0714e108d3eb7
11 changes: 6 additions & 5 deletions fancyss_hnd/shadowsocks/ss/ssconfig.sh
Original file line number Diff line number Diff line change
@@ -342,19 +342,20 @@ kill_process() {

# ================================= ss prestart ===========================
ss_pre_start() {
local IS_LOCAL_ADDR=$(echo $ss_basic_server | grep -o "127.0.0.1")
if [ "$ss_lb_enable" == "1" ]; then
echo_date ---------------------- 【科学上网】 启动前触发脚本 ----------------------
if [ $(echo $ss_basic_server | grep -o "127.0.0.1") ] && [ "$ss_basic_port" == "$ss_lb_port" ]; then
if [ -n ${IS_LOCAL_ADDR} -a "$ss_basic_port" == "$ss_lb_port" ]; then
echo_date 插件启动前触发:触发启动负载均衡功能!
#start haproxy
sh /koolshare/scripts/ss_lb_config.sh
else
echo_date 插件启动前触发:未选择负载均衡节点,不触发负载均衡启动!
fi
else
if [ $(echo $ss_basic_server | grep -o "127.0.0.1") ] && [ "$ss_basic_port" == "$ss_lb_port" ]; then
if [ -n ${IS_LOCAL_ADDR} -a "$ss_basic_port" == "$ss_lb_port" ]; then
echo_date 插件启动前触发【警告】:你选择了负载均衡节点,但是负载均衡开关未启用!!
#else
#else
#echo_date ss启动前触发:你选择了普通节点,不触发负载均衡启动!
fi
fi
@@ -1824,9 +1825,9 @@ flush_nat() {
ipset -F router >/dev/null 2>&1 && ipset -X router >/dev/null 2>&1
#remove_redundant_rule
ip_rule_exist=$(ip rule show | grep "lookup 310" | grep -c 310)
if [ -n "ip_rule_exist" ]; then
if [ -n "${ip_rule_exist}" ]; then
#echo_date 清除重复的ip rule规则.
until [ "$ip_rule_exist" == "0" ]; do
until [ "${ip_rule_exist}" == "0" ]; do
IP_ARG=$(ip rule show | grep "lookup 310" | head -n 1 | cut -d " " -f3,4,5,6)
ip rule del $IP_ARG
ip_rule_exist=$(expr $ip_rule_exist - 1)