openstack/deb-ryu
Code Issues Proposed changes

packet lib: fix ipv4 flags bitshift

Browse Source 
Fixed flags bitshift.

Signed-off-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Hiyama Manabu 2012-09-10 11:29:11 +09:00 committed by FUJITA Tomonori
parent ae0253a36c
commit d26cbddf26
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ryu/lib/packet/ipv4.py
View File

@ -50,8 +50,8 @@ class ipv4(packet_base.PacketBase):
src, dst) = struct.unpack_from(cls._PACK_STR, buf)
header_length = version & 0xf
version = version >> 4
offset = flags & ((1 << 15) - 1)
flags = flags >> 15
offset = flags & ((1 << 13) - 1)
flags = flags >> 13
msg = cls(version, header_length, tos, total_length, identification,
flags, offset, ttl, proto, csum, src, dst)
@ -63,7 +63,7 @@ class ipv4(packet_base.PacketBase):
def serialize(self, payload, prev):
hdr = bytearray().zfill(self.header_length * 4)
version = self.version << 4 | self.header_length
flags = self.flags << 15 | self.offset
flags = self.flags << 13 | self.offset
if self.total_length == 0:
self.total_length = self.header_length * 4 + len(payload)
struct.pack_into(ipv4._PACK_STR, hdr, 0, version, self.tos,