diff options
author | Hanoh Haim <hhaim@cisco.com> | 2017-03-15 15:32:34 +0200 |
---|---|---|
committer | Hanoh Haim <hhaim@cisco.com> | 2017-03-15 15:32:34 +0200 |
commit | b27a3389455fe34dc2eed104985fffa21c3a69a7 (patch) | |
tree | 61c2a4cd37665a2da72f0f2b89571250ca739577 /scripts/external_libs/scapy-2.3.1/python2/scapy/packet.py | |
parent | 1d6f84e4a9f4360519d6213274303d13c02b4eb3 (diff) | |
parent | f9b01d2d64a2902770a2d929cf4fbe1d83fa9588 (diff) |
Merge branch 'master'
Diffstat (limited to 'scripts/external_libs/scapy-2.3.1/python2/scapy/packet.py')
-rw-r--r-- | scripts/external_libs/scapy-2.3.1/python2/scapy/packet.py | 5 |
1 files changed, 2 insertions, 3 deletions
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): |