extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-02-11 16:09:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mirror setup/restore logic

Browse Source
This commit is contained in:
Brian May 2015-12-15 13:39:00 +11:00
parent 7362ba9f52
commit 1e81bf3dfc
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sshuttle/firewall.py
View File

@ -175,21 +175,20 @@ def main(method_name, syslog):
udp = bool(int(udp)) udp = bool(int(udp))
debug2('firewall manager: Got udp: %r\n' % udp) debug2('firewall manager: Got udp: %r\n' % udp)
subnets_v6 = [i for i in subnets if i[0] == socket.AF_INET6]
nslist_v6 = [i for i in nslist if i[0] == socket.AF_INET6]
subnets_v4 = [i for i in subnets if i[0] == socket.AF_INET]
nslist_v4 = [i for i in nslist if i[0] == socket.AF_INET]
try: try:
debug1('firewall manager: setting up.\n') debug1('firewall manager: setting up.\n')
subnets_v6 = [i for i in subnets if i[0] == socket.AF_INET6]
nslist_v6 = [i for i in nslist if i[0] == socket.AF_INET6]
if len(subnets_v6) > 0 or len(nslist_v6) > 0: if len(subnets_v6) > 0 or len(nslist_v6) > 0:
debug2('firewall manager: setting up IPv6.\n') debug2('firewall manager: setting up IPv6.\n')
method.setup_firewall( method.setup_firewall(
port_v6, dnsport_v6, nslist_v6, port_v6, dnsport_v6, nslist_v6,
socket.AF_INET6, subnets_v6, udp) socket.AF_INET6, subnets_v6, udp)
subnets_v4 = [i for i in subnets if i[0] == socket.AF_INET]
nslist_v4 = [i for i in nslist if i[0] == socket.AF_INET]
if len(subnets_v4) > 0 or len(nslist_v4) > 0: if len(subnets_v4) > 0 or len(nslist_v4) > 0:
debug2('firewall manager: setting up IPv4.\n') debug2('firewall manager: setting up IPv4.\n')
method.setup_firewall( method.setup_firewall(
@ -227,7 +226,7 @@ def main(method_name, syslog):
pass pass
try: try:
if port_v6: if len(subnets_v6) > 0 or len(nslist_v6) > 0:
debug2('firewall manager: undoing IPv6 changes.\n') debug2('firewall manager: undoing IPv6 changes.\n')
method.restore_firewall(port_v6, socket.AF_INET6, udp) method.restore_firewall(port_v6, socket.AF_INET6, udp)
except: except:
@ -240,9 +239,9 @@ def main(method_name, syslog):
pass pass
try: try:
if port_v4: if len(subnets_v4) > 0 or len(nslist_v4) > 0:
debug2('firewall manager: undoing IPv4 changes.\n') debug2('firewall manager: undoing IPv4 changes.\n')
method.restore_firewall(port_v4, socket.AF_INET, udp) method.restore_firewall(port_v4, socket.AF_INET, udp)
except: except:
try: try:
debug1("firewall manager: " debug1("firewall manager: "