packet lib: ipv4: fix default arguments

Reported-by: Arne Goetje <arne_goetje@accton.com>
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Minoru TAKAHASHI 2014-07-30 14:31:46 +09:00 committed by FUJITA Tomonori
parent 3fa25edeae
commit cacb69b4e1
2 changed files with 12 additions and 12 deletions

View File

@ -79,8 +79,8 @@ class ipv4(packet_base.PacketBase):
def __init__(self, version=4, header_length=5, tos=0,
total_length=0, identification=0, flags=0,
offset=0, ttl=255, proto=0, csum=0,
src='0.0.0.0',
dst='0.0.0.0',
src='10.0.0.1',
dst='10.0.0.2',
option=None):
super(ipv4, self).__init__()
self.version = version

View File

@ -630,11 +630,11 @@ class TestPacket(unittest.TestCase):
eq_(0, p_ipv4.flags)
eq_(255, p_ipv4.ttl)
eq_(inet.IPPROTO_SCTP, p_ipv4.proto)
eq_('0.0.0.0', p_ipv4.src)
eq_('0.0.0.0', p_ipv4.dst)
eq_('10.0.0.1', p_ipv4.src)
eq_('10.0.0.2', p_ipv4.dst)
t = bytearray(ip_buf)
struct.pack_into('!H', t, 10, p_ipv4.csum)
eq_(packet_utils.checksum(t), 0)
eq_(packet_utils.checksum(t), 0x1403)
# sctp
ok_(p_sctp)
@ -673,8 +673,8 @@ class TestPacket(unittest.TestCase):
'ttl': 255,
'proto': inet.IPPROTO_SCTP,
'csum': p_ipv4.csum,
'src': '0.0.0.0',
'dst': '0.0.0.0',
'src': '10.0.0.1',
'dst': '10.0.0.2',
'option': None}
_ipv4_str = ','.join(['%s=%s' % (k, repr(ipv4_values[k]))
for k, v in inspect.getmembers(p_ipv4)
@ -779,11 +779,11 @@ class TestPacket(unittest.TestCase):
eq_(0, p_ipv4.flags)
eq_(255, p_ipv4.ttl)
eq_(inet.IPPROTO_ICMP, p_ipv4.proto)
eq_('0.0.0.0', p_ipv4.src)
eq_('0.0.0.0', p_ipv4.dst)
eq_('10.0.0.1', p_ipv4.src)
eq_('10.0.0.2', p_ipv4.dst)
t = bytearray(ip_buf)
struct.pack_into('!H', t, 10, p_ipv4.csum)
eq_(packet_utils.checksum(t), 0)
eq_(packet_utils.checksum(t), 0x1403)
# icmp
ok_(p_icmp)
@ -815,8 +815,8 @@ class TestPacket(unittest.TestCase):
'ttl': 255,
'proto': inet.IPPROTO_ICMP,
'csum': p_ipv4.csum,
'src': '0.0.0.0',
'dst': '0.0.0.0',
'src': '10.0.0.1',
'dst': '10.0.0.2',
'option': None}
_ipv4_str = ','.join(['%s=%s' % (k, repr(ipv4_values[k]))
for k, _ in inspect.getmembers(p_ipv4)