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

Fixes and set detected ip in a new uci section

Browse source
This commit is contained in:
Ycarus 2018-12-14 13:19:58 +01:00
parent 8a1b59f1d2
commit 8e03e42f54
5 changed files with 50 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,9 +9,9 @@ log() {
}
get_ip() {
uci -q set openmptcprouter.vps.detected_public_ipv4=$(wget -4 -qO- -T 3 http://ip.openmptcprouter.com)
uci -q set openmptcprouter.omr.detected_public_ipv4=$(wget -4 -qO- -T 3 http://ip.openmptcprouter.com)
if [ "$(sysctl -n net.ipv6.conf.all.disable_ipv6 | tr -d '\n')" = "0" ]; then
uci -q set openmptcprouter.vps.detected_public_ipv6=$(wget -6 -qO- -T 3 http://ip.openmptcprouter.com)
uci -q set openmptcprouter.omr.detected_public_ipv6=$(wget -6 -qO- -T 3 http://ip.openmptcprouter.com)
fi
}
@ -25,7 +25,7 @@ nodns=0
last=0
nocontact=""
uci -q set openmptcprouter.vps.shadowsocks="up"
uci -q set openmptcprouter.omr.shadowsocks="up"
get_ip
while true; do
@ -37,14 +37,14 @@ while true; do
nocontact=""
[ "${last}" -ge "${retry}" ] && {
log "Shadowsocks is up (can contact ${host})"
uci -q set openmptcprouter.vps.shadowsocks="up"
uci -q set openmptcprouter.omr.shadowsocks="up"
uci -q commit openmptcprouter
}
if ! /etc/init.d/shadowsocks-libev rules_exist ; then
/etc/init.d/shadowsocks-libev rules_up 2> /dev/null
get_ip
fi
[ "$(uci -q get openmptcprouter.vps.ipv4)" = "" ] || ([ "$(sysctl -n net.ipv6.conf.all.disable_ipv6 | tr -d '\n')" = "0" ] && [ "$(uci -q get openmptcprouter.vps.ipv6)" = "" ]) && get_ip
[ "$(uci -q get openmptcprouter.omr.ipv4)" = "" ] || ([ "$(sysctl -n net.ipv6.conf.all.disable_ipv6 | tr -d '\n')" = "0" ] && [ "$(uci -q get openmptcprouter.omr.ipv6)" = "" ]) && get_ip
last=0
else
last=$((last + 1 ))
@ -52,7 +52,7 @@ while true; do
[ "${last}" -ge "${retry}" ] && {
if /etc/init.d/shadowsocks-libev rules_exist ; then
log "Shadowsocks is down (can't contact ${nocontact})"
uci -q set openmptcprouter.vps.shadowsocks="down"
uci -q set openmptcprouter.omr.shadowsocks="down"
/etc/init.d/shadowsocks-libev rules_down 2> /dev/null
get_ip
fi