Changeset 9870 for branches/bosh_support/src/common/xmpp/client_nb.py

Timestamp:

07/01/08 01:02:12 (5 months ago)

Author:

tomk

Message:

moved TLS and SSL classes from transports_nb to new tls_nb module, fixed HTTP CONNECT proxy transport

Files:

• branches/bosh_support/src/common/xmpp/client_nb.py (modified) (3 diffs)

branches/bosh_support/src/common/xmpp/client_nb.py

@@ -26 +26 @@
 import random
 
-import transports_nb, dispatcher_nb, auth_nb, roster_nb, protocol
+import transports_nb, tls_nb, dispatcher_nb, auth_nb, roster_nb, protocol
 from client import *
 
@@ -185 +185 @@
                                                 bosh_port = tcp_port)
                         else:
-                                        self.socket = transports_nb.NBHTTPProxySocket(
-                                                on_disconnect=self.on_disconnect,
-                                                proxy_creds=(None, None),
-                                                xmpp_server=(self.Server, self.Port))
+                                # HTTP CONNECT to proxy from environment variables
+                                self.socket = transports_nb.NBHTTPProxySocket(
+                                        on_disconnect=self.on_disconnect,
+                                        proxy_creds=(None, None),
+                                        xmpp_server=(self.Server, self.Port))
                 else: 
                         self._on_tcp_failure = self._on_connect_failure
@@ -433 +434 @@
                                 return
                         # otherwise start TLS   
-                        transports_nb.NonBlockingTLS().PlugIn(
+                        tls_nb.NonBlockingTLS().PlugIn(
                                 self,
                                 on_tls_success=lambda: self._xmpp_connect(socket_type='tls'),