diff options
| author | HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp> | 2012-10-11 17:19:57 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2012-10-12 02:28:57 +0900 |
| commit | c92d8be079e5e00951a299d7a0b890ba8312fff0 (patch) | |
| tree | d0b167844658c50ad8df220a92fdb11d95d620eb | |
| parent | c42673def1c1c6b66e8179fc861d2f1e0a868668 (diff) | |
packet lib: fix udp header length
Fix the f5d2157 commit.
Signed-off-by: HIYAMA Manabu <hiyama.manabu@po.ntts.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/lib/packet/udp.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/ryu/lib/packet/udp.py b/ryu/lib/packet/udp.py index b949b5ca..c4fe5297 100644 --- a/ryu/lib/packet/udp.py +++ b/ryu/lib/packet/udp.py @@ -24,31 +24,33 @@ class udp(packet_base.PacketBase): _PACK_STR = '!HHHH' _MIN_LEN = struct.calcsize(_PACK_STR) - def __init__(self, src_port, dst_port, length, csum=0): + def __init__(self, src_port, dst_port, total_length=0, csum=0): super(udp, self).__init__() self.src_port = src_port self.dst_port = dst_port - self.length = length + self.total_length = total_length self.csum = csum + self.length = udp._MIN_LEN @classmethod def parser(cls, buf): - (src_port, dst_port, length, csum) = struct.unpack_from(cls._PACK_STR, - buf) - msg = cls(src_port, dst_port, length, csum) + (src_port, dst_port, total_length, csum) = struct.unpack_from( + cls._PACK_STR, buf) + msg = cls(src_port, dst_port, total_length, csum) return msg, None def serialize(self, payload, prev): - if self.length == 0: - self.length = udp._MIN_LEN + len(payload) + if self.total_length == 0: + self.total_length = udp._MIN_LEN + len(payload) h = struct.pack(udp._PACK_STR, self.src_port, self.dst_port, - self.length, self.csum) + self.total_length, self.csum) if self.csum == 0: - ph = struct.pack('!IIBBH', prev.src, prev.dst, 0, 17, self.length) + ph = struct.pack('!IIBBH', prev.src, prev.dst, 0, 17, + self.total_length) f = ph + h + payload if len(f) % 2: f += '\x00' self.csum = socket.htons(packet_utils.checksum(f)) h = struct.pack(udp._PACK_STR, self.src_port, self.dst_port, - self.length, self.csum) + self.total_length, self.csum) return h |