From e1414b7fbe2d8d6a20aa4654860453a0ed7bff71 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Fri, 29 Mar 2013 12:51:02 +0900 Subject: [PATCH] lib/packet/tcp: use checksum_ip() Signed-off-by: Isaku Yamahata Signed-off-by: FUJITA Tomonori --- ryu/lib/packet/tcp.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ryu/lib/packet/tcp.py b/ryu/lib/packet/tcp.py index a225847c..a7ef178c 100644 --- a/ryu/lib/packet/tcp.py +++ b/ryu/lib/packet/tcp.py @@ -17,7 +17,6 @@ import struct from . import packet_base from . import packet_utils -import ipv4 class tcp(packet_base.PacketBase): @@ -66,12 +65,6 @@ class tcp(packet_base.PacketBase): if self.csum == 0: length = self.length + len(payload) - if prev.version == 4: - ph = struct.pack('!IIBBH', prev.src, prev.dst, 0, 6, length) - elif prev.version == 6: - ph = struct.pack('!16s16sBBH', prev.src, prev.dst, 0, 6, - length) - f = ph + h + payload - self.csum = packet_utils.checksum(f) + self.csum = packet_utils.checksum_ip(prev, length, h + payload) struct.pack_into('!H', h, 16, self.csum) return h