From ba19d9c72d86436a405d4f544f75c4d3dc76ab05 Mon Sep 17 00:00:00 2001
From: Avery Pennarun <apenwarr@gmail.com>
Date: Tue, 4 May 2010 22:05:49 -0400
Subject: [PATCH] Rename iptables->firewall.

Since we "almost" support ipfw on MacOS (which I guess might mean FreeBSD
too), the name should be a bit more generic.
---
 client.py                  | 16 ++++++++--------
 iptables.py => firewall.py |  0
 main.py                    | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename iptables.py => firewall.py (100%)

diff --git a/client.py b/client.py
index aa977c2..718410f 100644
--- a/client.py
+++ b/client.py
@@ -19,14 +19,14 @@ def original_dst(sock):
         raise
 
 
-class IPTables:
+class FirewallClient:
     def __init__(self, port, subnets):
         self.port = port
         self.subnets = subnets
         subnets_str = ['%s/%d' % (ip,width) for ip,width in subnets]
         argvbase = ([sys.argv[0]] +
                     ['-v'] * (helpers.verbose or 0) +
-                    ['--iptables', str(port)] + subnets_str)
+                    ['--firewall', str(port)] + subnets_str)
         argv_tries = [
             ['sudo'] + argvbase,
             ['su', '-c', ' '.join(argvbase)],
@@ -53,7 +53,7 @@ class IPTables:
         s1.close()
         self.pfile = s2.makefile('wb+')
         if e:
-            log('Spawning iptables: %r\n' % self.argv)
+            log('Spawning firewall manager: %r\n' % self.argv)
             raise Fatal(e)
         line = self.pfile.readline()
         self.check()
@@ -80,7 +80,7 @@ class IPTables:
             raise Fatal('cleanup: %r returned %d' % (self.argv, rv))
 
 
-def _main(listener, ipt, use_server, remotename):
+def _main(listener, fw, use_server, remotename):
     handlers = []
     if use_server:
         if helpers.verbose >= 1:
@@ -104,7 +104,7 @@ def _main(listener, ipt, use_server, remotename):
 
     # we definitely want to do this *after* starting ssh, or we might end
     # up intercepting the ssh connection!
-    ipt.start()
+    fw.start()
 
     def onaccept():
         sock,srcip = listener.accept()
@@ -176,9 +176,9 @@ def main(listenip, use_server, remotename, subnets):
     listenip = listener.getsockname()
     debug1('Listening on %r.\n' % (listenip,))
 
-    ipt = IPTables(listenip[1], subnets)
+    fw = FirewallClient(listenip[1], subnets)
     
     try:
-        return _main(listener, ipt, use_server, remotename)
+        return _main(listener, fw, use_server, remotename)
     finally:
-        ipt.done()
+        fw.done()
diff --git a/iptables.py b/firewall.py
similarity index 100%
rename from iptables.py
rename to firewall.py
diff --git a/main.py b/main.py
index 9e3b90c..15eb4cc 100755
--- a/main.py
+++ b/main.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import sys, os, re
-import helpers, options, client, server, iptables
+import helpers, options, client, server, firewall
 from helpers import *
 
 
@@ -46,7 +46,7 @@ def parse_ipport(s):
 
 optspec = """
 sshuttle [-l [ip:]port] [-r [username@]sshserver[:port]] <subnets...>
-sshuttle --iptables <port> <subnets...>
+sshuttle --firewall <port> <subnets...>
 sshuttle --server
 --
 l,listen=  transproxy to this ip address and port number [default=0]
@@ -54,7 +54,7 @@ r,remote=  ssh hostname (and optional username) of remote sshuttle server
 v,verbose  increase debug message verbosity
 noserver   don't use a separate server process (mostly for debugging)
 server     [internal use only]
-iptables   [internal use only]
+firewall   [internal use only]
 """
 o = options.Options('sshuttle', optspec)
 (opt, flags, extra) = o.parse(sys.argv[1:])
@@ -64,10 +64,10 @@ helpers.verbose = opt.verbose
 try:
     if opt.server:
         sys.exit(server.main())
-    elif opt.iptables:
+    elif opt.firewall:
         if len(extra) < 1:
             o.fatal('at least one argument expected')
-        sys.exit(iptables.main(int(extra[0]),
+        sys.exit(firewall.main(int(extra[0]),
                                parse_subnets(extra[1:])))
     else:
         if len(extra) < 1: