From a2d0b2cd66639e983b5a4fb191d8afe5cac77855 Mon Sep 17 00:00:00 2001 From: Andrew Lamoureux Date: Wed, 20 Mar 2019 15:35:00 -0400 Subject: kaitai: more format compatibility, testing --- python/examples/kaitai/ethernet_frame.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'python/examples/kaitai/ethernet_frame.py') diff --git a/python/examples/kaitai/ethernet_frame.py b/python/examples/kaitai/ethernet_frame.py index e90c43c7..adbe60de 100644 --- a/python/examples/kaitai/ethernet_frame.py +++ b/python/examples/kaitai/ethernet_frame.py @@ -9,8 +9,8 @@ import collections if parse_version(ks_version) < parse_version('0.7'): raise Exception("Incompatible Kaitai Struct Python API: 0.7 or later is required, but you have %s" % (ks_version)) -from ipv4_packet import Ipv4Packet -from ipv6_packet import Ipv6Packet +from . import ipv4_packet +from . import ipv6_packet class EthernetFrame(KaitaiStruct): """Ethernet frame is a OSI data link layer (layer 2) protocol data unit for Ethernet networks. In practice, many other networks and/or @@ -51,12 +51,12 @@ class EthernetFrame(KaitaiStruct): if _on == self._root.EtherTypeEnum.ipv4: self._raw_body = self._io.read_bytes_full() io = KaitaiStream(BytesIO(self._raw_body)) - self.body = Ipv4Packet(io) + self.body = ipv4_packet.Ipv4Packet(io) self.body._read() elif _on == self._root.EtherTypeEnum.ipv6: self._raw_body = self._io.read_bytes_full() io = KaitaiStream(BytesIO(self._raw_body)) - self.body = Ipv6Packet(io) + self.body = ipv6_packet.Ipv6Packet(io) self.body._read() else: self.body = self._io.read_bytes_full() -- cgit v1.3.1