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 | 5 | ||||
| -rw-r--r-- | scripts/external_libs/scapy-2.3.1/python2/scapy/packet.py | 4 |
2 files changed, 6 insertions, 3 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 df85875a..ba65e637 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'): @@ -42,6 +42,9 @@ class Field: else: return self.sz + def get_size_bits(self): + return getattr(self, 'size', self.sz * 8) + def register_owner(self, cls): self.owners.append(cls) 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 5bd2e693..8cd78b86 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,8 @@ class Packet(BasePacket): def self_build(self, field_pos_list=None): - if self.raw_packet_cache is not None: - return self.raw_packet_cache + #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 : |