diff options
Diffstat (limited to 'scripts/external_libs/scapy-2.3.1/python3/scapy')
| -rw-r--r-- | scripts/external_libs/scapy-2.3.1/python3/scapy/fields.py | 3 | ||||
| -rw-r--r-- | scripts/external_libs/scapy-2.3.1/python3/scapy/packet.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/external_libs/scapy-2.3.1/python3/scapy/fields.py b/scripts/external_libs/scapy-2.3.1/python3/scapy/fields.py index 9dcebcf3..a9e66137 100644 --- a/scripts/external_libs/scapy-2.3.1/python3/scapy/fields.py +++ b/scripts/external_libs/scapy-2.3.1/python3/scapy/fields.py @@ -34,8 +34,7 @@ class Field: self.default = self.any2i(None,default) self.sz = struct.calcsize(self.fmt) self.owners = [] - self.offset =0; - self._offset =0 + self._offset = 0 def get_size_bytes (self): diff --git a/scripts/external_libs/scapy-2.3.1/python3/scapy/packet.py b/scripts/external_libs/scapy-2.3.1/python3/scapy/packet.py index 7e0a0898..8401e0cf 100644 --- a/scripts/external_libs/scapy-2.3.1/python3/scapy/packet.py +++ b/scripts/external_libs/scapy-2.3.1/python3/scapy/packet.py @@ -338,8 +338,6 @@ class Packet(BasePacket, metaclass = Packet_metaclass): print ("field %-40s %02d %02d" % (f.name, f._offset,f.get_size_bytes () ) ); def self_build(self, field_pos_list=None): - #if self.raw_packet_cache is not None: - # return self.raw_packet_cache p=b"" for f in self.fields_desc: #print(f.name) @@ -359,6 +357,8 @@ class Packet(BasePacket, metaclass = Packet_metaclass): f._offset= val else: p = f.addfield(self, p, val) + if self.raw_packet_cache is not None: + assert p == self.raw_packet_cache, 'Could not build the packet.' return p def do_build_payload(self): |