From 2a7f243425b4daef90268854c6b183642a55a1f0 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Fri, 10 Aug 2012 01:40:27 +0900 Subject: of: Fix OFPEchoRequest serialize The spec allows zero-length data. Signed-off-by: FUJITA Tomonori Reviewed-by: Simon Horman --- ryu/ofproto/ofproto_v1_0_parser.py | 4 ++-- ryu/ofproto/ofproto_v1_2_parser.py | 4 ++-- ryu/ofproto/ofproto_v1_3_parser.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ryu/ofproto/ofproto_v1_0_parser.py b/ryu/ofproto/ofproto_v1_0_parser.py index a0b15f4f..001044a3 100644 --- a/ryu/ofproto/ofproto_v1_0_parser.py +++ b/ryu/ofproto/ofproto_v1_0_parser.py @@ -1166,8 +1166,8 @@ class OFPEchoRequest(MsgBase): return msg def _serialize_body(self): - assert self.data is not None - self.buf += self.data + if self.data is not None: + self.buf += self.data @_register_parser diff --git a/ryu/ofproto/ofproto_v1_2_parser.py b/ryu/ofproto/ofproto_v1_2_parser.py index 68b772c7..648ef1b7 100644 --- a/ryu/ofproto/ofproto_v1_2_parser.py +++ b/ryu/ofproto/ofproto_v1_2_parser.py @@ -99,8 +99,8 @@ class OFPEchoRequest(MsgBase): return msg def _serialize_body(self): - assert self.data is not None - self.buf += self.data + if self.data is not None: + self.buf += self.data @_register_parser diff --git a/ryu/ofproto/ofproto_v1_3_parser.py b/ryu/ofproto/ofproto_v1_3_parser.py index 1bca5997..eabc6b84 100644 --- a/ryu/ofproto/ofproto_v1_3_parser.py +++ b/ryu/ofproto/ofproto_v1_3_parser.py @@ -96,8 +96,8 @@ class OFPEchoRequest(MsgBase): return msg def _serialize_body(self): - assert self.data is not None - self.buf += self.data + if self.data is not None: + self.buf += self.data @_register_parser -- cgit v1.2.3