diff options
Diffstat (limited to 'scripts/external_libs/scapy-2.3.1/python2/scapy')
| -rw-r--r-- | scripts/external_libs/scapy-2.3.1/python2/scapy/fields.py | 2 | ||||
| -rw-r--r-- | scripts/external_libs/scapy-2.3.1/python2/scapy/packet.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/external_libs/scapy-2.3.1/python2/scapy/fields.py b/scripts/external_libs/scapy-2.3.1/python2/scapy/fields.py index ba65e637..80716700 100644 --- a/scripts/external_libs/scapy-2.3.1/python2/scapy/fields.py +++ b/scripts/external_libs/scapy-2.3.1/python2/scapy/fields.py @@ -34,7 +34,7 @@ class Field: self.default = self.any2i(None,default) self.sz = struct.calcsize(self.fmt) self.owners = [] - self._offset =0; + self._offset = 0 def get_size_bytes (self): if hasattr(self, 'size'): diff --git a/scripts/external_libs/scapy-2.3.1/python2/scapy/packet.py b/scripts/external_libs/scapy-2.3.1/python2/scapy/packet.py index 8cd78b86..b22305bb 100644 --- a/scripts/external_libs/scapy-2.3.1/python2/scapy/packet.py +++ b/scripts/external_libs/scapy-2.3.1/python2/scapy/packet.py @@ -320,8 +320,6 @@ class Packet(BasePacket): def self_build(self, field_pos_list=None): - #if self.raw_packet_cache is not None: - # return self.raw_packet_cache p="" for f in self.fields_desc: if type(p) is tuple : @@ -339,7 +337,8 @@ class Packet(BasePacket): 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): |