Changeset 181

Timestamp:

07/27/12 01:08:30 (12 years ago)

Author:

atzm

Message:

• select client ssl handler per instance, not class

File:

• etherws/trunk/etherws.py (modified) (5 diffs)

etherws/trunk/etherws.py

@@ -349 +349 @@
 
 class EtherWebSocketClient(DebugMixIn):
-    def __init__(self, ioloop, switch, url, cred=None, debug=False):
+    def __init__(self, ioloop, switch, url, ssl_=None, cred=None, debug=False):
         self._ioloop = ioloop
         self._switch = switch
         self._url = url
+        self._ssl = ssl_
         self._debug = debug
         self._sock = None
@@ -367 +368 @@
 
     def open(self):
+        sslwrap = websocket._SSLSocketWrapper
+
         if not self.closed:
             raise websocket.WebSocketException('already opened')
-        self._sock = websocket.WebSocket()
-        self._sock.connect(self._url, **self._options)
-        self._switch.register_port(self)
-        self._ioloop.add_handler(self.fileno(), self, self._ioloop.READ)
-        self.dprintf('connected: %s\n', lambda: self._url)
+
+        if self._ssl:
+            websocket._SSLSocketWrapper = self._ssl
+
+        try:
+            self._sock = websocket.WebSocket()
+            self._sock.connect(self._url, **self._options)
+            self._switch.register_port(self)
+            self._ioloop.add_handler(self.fileno(), self, self._ioloop.READ)
+            self.dprintf('connected: %s\n', lambda: self._url)
+        finally:
+            websocket._SSLSocketWrapper = sslwrap
 
     def close(self):
@@ -474 +484 @@
     ioloop = tornado.ioloop.IOLoop.instance()
     fdb = FDB(ageout=args.ageout, debug=args.debug)
-    switch = SwitchingHub(fdb, debug=args.debug)
-
-    harg = {'switch': switch, 'htpasswd': args.htpasswd, 'debug': args.debug}
+    sw = SwitchingHub(fdb, debug=args.debug)
+
+    harg = {'switch': sw, 'htpasswd': args.htpasswd, 'debug': args.debug}
     serv = (args.path, EtherWebSocketHandler, harg)
     app = tornado.web.Application([serv])
@@ -483 +493 @@
 
     for dev in args.device:
-        tap = TapHandler(ioloop, switch, dev, debug=args.debug)
+        tap = TapHandler(ioloop, sw, dev, debug=args.debug)
         tap.open()
 
@@ -504 +514 @@
         args.passwd = getpass.getpass()
 
-    websocket._SSLSocketWrapper = ssl_wrapper(args.insecure, args.cacerts)
+    ssl_ = ssl_wrapper(args.insecure, args.cacerts)
     cred = {'user': args.user, 'passwd': args.passwd}
     ioloop = tornado.ioloop.IOLoop.instance()
     fdb = FDB(ageout=args.ageout, debug=args.debug)
-    switch = SwitchingHub(fdb, debug=args.debug)
+    sw = SwitchingHub(fdb, debug=args.debug)
 
     for uri in args.uri:
-        client = EtherWebSocketClient(ioloop, switch, uri, cred, args.debug)
+        client = EtherWebSocketClient(ioloop, sw, uri, ssl_, cred, args.debug)
         client.open()
 
     for dev in args.device:
-        tap = TapHandler(ioloop, switch, dev, debug=args.debug)
+        tap = TapHandler(ioloop, sw, dev, debug=args.debug)
         tap.open()