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

Merge pull request #92 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2021-03-27 01:35:14 +08:00 committed by GitHub
commit ed16e9534d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 67 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mptcp/files/usr/share/omr/post-tracking.d/post-tracking
View file

@ -1344,6 +1344,7 @@ if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter
fi fi
if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then if [ "$(pgrep openmptcprouter-vps)" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then
_log "Set firewall on server"
/etc/init.d/openmptcprouter-vps set_vps_firewall >/dev/null 2>&1 /etc/init.d/openmptcprouter-vps set_vps_firewall >/dev/null 2>&1
run_fw_include() { run_fw_include() {

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

@ -103,6 +103,7 @@ while true; do
if [ "$disabled" != "1" ] && [ "$(pgrep ss-redir)" = "" ] && [ "$(uci -q get shadowsocks-libev.${server}.key)" != "" ]; then if [ "$disabled" != "1" ] && [ "$(pgrep ss-redir)" = "" ] && [ "$(uci -q get shadowsocks-libev.${server}.key)" != "" ]; then
_log "Can't find shadowsocks, restart it..." _log "Can't find shadowsocks, restart it..."
/etc/init.d/shadowsocks-libev restart /etc/init.d/shadowsocks-libev restart
sleep 5
fi fi
sleep $wait_test sleep $wait_test
fi fi

7
omr-tracker/files/etc/init.d/omr-tracker
View file

@ -91,7 +91,7 @@ _launch_tracker() {
procd_set_param respawn 0 10 0 procd_set_param respawn 0 10 0
procd_set_param stderr 1 procd_set_param stderr 1
procd_close_instance procd_close_instance
sleep 1 sleep 2
} }
_launch_server_tracker() { _launch_server_tracker() {
@ -114,6 +114,7 @@ _launch_server_tracker() {
procd_set_param respawn 0 10 0 procd_set_param respawn 0 10 0
procd_set_param stderr 1 procd_set_param stderr 1
procd_close_instance procd_close_instance
sleep 2
} }
_launch_gre_tracker() { _launch_gre_tracker() {
@ -136,6 +137,7 @@ _launch_gre_tracker() {
procd_set_param respawn 0 10 0 procd_set_param respawn 0 10 0
procd_set_param stderr 1 procd_set_param stderr 1
procd_close_instance procd_close_instance
sleep 2
} }
_initialize_shadowsocks_tracker() { _initialize_shadowsocks_tracker() {
@ -164,6 +166,7 @@ _initialize_shadowsocks_tracker() {
set shadowsocks-libev.tracker_${server}.verbose=0 set shadowsocks-libev.tracker_${server}.verbose=0
commit shadowsocks-libev commit shadowsocks-libev
EOF EOF
logger -t "omr-tracker" "Restart ShadowSocks"
/etc/init.d/shadowsocks-libev restart /etc/init.d/shadowsocks-libev restart
} }
# [ -n "$tracker_server" ] && [ "$server" = "$tracker_server" ] || { # [ -n "$tracker_server" ] && [ "$server" = "$tracker_server" ] || {
@ -205,6 +208,7 @@ _launch_shadowsocks_tracker() {
procd_set_param respawn 0 10 0 procd_set_param respawn 0 10 0
procd_set_param stderr 1 procd_set_param stderr 1
procd_close_instance procd_close_instance
sleep 1
} }
_launch_v2ray_tracker() { _launch_v2ray_tracker() {
@ -226,6 +230,7 @@ _launch_v2ray_tracker() {
procd_set_param respawn 0 10 0 procd_set_param respawn 0 10 0
procd_set_param stderr 1 procd_set_param stderr 1
procd_close_instance procd_close_instance
sleep 1
} }
_multi_server() { _multi_server() {

20
openmptcprouter/files/bin/omr-test-speed
View file

@ -1,11 +1,18 @@
#!/bin/sh #!/bin/sh
# vim: set noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 : # vim: set noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 :
INTERFACE="$1" OVH=false
if [ "$1" = "ovh" ]; then
OVH=true
INTERFACE="$2"
else
INTERFACE="$1"
fi
echo "Select best test server..." if [ "$OVH" = false ]; then
HOSTLST="http://speedtest.frankfurt.linode.com/garbage.php?ckSize=10000 http://speedtest.tokyo2.linode.com/garbage.php?ckSize=10000 http://speedtest.singapore.linode.com/garbage.php?ckSize=10000 http://speedtest.newark.linode.com/garbage.php?ckSize=10000 http://speedtest.atlanta.linode.com/garbage.php?ckSize=10000 http://speedtest.dallas.linode.com/garbage.php?ckSize=10000 http://speedtest.fremont.linode.com/garbage.php?ckSize=10000 http://speedtest.tele2.net/1000GB.zip http://www.ovh.net/files/10Gb.dat https://speed.hetzner.de/10GB.bin http://ipv4.bouygues.testdebit.info/10G.iso http://par.download.datapacket.com/10000mb.bin http://nyc.download.datapacket.com/10000mb.bin http://ams.download.datapacket.com/10000mb.bin http://fra.download.datapacket.com/10000mb.bin http://lon.download.datapacket.com/10000mb.bin http://mad.download.datapacket.com/10000mb.bin http://prg.download.datapacket.com/10000mb.bin http://sto.download.datapacket.com/10000mb.bin http://vie.download.datapacket.com/10000mb.bin http://war.download.datapacket.com/10000mb.bin http://atl.download.datapacket.com/10000mb.bin http://chi.download.datapacket.com/10000mb.bin http://lax.download.datapacket.com/10000mb.bin http://mia.download.datapacket.com/10000mb.bin http://nyc.download.datapacket.com/10000mb.bin" echo "Select best test server..."
bestping="999" HOSTLST="http://speedtest.frankfurt.linode.com/garbage.php?ckSize=10000 http://speedtest.tokyo2.linode.com/garbage.php?ckSize=10000 http://speedtest.singapore.linode.com/garbage.php?ckSize=10000 http://speedtest.newark.linode.com/garbage.php?ckSize=10000 http://speedtest.atlanta.linode.com/garbage.php?ckSize=10000 http://speedtest.dallas.linode.com/garbage.php?ckSize=10000 http://speedtest.fremont.linode.com/garbage.php?ckSize=10000 http://speedtest.tele2.net/1000GB.zip http://www.ovh.net/files/10Gb.dat https://speed.hetzner.de/10GB.bin http://ipv4.bouygues.testdebit.info/10G.iso http://par.download.datapacket.com/10000mb.bin http://nyc.download.datapacket.com/10000mb.bin http://ams.download.datapacket.com/10000mb.bin http://fra.download.datapacket.com/10000mb.bin http://lon.download.datapacket.com/10000mb.bin http://mad.download.datapacket.com/10000mb.bin http://prg.download.datapacket.com/10000mb.bin http://sto.download.datapacket.com/10000mb.bin http://vie.download.datapacket.com/10000mb.bin http://war.download.datapacket.com/10000mb.bin http://atl.download.datapacket.com/10000mb.bin http://chi.download.datapacket.com/10000mb.bin http://lax.download.datapacket.com/10000mb.bin http://mia.download.datapacket.com/10000mb.bin http://nyc.download.datapacket.com/10000mb.bin"
for pinghost in $HOSTLST; do bestping="9999"
for pinghost in $HOSTLST; do
domain=$(echo $pinghost | awk -F/ '{print $3}') domain=$(echo $pinghost | awk -F/ '{print $3}')
if [ -z "$INTERFACE" ]; then if [ -z "$INTERFACE" ]; then
ping=$(ping -c1 -w2 $domain | cut -d "/" -s -f5 | cut -d "." -f1) ping=$(ping -c1 -w2 $domain | cut -d "/" -s -f5 | cut -d "." -f1)
@ -17,7 +24,8 @@ for pinghost in $HOSTLST; do
bestping=$ping bestping=$ping
HOST=$pinghost HOST=$pinghost
fi fi
done done
fi
[ -z "$HOST" ] && HOST="http://proof.ovh.net/files/10Gio.dat" [ -z "$HOST" ] && HOST="http://proof.ovh.net/files/10Gio.dat"

20
openmptcprouter/files/bin/omr-test-speedv6
View file

@ -1,11 +1,18 @@
#!/bin/sh #!/bin/sh
# vim: set noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 : # vim: set noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 :
INTERFACE="$1" OVH=false
if [ "$1" = "ovh" ]; then
OVH=true
INTERFACE="$2"
else
INTERFACE="$1"
fi
echo "Select best test server..." if [ "$OVH" = false ]; then
HOSTLST="http://speedtest.frankfurt.linode.com/garbage.php?ckSize=10000 http://speedtest.tokyo2.linode.com/garbage.php?ckSize=10000 http://speedtest.singapore.linode.com/garbage.php?ckSize=10000 http://speedtest.newark.linode.com/garbage.php?ckSize=10000 http://speedtest.atlanta.linode.com/garbage.php?ckSize=10000 http://speedtest.dallas.linode.com/garbage.php?ckSize=10000 http://speedtest.fremont.linode.com/garbage.php?ckSize=10000 http://speedtest.tele2.net/1000GB.zip http://www.ovh.net/files/10Gb.dat https://speed.hetzner.de/10GB.bin http://ipv6.bouygues.testdebit.info/10G.iso http://par.download.datapacket.com/10000mb.bin http://nyc.download.datapacket.com/10000mb.bin http://ams.download.datapacket.com/10000mb.bin http://fra.download.datapacket.com/10000mb.bin http://lon.download.datapacket.com/10000mb.bin http://mad.download.datapacket.com/10000mb.bin http://prg.download.datapacket.com/10000mb.bin http://sto.download.datapacket.com/10000mb.bin http://vie.download.datapacket.com/10000mb.bin http://war.download.datapacket.com/10000mb.bin http://atl.download.datapacket.com/10000mb.bin http://chi.download.datapacket.com/10000mb.bin http://lax.download.datapacket.com/10000mb.bin http://mia.download.datapacket.com/10000mb.bin http://nyc.download.datapacket.com/10000mb.bin" echo "Select best test server..."
bestping="999" HOSTLST="http://speedtest.frankfurt.linode.com/garbage.php?ckSize=10000 http://speedtest.tokyo2.linode.com/garbage.php?ckSize=10000 http://speedtest.singapore.linode.com/garbage.php?ckSize=10000 http://speedtest.newark.linode.com/garbage.php?ckSize=10000 http://speedtest.atlanta.linode.com/garbage.php?ckSize=10000 http://speedtest.dallas.linode.com/garbage.php?ckSize=10000 http://speedtest.fremont.linode.com/garbage.php?ckSize=10000 http://speedtest.tele2.net/1000GB.zip http://www.ovh.net/files/10Gb.dat https://speed.hetzner.de/10GB.bin http://ipv6.bouygues.testdebit.info/10G.iso http://par.download.datapacket.com/10000mb.bin http://nyc.download.datapacket.com/10000mb.bin http://ams.download.datapacket.com/10000mb.bin http://fra.download.datapacket.com/10000mb.bin http://lon.download.datapacket.com/10000mb.bin http://mad.download.datapacket.com/10000mb.bin http://prg.download.datapacket.com/10000mb.bin http://sto.download.datapacket.com/10000mb.bin http://vie.download.datapacket.com/10000mb.bin http://war.download.datapacket.com/10000mb.bin http://atl.download.datapacket.com/10000mb.bin http://chi.download.datapacket.com/10000mb.bin http://lax.download.datapacket.com/10000mb.bin http://mia.download.datapacket.com/10000mb.bin http://nyc.download.datapacket.com/10000mb.bin"
for pinghost in $HOSTLST; do bestping="9999"
for pinghost in $HOSTLST; do
domain=$(echo $pinghost | awk -F/ '{print $3}') domain=$(echo $pinghost | awk -F/ '{print $3}')
if [ -z "$INTERFACE" ]; then if [ -z "$INTERFACE" ]; then
ping=$(ping -6 -c1 -w2 $domain | cut -d "/" -s -f5 | cut -d "." -f1) ping=$(ping -6 -c1 -w2 $domain | cut -d "/" -s -f5 | cut -d "." -f1)
@ -17,7 +24,8 @@ for pinghost in $HOSTLST; do
bestping=$ping bestping=$ping
HOST=$pinghost HOST=$pinghost
fi fi
done done
fi
[ -z "$HOST" ] && HOST="http://proof.ovh.net/files/10Gio.dat" [ -z "$HOST" ] && HOST="http://proof.ovh.net/files/10Gio.dat"

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

@ -1768,7 +1768,10 @@ _config_service() {
EOF EOF
config_foreach _set_ss_server server "method" "aes-256-gcm" config_foreach _set_ss_server server "method" "aes-256-gcm"
uci -q commit shadowsocks-libev uci -q commit shadowsocks-libev
[ "$method" != "aes-256-gcm" ] && /etc/init.d/shadowsocks-libev restart [ "$method" != "aes-256-gcm" ] && {
logger -t "OMR-VPS" "Shadowsocks restart"
/etc/init.d/shadowsocks-libev restart
}
fi fi
} }
fi fi
@ -1807,12 +1810,13 @@ _config_service() {
if [ "$(uci -q get openmptcprouter.settings.vpn)" != "openvpn" ] && [ "$(echo "$vps_config" | jsonfilter -q -e '@.client2client.enabled')" == "true" ]; then if [ "$(uci -q get openmptcprouter.settings.vpn)" != "openvpn" ] && [ "$(echo "$vps_config" | jsonfilter -q -e '@.client2client.enabled')" == "true" ]; then
_set_client2client _set_client2client
fi fi
[ "$error" = 0 ] && { if [ "$error" = 0 ]; then
#logger -t "OMR-VPS" "No errors" #logger -t "OMR-VPS" "No errors"
uci -q set openmptcprouter.${servername}.lastchange=$(date "+%s") uci -q set openmptcprouter.${servername}.lastchange=$(date "+%s")
[ -n "$vps_config" ] && uci -q set openmptcprouter.settings.firstboot=0 [ -n "$vps_config" ] && uci -q set openmptcprouter.settings.firstboot=0
else
} logger -t "OMR-VPS" "Setting server config error, try again"
fi
#[ "$error" != 0 ] && logger -t "OMR-VPS" "Error !" #[ "$error" != 0 ] && logger -t "OMR-VPS" "Error !"
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set openmptcprouter.${servername}.admin_error=$error set openmptcprouter.${servername}.admin_error=$error
@ -1866,5 +1870,6 @@ start_service() {
service_triggers() { service_triggers() {
procd_add_reload_trigger openmptcprouter network shadowsocks-libev v2ray glorytun glorytun-udp mlspn openvpn dsvpn procd_add_reload_trigger openmptcprouter network shadowsocks-libev v2ray glorytun glorytun-udp mlspn openvpn dsvpn
procd_add_config_trigger "config.change" "firewall" /etc/init.d/openmptcprouter-vps set_vps_firewall procd_add_config_trigger "config.change" "firewall" /etc/init.d/openmptcprouter-vps set_vps_firewall
#procd_add_config_trigger "config.change" "network" /etc/init.d/openmptcprouter-vps set_gre_tunnel
#procd_add_reload_trigger openmptcprouter shadowsocks-libev network upnpd #procd_add_reload_trigger openmptcprouter shadowsocks-libev network upnpd
} }