summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvery Pennarun <apenwarr@gmail.com>2010-05-08 03:35:57 -0400
committerAvery Pennarun <apenwarr@gmail.com>2010-05-08 16:14:36 -0400
commit5a4a2ab7f92e644f3e3ab9bcf2d6d14cce4c80cf (patch)
tree780a49349bbac791ac84b4af15c53890cee43ef4
parent33efa5ac62eaf9cf924de88d2dfde7547ed9e570 (diff)
Oops, previous change to ipfw settings prevented cleanup from working.
-rw-r--r--firewall.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/firewall.py b/firewall.py
index ff21369..fd0c8c1 100644
--- a/firewall.py
+++ b/firewall.py
@@ -58,7 +58,7 @@ def ipfw_rule_exists(n):
p = subprocess.Popen(argv, stdout = subprocess.PIPE)
for line in p.stdout:
if line.startswith('%05d ' % n):
- if line[5:].find('ipttl 42') < 0:
+ if line.find('ipttl 42') < 0 and line.find('established') < 0:
raise Fatal('non-sshuttle ipfw rule #%d already exists!' % n)
return True
rv = p.wait()