diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2012-08-10 01:40:27 +0900 |
---|---|---|
committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2012-08-10 10:19:17 +0900 |
commit | 2a7f243425b4daef90268854c6b183642a55a1f0 (patch) | |
tree | 00f3dbece1ad63d24e7d2a86dab5bc441036c21b | |
parent | 1eb52f7671907f94e12e0a8860e8e05d892f8227 (diff) |
of: Fix OFPEchoRequest serialize
The spec allows zero-length data.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: Simon Horman <horms@verge.net.au>
-rw-r--r-- | ryu/ofproto/ofproto_v1_0_parser.py | 4 | ||||
-rw-r--r-- | ryu/ofproto/ofproto_v1_2_parser.py | 4 | ||||
-rw-r--r-- | 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 |