openstack/deb-ryu
Code Issues Proposed changes

packet lib: fix ipv4 option field handling

Browse Source 
- fix the parser to set option data.
- add option argument to __init__.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
FUJITA Tomonori 2012-08-30 16:44:03 +09:00
parent 77df140ecf
commit 05521398c1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ class ipv4(packet_base.PacketBase):
def __init__(self, version, header_length, tos, total_length, def __init__(self, version, header_length, tos, total_length,
identification, flags, offset, ttl, proto, csum, identification, flags, offset, ttl, proto, csum,
src, dst): src, dst, option=None):
super(ipv4, self).__init__() super(ipv4, self).__init__()
self.version = version self.version = version
self.header_length = header_length self.header_length = header_length
@ -42,6 +42,7 @@ class ipv4(packet_base.PacketBase):
self.src = src self.src = src
self.dst = dst self.dst = dst
self.length = header_length * 4 self.length = header_length * 4
self.option = option
@classmethod @classmethod
def parser(cls, buf): def parser(cls, buf):
@ -55,7 +56,7 @@ class ipv4(packet_base.PacketBase):
flags, offset, ttl, proto, csum, src, dst) flags, offset, ttl, proto, csum, src, dst)
if msg.length > ipv4._MIN_LEN: if msg.length > ipv4._MIN_LEN:
self.extra = buf[ipv4._MIN_LEN:msg.length] msg.option = buf[ipv4._MIN_LEN:msg.length]
return msg, ipv4.get_packet_type(proto) return msg, ipv4.get_packet_type(proto)