mptcp/openmptcprouter-vps-admin
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps-admin.git synced 2025-02-14 19:41:52 +00:00
Code Issues Releases Wiki Activity

replace tunnel ipv6 from fe80 to fd80

Browse source
This commit is contained in:
Ycarus 2020-04-30 20:18:09 +02:00
parent cae50f956b
commit d50e765caf
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
omr-admin.py
View file

@ -865,8 +865,8 @@ async def config(current_user: User = Depends(get_current_user)):
if 'REMOTEIP6=' in line: if 'REMOTEIP6=' in line:
remoteip6 = line.replace(line[:10], '').rstrip() remoteip6 = line.replace(line[:10], '').rstrip()
else: else:
locaip6 = 'fe80::a00:1' locaip6 = 'fd80::a00:1'
remoteip6 = 'fe80::a00:2' remoteip6 = 'fd80::a00:2'
vpn = 'glorytun_tcp' vpn = 'glorytun_tcp'
if 'vpn' in omr_config_data['users'][0][current_user.username]: if 'vpn' in omr_config_data['users'][0][current_user.username]:
@ -1376,8 +1376,8 @@ def vpnips(*, vpnconfig: VPNips, current_user: User = Depends(get_current_user))
with open('/etc/openmptcprouter-vps-admin/omr-6in4/user' + str(userid), 'w+') as n: with open('/etc/openmptcprouter-vps-admin/omr-6in4/user' + str(userid), 'w+') as n:
n.write('LOCALIP=' + localip + "\n") n.write('LOCALIP=' + localip + "\n")
n.write('REMOTEIP=' + remoteip + "\n") n.write('REMOTEIP=' + remoteip + "\n")
n.write('LOCALIP6=fe80::a0' + hex(userid)[2:] + ':1/126' + "\n") n.write('LOCALIP6=fd80::a0' + hex(userid)[2:] + ':1/126' + "\n")
n.write('REMOTEIP6=fe80::a0' + hex(userid)[2:] + ':2/126' + "\n") n.write('REMOTEIP6=fd80::a0' + hex(userid)[2:] + ':2/126' + "\n")
n.write('ULA=' + ula + "\n") n.write('ULA=' + ula + "\n")
final_md5 = hashlib.md5(file_as_bytes(open('/etc/openmptcprouter-vps-admin/omr-6in4/user' + str(userid), 'rb'))).hexdigest() final_md5 = hashlib.md5(file_as_bytes(open('/etc/openmptcprouter-vps-admin/omr-6in4/user' + str(userid), 'rb'))).hexdigest()
if not initial_md5 == final_md5: if not initial_md5 == final_md5:
@ -1408,9 +1408,9 @@ def vpnips(*, vpnconfig: VPNips, current_user: User = Depends(get_current_user))
if not ('OMR_ADDR_USER' + str(userid) +'=' in line and not userid == 0) and not ('OMR_ADDR=' in line and userid == 0): if not ('OMR_ADDR_USER' + str(userid) +'=' in line and not userid == 0) and not ('OMR_ADDR=' in line and userid == 0):
n.write(line) n.write(line)
if not userid == 0: if not userid == 0:
n.write('OMR_ADDR_USER' + str(userid) + '=fe80::a0' + hex(userid)[2:] + ':2/126' + '\n') n.write('OMR_ADDR_USER' + str(userid) + '=fd80::a0' + hex(userid)[2:] + ':2/126' + '\n')
elif userid == 0: elif userid == 0:
n.write('OMR_ADDR=fe80::a0' + hex(userid)[2:] + ':2/126' + '\n') n.write('OMR_ADDR=fd80::a0' + hex(userid)[2:] + ':2/126' + '\n')
os.close(fd) os.close(fd)
move(tmpfile, '/etc/shorewall6/params.vpn') move(tmpfile, '/etc/shorewall6/params.vpn')