[Pkg-privacy-commits] [obfsproxy] 30/353: Fixed server supported transport list

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfsproxy.

commit 2aafb158ff33ee6c7ae84218d57c4ffdc768f75f
Author: Brandon Wiley <brandon at blanu.net>
Date:   Wed Aug 8 14:08:30 2012 -0500

    Fixed server supported transport list
---
 src/obfsproxy/framework/managed/server.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/obfsproxy/framework/managed/server.py b/src/obfsproxy/framework/managed/server.py
index e00feb0..dbb48bb 100755
--- a/src/obfsproxy/framework/managed/server.py
+++ b/src/obfsproxy/framework/managed/server.py
@@ -9,7 +9,11 @@ from monocle.stack import eventloop
 from monocle.stack.network import add_service, Service
 
 from obfsproxy.framework.proxy import ProxyHandler
-from obfsproxy.transports.dummy import DummyServer
+
+from obfsproxy.transports.dummy import DummyClient
+from obfsproxy.transports.rot13 import Rot13Client
+from obfsproxy.transports.dust_transport import DustClient
+from obfsproxy.transports.obfs3 import Obfs3Client
 
 from pyptlib.easy.server import init, reportSuccess, reportFailure, \
     reportEnd
@@ -25,7 +29,12 @@ class ManagedServer:
     def __init__(self):
         self.handler = ProxyHandler()
 
-        self.supportedTransports = ['dummy', 'rot13']
+        self.supportedTransports = {
+            'dummy': DummyClient,
+            'rot13': Rot13Client,
+            'dust': DustClient,
+            'obfs3': Obfs3Client,
+            }
 
         matchedTransports = init(self.supportedTransports)
         for transport in matchedTransports:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git