Changeset 139

Timestamp:

05/13/12 21:48:13 (13 years ago)

Author:

atzm

Message:

• add direct binary transmission support (to improve performance)

File:

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

etherws/trunk/etherws.py

@@ -9 +9 @@
 #   - websocket-client-0.7.0
 #   - tornado-2.2.1
-#
-# todo:
-#   - direct binary transmission support (to improve performance)
 #
 # ===========================================================================
@@ -43 +40 @@
 import os
 import sys
-import base64
 import argparse
 import threading
@@ -76 +72 @@
             sys.stderr.write('%s: %s\n' % (caller.__class__.__name__,
                                            message.encode('hex')))
-
         try:
             self._write_lock.acquire()
@@ -86 +81 @@
                 self._tap.write(message)
 
-            message = base64.b64encode(message)
-
             for c in clients:
-                c.write_message(message)
+                c.write_message(message, True)
 
         finally:
@@ -108 +101 @@
 
     def on_message(self, message):
-        self._tap.write(self, base64.b64decode(message))
+        self._tap.write(self, message)
 
     def on_close(self):
@@ -158 +151 @@
     tap = TapHandler(args.device, debug=args.debug)
     client = websocket.WebSocketApp(args.uri)
-    client.write_message = client.send
-    client.on_message = lambda s, m: tap.write(client, base64.b64decode(m))
+    client.on_message = lambda s, m: tap.write(client, m)
+    client.write_message = \
+        lambda m, b: client.sock.send(m, websocket.ABNF.OPCODE_BINARY)
     tap.register_client(client)