commit 29929c7f049f2ee738da2ca4e0c5cd6847cb4143
Author: Ximin Luo <[email protected]>
Date: Wed Jun 4 19:22:01 2014 +0100
- fix launching obfs3_flashproxy
---
obfs-flash-client | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/obfs-flash-client b/obfs-flash-client
index cc45d40..963d48a 100755
--- a/obfs-flash-client
+++ b/obfs-flash-client
@@ -415,7 +415,9 @@ def main(*args):
if opts.f:
file_contents = opts.f.read()
configuration = Config.parse(file_contents)
- pt_method_names = configuration.alias_map.keys()
+ pt_method_names = configuration.alias_map.keys()
+ else:
+ pt_method_names = ["obfs3_flashproxy"]
client = ClientTransportPlugin()
client.init(pt_method_names) # Initialize our possible methods to all the
chains listed by the fog file and stored in alias map.
@@ -429,7 +431,7 @@ def main(*args):
if configuration:
pt_launch_pair(reactor, client, opts.callback_port, configuration,
pt_method_names[0])
else:
- logging.warn("No configuration file specified. Defaulting to launching
obfs|flashproxy pair.")
+ logging.warn("No configuration file specified. Defaulting to launching
obfs3|flashproxy pair.")
obfs3_flashproxy(reactor, client, opts.callback_port, opts.fp_remote,
opts.fp_arg or [])
reactor.run(installSignalHandlers=0)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
