[tor-commits] [obfsproxy/master] When in external mode, only call setup() of the transports we are launching.

[asn at torproject.org]

commit 3d636a9660ffef71f1ec3d5ecbe4179098ebcbd7
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri May 9 15:50:57 2014 +0100

    When in external mode, only call setup() of the transports we are launching.
---
 ChangeLog                |    2 ++
 obfsproxy/pyobfsproxy.py |    7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b6a2ad4..bca3df6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@ Changes in version 0.2.11 - UNRELEASED:
    Thanks to Yawning Angel.
  - Improve scramblesuit's packet morphing algorithm. Fixes bug #10991.
    Thanks to Yawning Angel.
+ - When in external mode, only call the setup() method of the
+   transport we are going to launch, not of all transports.
 
 
 Changes in version 0.2.10 - 2014-06-05:
diff --git a/obfsproxy/pyobfsproxy.py b/obfsproxy/pyobfsproxy.py
index b91ccc1..90e5729 100755
--- a/obfsproxy/pyobfsproxy.py
+++ b/obfsproxy/pyobfsproxy.py
@@ -98,7 +98,7 @@ def do_external_mode(args):
         pt_config.setProxy(proxy)
 
     # Run setup() method.
-    run_transport_setup(pt_config)
+    run_transport_setup(pt_config, args.name)
 
     launch_transport.launch_transport_listener(args.name, args.listen_addr, args.mode, args.dest, pt_config, args.ext_cookie_file)
     log.info("Launched '%s' listener at '%s:%s' for transport '%s'." % \
@@ -143,10 +143,11 @@ def consider_cli_args(args):
             log.error("Failed to parse proxy specifier: %s", e)
             sys.exit(1)
 
-def run_transport_setup(pt_config):
+def run_transport_setup(pt_config, transport_name):
     """Run the setup() method for our transports."""
     for transport, transport_class in transports.transports.items():
-        transport_class['base'].setup(pt_config)
+        if transport == transport_name:
+            transport_class['base'].setup(pt_config)
 
 def pyobfsproxy():
     """Actual pyobfsproxy entry-point."""