extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-04-23 18:58:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make iptables functions work with any table, not just nat.

Browse Source
This commit is contained in:
Brian May 2011-06-06 12:00:27 +10:00
parent 061e6a0933
commit 4db9b372c2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
firewall.py
View File

@ -14,12 +14,12 @@ def nonfatal(func, *args):
log('error: %s\n' % e) log('error: %s\n' % e)
def ipt_chain_exists(family, name): def ipt_chain_exists(family, table, name):
if family == socket.AF_INET: if family == socket.AF_INET:
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', 'nat', '-nL'] argv = [cmd, '-t', table, '-nL']
p = ssubprocess.Popen(argv, stdout = ssubprocess.PIPE) p = ssubprocess.Popen(argv, stdout = ssubprocess.PIPE)
for line in p.stdout: for line in p.stdout:
if line.startswith('Chain %s ' % name): if line.startswith('Chain %s ' % name):
@ -29,9 +29,9 @@ def ipt_chain_exists(family, name):
raise Fatal('%r returned %d' % (argv, rv)) raise Fatal('%r returned %d' % (argv, rv))
def _ipt(family, *args): def _ipt(family, table, *args):
if family == socket.AF_INET: if family == socket.AF_INET:
argv = ['iptables', '-t', 'nat'] + list(args) argv = ['iptables', '-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\n' % ' '.join(argv)) debug1('>> %s\n' % ' '.join(argv))
@ -70,15 +70,16 @@ def do_iptables(port, dnsport, family, subnets):
if family != socket.AF_INET: if family != socket.AF_INET:
raise Exception('Address family "%s" unsupported by nat method'%family_to_string(family)) raise Exception('Address family "%s" unsupported by nat method'%family_to_string(family))
table = "nat"
def ipt(*args): def ipt(*args):
return _ipt(family, *args) return _ipt(family, table, *args)
def ipt_ttl(*args): def ipt_ttl(*args):
return _ipt_ttl(family, *args) return _ipt_ttl(family, table, *args)
chain = 'sshuttle-%s' % port chain = 'sshuttle-%s' % port
# basic cleanup/setup of chains # basic cleanup/setup of chains
if ipt_chain_exists(family, chain): if ipt_chain_exists(family, table, chain):
nonfatal(ipt, '-D', 'OUTPUT', '-j', chain) nonfatal(ipt, '-D', 'OUTPUT', '-j', chain)
nonfatal(ipt, '-D', 'PREROUTING', '-j', chain) nonfatal(ipt, '-D', 'PREROUTING', '-j', chain)
nonfatal(ipt, '-F', chain) nonfatal(ipt, '-F', chain)