1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00

Merge pull request from titoko/dev

fix ipv6
This commit is contained in:
abeudin 2013-04-10 06:43:31 -07:00
commit 55cab5c48a

View file

@ -186,7 +186,11 @@ def add_portmapping(protocol=None, upnp=False, ipv6=None):
Return
None
"""
os.system ("iptables -P INPUT ACCEPT")
if ipv6:
os.system ("ip6tables -P INPUT ACCEPT")
else:
os.system ("iptables -P INPUT ACCEPT")
if upnp:
upnp = miniupnpc.UPnP()
upnp.discoverdelay = 200
@ -214,7 +218,10 @@ def add_portmapping(protocol=None, upnp=False, ipv6=None):
firewall = yaml.load(f)
for i,port in enumerate (firewall[ip][protocol]):
os.system ("iptables -A INPUT -p "+ protocol +" -i eth0 --dport "+ str(port) +" -j ACCEPT")
if ipv6:
os.system ("ip6tables -A INPUT -p "+ protocol +" -i eth0 --dport "+ str(port) +" -j ACCEPT")
else:
os.system ("iptables -A INPUT -p "+ protocol +" -i eth0 --dport "+ str(port) +" -j ACCEPT")
if upnp:
upnp.addportmapping(port, protocol, upnp.lanaddr, port, 'yunohost firewall : port %u' % port, '')