From bddf81edfc07aab065c12b245665b613d2f61e13 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sun, 17 May 2015 11:31:02 +1200 Subject: websockets: lINTEGER to specify payload length --- libpathod/language/websockets.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'libpathod/language/websockets.py') diff --git a/libpathod/language/websockets.py b/libpathod/language/websockets.py index 428f3b4d..a006c50d 100644 --- a/libpathod/language/websockets.py +++ b/libpathod/language/websockets.py @@ -10,6 +10,7 @@ from . import base, generators, actions, message wf:-fin:-rsv1:-rsv2:-rsv3:-mask wf:l234 + wf:mask:r"foo """ @@ -64,11 +65,17 @@ class KeyNone(base.CaselessLiteral): TOK = "knone" +class Length(base.Integer): + bounds = (0, 1<<64) + preamble = "l" + + class WebsocketFrame(message.Message): comps = ( Body, OpCode, + Length, # Bit flags Fin, RSV1, @@ -122,6 +129,10 @@ class WebsocketFrame(message.Message): def knone(self): return self.tok(KeyNone) + @property + def toklength(self): + return self.tok(Length) + @classmethod def expr(klass): parts = [i.expr() for i in klass.comps] @@ -157,6 +168,8 @@ class WebsocketFrame(message.Message): else: bodygen = None length = 0 + if self.toklength: + length = int(self.toklength.value) frameparts = dict( payload_length = length ) -- cgit v1.2.3