Reported-by: Arne Goetje <[email protected]>
Signed-off-by: Minoru TAKAHASHI <[email protected]>
---
ryu/lib/packet/udp.py | 2 +-
ryu/tests/unit/packet/test_packet.py | 14 +++++++-------
ryu/tests/unit/packet/test_udp.py | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ryu/lib/packet/udp.py b/ryu/lib/packet/udp.py
index a960886..a80e101 100644
--- a/ryu/lib/packet/udp.py
+++ b/ryu/lib/packet/udp.py
@@ -41,7 +41,7 @@ class udp(packet_base.PacketBase):
_PACK_STR = '!HHHH'
_MIN_LEN = struct.calcsize(_PACK_STR)
- def __init__(self, src_port=0, dst_port=0, total_length=0, csum=0):
+ def __init__(self, src_port=1, dst_port=1, total_length=0, csum=0):
super(udp, self).__init__()
self.src_port = src_port
self.dst_port = dst_port
diff --git a/ryu/tests/unit/packet/test_packet.py
b/ryu/tests/unit/packet/test_packet.py
index 9c9ceff..12929cb 100644
--- a/ryu/tests/unit/packet/test_packet.py
+++ b/ryu/tests/unit/packet/test_packet.py
@@ -911,16 +911,16 @@ class TestPacket(unittest.TestCase):
# udp
ok_(p_udp)
- eq_(0, p_udp.src_port)
- eq_(0, p_udp.dst_port)
+ eq_(1, p_udp.src_port)
+ eq_(1, p_udp.dst_port)
eq_(len(u_buf) + len(self.payload), p_udp.total_length)
- eq_(0x2B62, p_udp.csum)
+ eq_(0x2B60, p_udp.csum)
t = bytearray(u_buf)
struct.pack_into('!H', t, 6, p_udp.csum)
ph = struct.pack('!16s16sI3xB', ipaddr, ipaddr,
len(u_buf) + len(self.payload), 17)
t = ph + t + self.payload
- eq_(packet_utils.checksum(t), 0x60)
+ eq_(packet_utils.checksum(t), 0x62)
# payload
ok_('payload' in protocols)
@@ -949,10 +949,10 @@ class TestPacket(unittest.TestCase):
if k in ipv6_values])
ipv6_str = '%s(%s)' % (ipv6.ipv6.__name__, _ipv6_str)
- udp_values = {'src_port': 0,
- 'dst_port': 0,
+ udp_values = {'src_port': 1,
+ 'dst_port': 1,
'total_length': len(u_buf) + len(self.payload),
- 'csum': 0x2B62}
+ 'csum': 0x2B60}
_udp_str = ','.join(['%s=%s' % (k, repr(udp_values[k]))
for k, v in inspect.getmembers(p_udp)
if k in udp_values])
diff --git a/ryu/tests/unit/packet/test_udp.py
b/ryu/tests/unit/packet/test_udp.py
index 51221c9..c8b3e48 100644
--- a/ryu/tests/unit/packet/test_udp.py
+++ b/ryu/tests/unit/packet/test_udp.py
@@ -101,8 +101,8 @@ class Test_udp(unittest.TestCase):
buf = u.serialize(bytearray(), prev)
res = struct.unpack(udp._PACK_STR, buf)
- eq_(res[0], 0)
- eq_(res[1], 0)
+ eq_(res[0], 1)
+ eq_(res[1], 1)
eq_(res[2], udp._MIN_LEN)
def test_json(self):
--
1.9.1
------------------------------------------------------------------------------
Infragistics Professional
Build stunning WinForms apps today!
Reboot your WinForms applications with our WinForms controls.
Build a bridge from your legacy apps to the future.
http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
