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

Fix omr-admin script

Browse source
This commit is contained in:
Ycarus 2019-08-07 18:42:42 +00:00
parent 295af2eef8
commit 461b738e71
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
omr-admin.py
View file

@ -214,8 +214,8 @@ def config():
else: else:
dsvpn_key = '' dsvpn_key = ''
dsvpn_port = '65011' dsvpn_port = '65011'
dsvpn_tcp_host_ip = '10.255.251.1' dsvpn_host_ip = '10.255.251.1'
dsvpn_tcp_client_ip = '10.255.251.2' dsvpn_client_ip = '10.255.251.2'
if os.path.isfile('/etc/iperf3/public.pem'): if os.path.isfile('/etc/iperf3/public.pem'):
with open('/etc/iperf3/public.pem',"rb") as iperfkey_file: with open('/etc/iperf3/public.pem',"rb") as iperfkey_file:
@ -269,7 +269,7 @@ def config():
#ipv6_addr = os.popen('wget -6 -qO- -T 2 ipv6.openmptcprouter.com').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() 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 https://ip.openmptcprouter.com').read().rstrip() #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() ipv4_addr = os.popen("dig -4 TXT +timeout=2 +tries=1 +short o-o.myaddr.l.google.com @ns1.google.com | awk -F'\"' '{ print $2}'").read().rstrip()
if ipv4_addr == '': if ipv4_addr == '':
ipv4_addr = os.popen('wget -4 -qO- -T 1 http://ifconfig.co').read().rstrip() ipv4_addr = os.popen('wget -4 -qO- -T 1 http://ifconfig.co').read().rstrip()
#ipv4_addr = "" #ipv4_addr = ""