mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Merge branch 'test' into develop

Browse source
This commit is contained in:
suyuan 2020-11-08 20:48:25 +08:00
commit 62369594da
6 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
omr-6in4/files/etc/init.d/omr-6in4
View file

@ -17,9 +17,11 @@ set_shadowsocks_address() {
set_ipv6_state() {
local disable_ipv6="$(uci -q get openmptcprouter.settings.disable_ipv6)"
[ -z "$disable_ipv6" ] && disable_ipv6="1"
previous=$(sysctl -qn net.ipv6.conf.all.disable_ipv6 | tr -d "\n")
sysctl -qw net.ipv6.conf.all.disable_ipv6=$disable_ipv6
sed -i "s:^net.ipv6.conf.all.disable_ipv6=[0-9]*:net.ipv6.conf.all.disable_ipv6=$disable_ipv6:" /etc/sysctl.d/zzz_openmptcprouter.conf
#previous=$(sysctl -qn net.ipv6.conf.all.disable_ipv6 | tr -d "\n")
previous="$(uci get network.lan.ipv6)"
#sysctl -qw net.ipv6.conf.all.disable_ipv6=$disable_ipv6
#sed -i "s:^net.ipv6.conf.all.disable_ipv6=[0-9]*:net.ipv6.conf.all.disable_ipv6=$disable_ipv6:" /etc/sysctl.d/zzz_openmptcprouter.conf
sed -i "s:^net.ipv6.conf.all.disable_ipv6=[0-9]*::" /etc/sysctl.d/zzz_openmptcprouter.conf
uci -q batch <<-EOF >/dev/null
set firewall.@defaults[0].disable_ipv6=$disable_ipv6
@ -82,14 +84,14 @@ set_ipv6_state() {
commit shadowsocks-libev
EOF
/etc/init.d/odhcpd restart
if [ "$previous" != "$disable_ipv6" ]; then
if [ "$previous" != "1" ]; then
env -i /bin/ubus call network reload
fi
}
start_service() {
[ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "$(sysctl -n net.ipv6.conf.all.disable_ipv6)" ] && set_ipv6_state
[ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ] && [ "$(uci -q get network.lan.ipv6)" != "1" ] && set_ipv6_state
[ "$(uci -q get openmptcprouter.settings.disable_ipv6)" = "1" ] && {
ifdown omr6in4
return

4
omr-tracker/files/bin/omr-tracker-ss
View file

@ -30,9 +30,13 @@ _get_ip() {
uci -q set openmptcprouter.omr.detected_public_ipv4="$(curl -s -4 -m 3 $check_ipv4_website)"
if [ "$(uci -q get openmptcprouter.omr.shadowsocks)" != "down" ]; then
uci -q set openmptcprouter.omr.detected_ss_ipv4="$(curl -s -4 --socks5 "${proxy}" --max-time 3 $check_ipv4_website)"
else
uci -q del openmptcprouter.omr.detected_ss_ipv4
fi
if [ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ]; then
uci -q set openmptcprouter.omr.detected_public_ipv6="$(curl -s -6 -m 3 $check_ipv6_website)"
else
uci -q del openmptcprouter.omr.detected_public_ipv6
# uci -q set openmptcprouter.omr.detected_ss_ipv6=$(curl -s -6 --socks5 ":::1111" --max-time 3 http://ip.openmptcprouter.com)
fi
fi

6
omr-tracker/files/bin/omr-tracker-v2ray
View file

@ -28,11 +28,15 @@ _get_ip() {
check_ipv6_website="$(uci -q get openmptcprouter.settings.check_ipv6_website)"
[ -z "$check_ipv6_website" ] && check_ipv6_website="http://ipv6.openmptcprouter.com"
uci -q set openmptcprouter.omr.detected_public_ipv4="$(curl -s -4 -m 3 $check_ipv4_website)"
if [ "$(uci -q get openmptcprouter.omr.shadowsocks)" != "down" ]; then
if [ "$(uci -q get openmptcprouter.omr.v2ray)" != "down" ]; then
uci -q set openmptcprouter.omr.detected_ss_ipv4="$(curl -s -4 --socks5 "${proxy}" --max-time 3 $check_ipv4_website)"
else
uci -q del openmptcprouter.omr.detected_ss_ipv4
fi
if [ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ]; then
uci -q set openmptcprouter.omr.detected_public_ipv6="$(curl -s -6 -m 3 $check_ipv6_website)"
else
uci -q del openmptcprouter.omr.detected_public_ipv6
# uci -q set openmptcprouter.omr.detected_ss_ipv6=$(curl -s -6 --socks5 ":::1111" --max-time 3 http://ip.openmptcprouter.com)
fi
fi

2
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -1291,7 +1291,7 @@ _set_config_from_vps() {
uci -q batch <<-EOF >/dev/null
set openmptcprouter.settings.disable_ipv6=1
EOF
sysctl -qw net.ipv6.conf.all.disable_ipv6=1
#sysctl -qw net.ipv6.conf.all.disable_ipv6=1
else
uci -q batch <<-EOF >/dev/null
set openmptcprouter.${servername}.ipv6=$vps_ipv6_addr

2
openmptcprouter/files/etc/uci-defaults/2060-omr-system
View file

@ -8,6 +8,8 @@ uci -q batch <<-EOF >/dev/null
commit rpcd
luci.apply.timeout='20'
commit luci
fstab.@global[0].check_fs='1'
commit fstab
EOF
[ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && [ "$(uci -q get openmptcprouter.settings.scaling_governor)" != "performance" ] && {

2
v2ray-core/files/etc/init.d/v2ray
View file

@ -1882,7 +1882,7 @@ setup_transparent_proxy() {
ext_args="--dport 0:1023 $ext_args"
fi
if [ -n "$(cat "$FILE_V2RAY_DNSMASQ_CACHE" | grep -v "^$" | grep -v "^#")" ] ; then
if [ -f $FILE_V2RAY_DNSMASQ_CACHE ] && [ -n "$(cat "$FILE_V2RAY_DNSMASQ_CACHE" | grep -v "^$" | grep -v "^#")" ] ; then
local dir="$(dirname "$FILE_V2RAY_DNSMASQ")"
test -d "$dir" || mkdir -p "$dir"
cat "$FILE_V2RAY_DNSMASQ_CACHE" >"$FILE_V2RAY_DNSMASQ" 2>/dev/null