diff options
| author | YAMAMOTO Takashi <yamamoto@valinux.co.jp> | 2013-09-13 12:24:33 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-09-14 11:02:31 +0900 |
| commit | 3f135fd50105d39a814ead7c24811721785280f5 (patch) | |
| tree | e448936070acfda1d4d07bca490904a7694c1a60 | |
| parent | 5f7cd86cdba0b798fb72da587b251dda29c50ff6 (diff) | |
of12, of13: fix OFPActionSetField padding
the problem reported by Nitin Sharma on ryu-devel.
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/ofproto/ofproto_v1_2_parser.py | 2 | ||||
| -rw-r--r-- | ryu/ofproto/ofproto_v1_3_parser.py | 2 |
2 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 c066d518..db36ce29 100644 --- a/ryu/ofproto/ofproto_v1_2_parser.py +++ b/ryu/ofproto/ofproto_v1_2_parser.py @@ -1474,7 +1474,7 @@ class OFPActionSetField(OFPAction): len_ = ofproto_v1_2.oxm_serialize(n, value, mask, buf, offset + 4) self.len = utils.round_up(4 + len_, 8) msg_pack_into('!HH', buf, offset, self.type, self.len) - pad_len = self.len - len_ + pad_len = self.len - (4 + len_) ofproto_parser.msg_pack_into("%dx" % pad_len, buf, offset + 4 + len_) # XXX old api compat diff --git a/ryu/ofproto/ofproto_v1_3_parser.py b/ryu/ofproto/ofproto_v1_3_parser.py index 7d13c656..940f2d17 100644 --- a/ryu/ofproto/ofproto_v1_3_parser.py +++ b/ryu/ofproto/ofproto_v1_3_parser.py @@ -2940,7 +2940,7 @@ class OFPActionSetField(OFPAction): len_ = ofproto_v1_3.oxm_serialize(n, value, mask, buf, offset + 4) self.len = utils.round_up(4 + len_, 8) msg_pack_into('!HH', buf, offset, self.type, self.len) - pad_len = self.len - len_ + pad_len = self.len - (4 + len_) ofproto_parser.msg_pack_into("%dx" % pad_len, buf, offset + 4 + len_) # XXX old api compat |