Skip to content

Commit

Permalink
Corrected an issue where Ethernet format 0 messages over a certain si…
Browse files Browse the repository at this point in the history
…ze would have an incorrect length.
  • Loading branch information
mcferrill committed Mar 26, 2021
1 parent 650ddc0 commit 9a71592
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
19 changes: 15 additions & 4 deletions chapter10/ethernet.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,25 @@ def __repr__(self):
# order.
FORMAT = BitFormat('''
u64 ipts
u14 length
u1 data_length_error
u1 data_crc_error
u16 length
u8 network_id
u1 crc_error
u1 frame_error
u2 content
u4 ethernet_speed''')
u4 ethernet_speed
''')

def __init__(self, *args, **kwargs):
packet.Message.__init__(self, *args, **kwargs)
self.length_error = self.length >> 14 & 0b1
self.data_error = self.length >> 15
self.length &= 0b11111111111111

def __bytes__(self):
self.length |= (self.length_error << 14) | (self.data_error << 15)
return packet.Message.__bytes__(self)


class EthernetF1(packet.Packet):
Expand Down
7 changes: 7 additions & 0 deletions tests/unit/test_ethernet.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,10 @@ def test_format_1_count():
break
assert i+1 == len(packet)
assert len(packet) == 2


def test_bytes():
for packet in C10(ETHERNET):
if packet.data_type == 0x68:
break
assert packet.buffer.getvalue() == bytes(packet)

0 comments on commit 9a71592

Please sign in to comment.