openstack/deb-ryu
Code Issues Proposed changes

packet lib: tcp option support

Browse Source 
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
YAMADA Hideki 2012-09-18 10:01:54 +09:00 committed by FUJITA Tomonori
parent 3cd6423a3f
commit 09c70176ab
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ryu/lib/packet/tcp.py
View File

@ -25,7 +25,7 @@ class tcp(packet_base.PacketBase):
_MIN_LEN = struct.calcsize(_PACK_STR)
def __init__(self, src_port, dst_port, seq, ack, offset,
bits, window_size, csum, urgent):
bits, window_size, csum, urgent, option=None):
super(tcp, self).__init__()
self.src_port = src_port
self.dst_port = dst_port
@ -37,6 +37,7 @@ class tcp(packet_base.PacketBase):
self.csum = csum
self.urgent = urgent
self.length = self.offset * 4
self.option = option
@classmethod
def parser(cls, buf):
@ -46,13 +47,23 @@ class tcp(packet_base.PacketBase):
bits = bits & 0x3f
msg = cls(src_port, dst_port, seq, ack, offset, bits,
window_size, csum, urgent)
if msg.length > tcp._MIN_LEN:
msg.option = buf[tcp._MIN_LEN:msg.length]
return msg, None
def serialize(self, payload, prev):
h = bytearray().zfill(self.length)
offset = self.offset << 4
h = struct.pack(tcp._PACK_STR, self.src_port, self.dst_port,
self.seq, self.ack, offset, self.bits,
self.window_size, self.csum, self.urgent)
struct.pack_into(tcp._PACK_STR, h, 0, self.src_port, self.dst_port,
self.seq, self.ack, offset, self.bits,
self.window_size, self.csum, self.urgent)
if self.option:
assert (self.length - tcp._MIN_LEN) >= len(self.option)
h[tcp._MIN_LEN:tcp._MIN_LEN + len(self.option)] = self.option
if self.csum == 0:
length = self.length + len(payload)
ph = struct.pack('!IIBBH', prev.src, prev.dst, 0, 6, length)
@ -60,7 +71,5 @@ class tcp(packet_base.PacketBase):
if len(f) % 2:
f += '\0'
self.csum = socket.htons(packet_utils.checksum(f))
h = struct.pack(tcp._PACK_STR, self.src_port, self.dst_port,
self.seq, self.ack, offset, self.bits,
self.window_size, self.csum, self.urgent)
struct.pack_into('!H', h, 16, self.csum)
return h