diff options
| author | Simon Horman <horms@verge.net.au> | 2012-06-25 08:46:15 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2012-06-25 09:15:37 +0900 |
| commit | b0d77225fd1ba92123836fcaf0a595a3715584df (patch) | |
| tree | 9fd504dbee065097d9d0ab31d265bdf7fe78676e | |
| parent | 9e3899ca3427cf47fbd7df76f877f9f034a62bc3 (diff) | |
of1.2: Correct arguments to OFPMatch.parser() in OFPPacketIn
This corrects what appear to be two errors in the arguments
passed to OFPMatch.parser() by OFPPacketIn.parser().
* The buffer is msg.buf, buf doesn't exist in this context
* ofproto_v1_2.OFP_PACKET_IN_SIZE includes ofproto_v1_2.OFP_HEADER_SIZE
so it should not be added to the offset passed to OFPMatch.parser().
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/ofproto/ofproto_v1_2_parser.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ryu/ofproto/ofproto_v1_2_parser.py b/ryu/ofproto/ofproto_v1_2_parser.py index b5c31988..1649e0ad 100644 --- a/ryu/ofproto/ofproto_v1_2_parser.py +++ b/ryu/ofproto/ofproto_v1_2_parser.py @@ -233,8 +233,8 @@ class OFPPacketIn(MsgBase): ofproto_v1_2.OFP_PACKET_IN_PACK_STR, msg.buf, ofproto_v1_2.OFP_HEADER_SIZE) - offset = ofproto_v1_2.OFP_HEADER_SIZE + ofproto_v1_2.OFP_PACKET_IN_SIZE - msg.match = OFPMatch.parser(buf, offset - ofproto_v1_2.OFP_MATCH_SIZE) + msg.match = OFPMatch.parser(msg.buf, ofproto_v1_2.OFP_PACKET_IN_SIZE - + ofproto_v1_2.OFP_MATCH_SIZE) return msg |