[Pkg-privacy-commits] [obfsproxy] 09/353: Removed support for external proxies

[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 4aed9f0e7be289ceca003a78044154a77d18ed67
Author: Brandon Wiley <brandon at blanu.net>
Date:   Fri Jun 29 14:58:24 2012 -0500

    Removed support for external proxies
---
 src/obfsproxy/cli/obfsproxy.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/obfsproxy/cli/obfsproxy.py b/src/obfsproxy/cli/obfsproxy.py
index 60e13ca..8cc0686 100644
--- a/src/obfsproxy/cli/obfsproxy.py
+++ b/src/obfsproxy/cli/obfsproxy.py
@@ -25,27 +25,29 @@ if __name__ == '__main__':
                         default=False,
                         help='enabled managed mode, for use when called by tor'
                         )
-    parser.add_argument('--dest', nargs=1,
-                        help='set destination, enable client mode instead of server mode'
-                        )
+#    parser.add_argument('--dest', nargs=1,
+#                        help='set destination, enable client mode instead of server mode'
+#                        )
 
-    parser.add_argument('obfsproxy_args')
-    parser.add_argument('protocol_name')
-    parser.add_argument('protocol_args')
-    parser.add_argument('protocol_options')
-    parser.add_argument('protocol_name')
+#    parser.add_argument('obfsproxy_args')
+#    parser.add_argument('protocol_name')
+#    parser.add_argument('protocol_args')
+#    parser.add_argument('protocol_options')
+#    parser.add_argument('protocol_name')
 
     args = parser.parse_args()
 
     print args
 
+    daemon=None
     if managed:
         if dest:
-            client = ManagedClient()
+            daemon = ManagedClient()
         else:
-            server = ManagedServer()
+            daemon = ManagedServer()
     else:
-        if dest:
-            client = ExternalClient()
-        else:
-            server = ExternalServer()
+        print('Unsupported mode. Only managed mode is available at the moment.')
+#        if dest:
+#            daemon = ExternalClient()
+#        else:
+#            daemon = ExternalServer()

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