YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

bugfix

Browse source
This commit is contained in:
titoko 2013-07-07 15:48:25 +02:00
parent cb22adf7b6
commit cf6bc4076e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
yunohost_firewall.py
View file

@ -181,9 +181,9 @@ def update_yml(port=None, protocol=None, mode=None, ipv6=None, upnp=False):
if mode == 'a': if mode == 'a':
if port not in firewall[ip][protocol]: if port not in firewall[ip][protocol]:
firewall[ip][protocol].append(port) firewall[ip][protocol].append(port)
if !ipv6 and upnp: if not ipv6 and upnp:
firewall['UPNP']['ports'][protocol].append(port) firewall['UPNP']['ports'][protocol].append(port)
elif !ipv6 and upnp: elif not ipv6 and upnp:
if port not in firewall['UPNP']['ports'][protocol]: if port not in firewall['UPNP']['ports'][protocol]:
firewall['UPNP']['ports'][protocol].append(port) firewall['UPNP']['ports'][protocol].append(port)
else: else:
@ -193,13 +193,13 @@ def update_yml(port=None, protocol=None, mode=None, ipv6=None, upnp=False):
raise YunoHostError(22, _("Port already openned :") + str(port)) raise YunoHostError(22, _("Port already openned :") + str(port))
else: else:
if !ipv6 and upnp: if not ipv6 and upnp:
if port in firewall['UPNP']['ports'][protocol]: if port in firewall['UPNP']['ports'][protocol]:
firewall['UPNP']['ports'][protocol].remove(port) firewall['UPNP']['ports'][protocol].remove(port)
else: else:
raise YunoHostError(22, _("Upnp redirection already deleted :") + str(port)) raise YunoHostError(22, _("Upnp redirection already deleted :") + str(port))
elif !ipv6: elif not ipv6:
if port in firewall['UPNP']['ports'][protocol]: if port in firewall['UPNP']['ports'][protocol]:
firewall['UPNP']['ports'][protocol].remove(port) firewall['UPNP']['ports'][protocol].remove(port)
@ -241,7 +241,7 @@ def add_portmapping(protocol=None, upnp=False, ipv6=None, mode=None,):
else: else:
os.system("iptables -P INPUT ACCEPT") os.system("iptables -P INPUT ACCEPT")
if upnp and !ipv6 and mode == 'a': if upnp and not ipv6 and mode == 'a':
remove_portmapping() remove_portmapping()
if ipv6: if ipv6:
@ -256,7 +256,7 @@ def add_portmapping(protocol=None, upnp=False, ipv6=None, mode=None,):
os.system("ip6tables -A INPUT -p " + protocol + " -i eth0 --dport " + str(port) + " -j ACCEPT") os.system("ip6tables -A INPUT -p " + protocol + " -i eth0 --dport " + str(port) + " -j ACCEPT")
else: else:
os.system("iptables -A INPUT -p " + protocol + " -i eth0 --dport " + str(port) + " -j ACCEPT") os.system("iptables -A INPUT -p " + protocol + " -i eth0 --dport " + str(port) + " -j ACCEPT")
if upnp and !ipv6: if upnp and not ipv6:
if port in firewall['UPNP']['ports'][protocol]: if port in firewall['UPNP']['ports'][protocol]:
upnpc = miniupnpc.UPnP() upnpc = miniupnpc.UPnP()
upnpc.discoverdelay = 200 upnpc.discoverdelay = 200