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

Last bugFix

Browse source
This commit is contained in:
titoko 2012-12-19 18:17:37 +01:00
parent a4dafa8175
commit f94b04ec97
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
yunohost_firewall.py
View file

@ -28,8 +28,8 @@ def firewall_allow(protocol=None,port=None,ipv6=None):
port=int(port) port=int(port)
if port<65536 and port>0: if port<65536 and port>0:
if protocol == "Both": if protocol == "Both":
update_yml(port,'tcp','a',ipv6) update_yml(port,'TCP','a',ipv6)
update_yml(port,'udp','a',ipv6) update_yml(port,'UDP','a',ipv6)
else: else:
update_yml(port,protocol,'a',ipv6) update_yml(port,protocol,'a',ipv6)
@ -37,7 +37,7 @@ def firewall_allow(protocol=None,port=None,ipv6=None):
win_msg(_("Port successfully openned")) win_msg(_("Port successfully openned"))
else: else:
raise YunoHostError(22,_("Port not between 1 and 65535 : ")+port) raise YunoHostError(22,_("Port not between 1 and 65535 : ")+str(port))
return firewall_reload() return firewall_reload()
@ -59,8 +59,8 @@ def firewall_disallow(protocol=None,port=None,ipv6=None):
port=int(port) port=int(port)
if protocol == "Both": if protocol == "Both":
update_yml(port,'tcp','r',ipv6) update_yml(port,'TCP','r',ipv6)
update_yml(port,'udp','r',ipv6) update_yml(port,'UDP','r',ipv6)
else: else:
update_yml(port,protocol,'r',ipv6) update_yml(port,protocol,'r',ipv6)
win_msg(_("Port successfully closed")) win_msg(_("Port successfully closed"))
@ -162,14 +162,14 @@ def update_yml(port=None,protocol=None,mode=None,ipv6=None):
firewall[ip][protocol].append(port) firewall[ip][protocol].append(port)
else: else:
raise YunoHostError(22,_("Port already openned :")+port) raise YunoHostError(22,_("Port already openned :")+str(port))
else: else:
if port in firewall[ip][protocol]: if port in firewall[ip][protocol]:
firewall[ip][protocol].remove(port) firewall[ip][protocol].remove(port)
else: else:
raise YunoHostError(22,_("Port already closed :")+port) raise YunoHostError(22,_("Port already closed :")+str(port))
firewall[ip][protocol].sort() firewall[ip][protocol].sort()