From 172a02677857b895539e1e5634dc4aeb6bb2ddfb Mon Sep 17 00:00:00 2001 From: Ycarus Date: Thu, 25 Jul 2019 06:25:12 +0000 Subject: [PATCH] Check IP other way --- omr-admin.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/omr-admin.py b/omr-admin.py index 8a0ff43..5d839a7 100644 --- a/omr-admin.py +++ b/omr-admin.py @@ -260,8 +260,11 @@ def config(): ipv6_network = os.popen('ip -6 addr show ' + iface +' | grep -oP "(?<=inet6 ).*(?= scope global)"').read().rstrip() #ipv6_addr = os.popen('wget -6 -qO- -T 2 ipv6.openmptcprouter.com').read().rstrip() ipv6_addr = os.popen('ip -6 addr show ' + iface +' | grep -oP "(?<=inet6 ).*(?= scope global)" | cut -d/ -f1').read().rstrip() - #ipv4_addr = os.popen('wget -4 -qO- -T 1 http://ip.openmptcprouter.com').read().rstrip() - ipv4_addr = "" + #ipv4_addr = os.popen('wget -4 -qO- -T 1 https://ip.openmptcprouter.com').read().rstrip() + ipv4_addr = os.popen("dig -4 TXT +times=3 +tries=1 +short o-o.myaddr.l.google.com @ns1.google.com | awk -F'\"' '{ print $2}'").read().rstrip() + if ipv4_addr == '': + ipv4_addr = os.popen('wget -4 -qO- -T 1 http://ifconfig.co').read().rstrip() + #ipv4_addr = "" test_aes = os.popen('cat /proc/cpuinfo | grep aes').read().rstrip() if test_aes == '': @@ -273,7 +276,8 @@ def config(): vps_omr_version = os.popen("grep -s 'OpenMPTCProuter VPS' /etc/* | awk '{print $4}'").read().rstrip() vps_loadavg = os.popen("cat /proc/loadavg | awk '{print $1" "$2" "$3}'").read().rstrip() vps_uptime = os.popen("cat /proc/uptime | awk '{print $1}'").read().rstrip() - vps_domain = os.popen('wget -4 --no-check-certificate -qO- -T 1 https://hostname.openmptcprouter.com').read().rstrip() + vps_domain = os.popen('wget -4 -qO- -T 1 http://hostname.openmptcprouter.com').read().rstrip() + #vps_domain = os.popen('dig -4 +short +times=3 +tries=1 -x ' + ipv4_addr + " | sed 's/\.$//'").read().rstrip() vpn = '' if os.path.isfile('/etc/openmptcprouter-vps-admin/current-vpn'):