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 when ip are on multiple interfaces

Browse source
This commit is contained in:
Ycarus 2020-09-20 08:31:04 +02:00
parent 2737c91e17
commit 4e6b8ea2d5
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
omr-admin.py
View file

@ -263,6 +263,7 @@ def add_gre_tunnels():
nbgre = nbgre + 1 nbgre = nbgre + 1
userid = 0 userid = 0
username = user username = user
iface = intf.split(':')[0]
if 'userid' in content['users'][0][user]: if 'userid' in content['users'][0][user]:
userid = content['users'][0][user]['userid'] userid = content['users'][0][user]['userid']
if 'username' in content['users'][0][user]: if 'username' in content['users'][0][user]:
@ -284,7 +285,7 @@ def add_gre_tunnels():
for line in h: for line in h:
if not '# OMR GRE for public IP ' + str(addr) + ' for user ' + str(user) in line: if not '# OMR GRE for public IP ' + str(addr) + ' for user ' + str(user) in line:
n.write(line) n.write(line)
n.write('SNAT(' + str(addr) + ') ' + str(network) + ' ' + str(intf.split(':')[0]) + ' # OMR GRE for public IP ' + str(addr) + ' for user ' + str(user) + "\n") n.write('SNAT(' + str(addr) + ') ' + str(network) + ' ' + str(iface) + ' # OMR GRE for public IP ' + str(addr) + ' for user ' + str(user) + "\n")
os.close(fd) os.close(fd)
move(tmpfile, '/etc/shorewall/snat') move(tmpfile, '/etc/shorewall/snat')
#fd, tmpfile = mkstemp() #fd, tmpfile = mkstemp()
@ -295,6 +296,15 @@ def add_gre_tunnels():
# n.write('vpn gre-user' + str(userid) + '-ip' + str(nbip) + ' nosmurfs,tcpflags' + "\n") # n.write('vpn gre-user' + str(userid) + '-ip' + str(nbip) + ' nosmurfs,tcpflags' + "\n")
#os.close(fd) #os.close(fd)
#move(tmpfile, '/etc/shorewall/interfaces') #move(tmpfile, '/etc/shorewall/interfaces')
if str(iface) != IFACE:
fd, tmpfile = mkstemp()
with open('/etc/shorewall/interfaces', 'r') as h, open(tmpfile, 'a+') as n:
for line in h:
if not str(iface) in line:
n.write(line)
n.write('net ' + str(iface) + ' dhcp,nosmurfs,tcpflags,routefilter,sourceroute=0' + "\n")
os.close(fd)
move(tmpfile, '/etc/shorewall/interfaces')
user_gre_tunnels = {} user_gre_tunnels = {}
if 'gre_tunnels' in content['users'][0][user]: if 'gre_tunnels' in content['users'][0][user]:
user_gre_tunnels = content['users'][0][user]['gre_tunnels'] user_gre_tunnels = content['users'][0][user]['gre_tunnels']