Changeset 277

Timestamp:

06/22/15 23:43:14 (9 years ago)

Author:

atzm

Message:

• proxy support

Location:

etherws/trunk

Files:

• etherws.py (modified) (2 diffs)
• setup.py (modified) (1 diff)

etherws/trunk/etherws.py

@@ -686 +686 @@
 
         self._sslopt = kwargs.get('sslopt', {})
-        self._options = {}
+        self._options = self._getproxy()
 
         cred = kwargs.get('cred', None)
@@ -718 +718 @@
             raise websocket.WebSocketException('Closed socket')
         return self.device.recv()
+
+    def _getproxy(self):
+        scheme, remain = urllib2.splittype(self.target)
+
+        proxy = urllib2.getproxies().get(scheme.replace('ws', 'http'))
+        if not proxy:
+            return {}
+
+        host = urllib2.splitport(urllib2.splithost(remain)[0])[0]
+        if urllib2.proxy_bypass(host):
+            return {}
+
+        hostport = urllib2.splithost(urllib2.splittype(proxy)[1])[0]
+        host, port = urllib2.splitport(hostport)
+        port = int(port) if port else 0
+        return {'http_proxy_host': host, 'http_proxy_port': port}
 
 

etherws/trunk/setup.py

@@ -49 +49 @@
     install_requires=[
         'python-pytun>=2.1',
-        'websocket-client>=0.12.0',
+        'websocket-client>=0.14.0',
         'tornado>=2.4',
     ],