From 08b2e2a6a98fd175e1b49d62dffde34e91c77b1c Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Fri, 1 May 2015 10:31:20 +1200
Subject: websockets: more flexible masking interface.

---
 netlib/websockets.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'netlib/websockets.py')

diff --git a/netlib/websockets.py b/netlib/websockets.py
index 84eb03ba..0ad0e294 100644
--- a/netlib/websockets.py
+++ b/netlib/websockets.py
@@ -48,13 +48,18 @@ class Masker:
         self.masks = [utils.bytes_to_int(byte) for byte in key]
         self.offset = 0
 
-    def __call__(self, data):
+    def mask(self, offset, data):
         result = ""
         for c in data:
-            result += chr(ord(c) ^ self.masks[self.offset % 4])
-            self.offset += 1
+            result += chr(ord(c) ^ self.masks[offset % 4])
+            offset += 1
         return result
 
+    def __call__(self, data):
+        ret = self.mask(self.offset, data)
+        self.offset += len(ret)
+        return ret
+
 
 def client_handshake_headers(key=None, version=VERSION):
     """
-- 
cgit v1.2.3