extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-04-27 12:49:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #617 from patrislav1/bugfix-iptables-wait

Browse Source 
Fix firewall setup/teardown failure on xtable lock
This commit is contained in:
Brian May 2021-03-20 11:27:20 +11:00 committed by GitHub
commit 4257c8d34e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sshuttle/linux.py
View File

@ -17,7 +17,7 @@ def ipt_chain_exists(family, table, name):
cmd = 'iptables' cmd = 'iptables'
else: else:
raise Exception('Unsupported family "%s"' % family_to_string(family)) raise Exception('Unsupported family "%s"' % family_to_string(family))
argv = [cmd, '-t', table, '-nL'] argv = [cmd, '-w', '-t', table, '-nL']
try: try:
output = ssubprocess.check_output(argv, env=get_env()) output = ssubprocess.check_output(argv, env=get_env())
for line in output.decode('ASCII').split('\n'): for line in output.decode('ASCII').split('\n'):
@ -29,9 +29,9 @@ def ipt_chain_exists(family, table, name):
def ipt(family, table, *args): def ipt(family, table, *args):
if family == socket.AF_INET6: if family == socket.AF_INET6:
argv = ['ip6tables', '-t', table] + list(args) argv = ['ip6tables', '-w', '-t', table] + list(args)
elif family == socket.AF_INET: elif family == socket.AF_INET:
argv = ['iptables', '-t', table] + list(args) argv = ['iptables', '-w', '-t', table] + list(args)
else: else:
raise Exception('Unsupported family "%s"' % family_to_string(family)) raise Exception('Unsupported family "%s"' % family_to_string(family))
debug1('%s' % ' '.join(argv)) debug1('%s' % ' '.join(argv))