[Pkg-privacy-commits] [obfsproxy] 49/353: Fixed ORPort setting in pyptlib

[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 1e0694f4afff1beb6cb5cd834b2218248af7d0c6
Author: Brandon Wiley <brandon at blanu.net>
Date:   Mon Sep 3 13:52:39 2012 -0500

    Fixed ORPort setting in pyptlib
---
 src/obfsproxy/framework/managed/server.py | 2 +-
 src/obfsproxy/framework/proxy.py          | 1 +
 src/obfsproxy/framework/pump.py           | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/obfsproxy/framework/managed/server.py b/src/obfsproxy/framework/managed/server.py
index e6ad23d..416746b 100755
--- a/src/obfsproxy/framework/managed/server.py
+++ b/src/obfsproxy/framework/managed/server.py
@@ -27,7 +27,7 @@ class TransportLaunchException(Exception):
 class ManagedServer:
 
     def __init__(self):
-        self.handler = ProxyHandler('127.0.0.1', getORPort())
+        self.handler = ProxyHandler(*getORPort())
 
         self.supportedTransports = {
             'dummy': DummyServer,
diff --git a/src/obfsproxy/framework/proxy.py b/src/obfsproxy/framework/proxy.py
index b2fa590..672aa4a 100644
--- a/src/obfsproxy/framework/proxy.py
+++ b/src/obfsproxy/framework/proxy.py
@@ -41,6 +41,7 @@ class ProxyHandler:
         """ handle is called by the framework to establish a new proxy connection to the Tor server and start processing when an incoming client connection is established. """
 
         print 'connection'
+        print 'connecting %s:%d' % (self.addr, self.port)
         client = Client()
         yield client.connect(self.addr, self.port)
 
diff --git a/src/obfsproxy/framework/pump.py b/src/obfsproxy/framework/pump.py
index a698572..ced7e88 100644
--- a/src/obfsproxy/framework/pump.py
+++ b/src/obfsproxy/framework/pump.py
@@ -4,6 +4,7 @@
 """ The pump module contains the Pump class, which takes care of moving bytes between the upstream and downstream connections. """
 
 import logging
+from traceback import print_exc
 
 import monocle
 monocle.init('tornado')
@@ -75,6 +76,7 @@ class Pump(object):
                 return
             except IOError:
                 print 'IOError'
+		print_exc()
                 return
             except Exception, e:
                 print 'Exception'

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