diff options
| author |   imarom <imarom@cisco.com> | 2016-09-07 11:48:23 +0300 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2016-09-07 14:08:35 +0300 |
| commit | dbe6b1886ee2b860395731a77da305a01095a843 (patch) | |
| tree | 1b3141bf387b1435952d138360e41e28f994d53e /scripts/external_libs | |
| parent | 323238656f07cbb4671e1493d8274ccb532588b1 (diff) | |
support for DUAL mode on small PCAPs
Diffstat (limited to 'scripts/external_libs')
| -rw-r--r-- | scripts/external_libs/scapy-2.3.1/python2/scapy/utils.py | 3 | ||||
| -rw-r--r-- | scripts/external_libs/scapy-2.3.1/python3/scapy/utils.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/external_libs/scapy-2.3.1/python2/scapy/utils.py b/scripts/external_libs/scapy-2.3.1/python2/scapy/utils.py index c5ac2520..b1efdf37 100644 --- a/scripts/external_libs/scapy-2.3.1/python2/scapy/utils.py +++ b/scripts/external_libs/scapy-2.3.1/python2/scapy/utils.py @@ -573,7 +573,8 @@ class PcapReader(RawPcapReader): try: self.LLcls = conf.l2types[self.linktype] except KeyError: - warning("PcapReader: unknown LL type [%i]/[%#x]. Using Raw packets" % (self.linktype,self.linktype)) + raise Scapy_Exception("Scapy PcapReader: unknown LL type [%i]/[%#x]" % (self.linktype,self.linktype)) + #warning("PcapReader: unknown LL type [%i]/[%#x]. Using Raw packets" % (self.linktype,self.linktype)) self.LLcls = conf.raw_layer def read_packet(self, size=MTU): rp = RawPcapReader.read_packet(self,size) diff --git a/scripts/external_libs/scapy-2.3.1/python3/scapy/utils.py b/scripts/external_libs/scapy-2.3.1/python3/scapy/utils.py index 252109bb..9f15f2a9 100644 --- a/scripts/external_libs/scapy-2.3.1/python3/scapy/utils.py +++ b/scripts/external_libs/scapy-2.3.1/python3/scapy/utils.py @@ -750,7 +750,8 @@ class _RawPcapOldReader: try: self.LLcls = conf.l2types[self.linktype] except KeyError: - warning("RawPcapReader: unknown LL type [%i]/[%#x]. Using Raw packets" % (self.linktype,self.linktype)) + raise Scapy_Exception("Scapy PcapReader: unknown LL type [%i]/[%#x]" % (self.linktype,self.linktype)) + #warning("RawPcapReader: unknown LL type [%i]/[%#x]. Using Raw packets" % (self.linktype,self.linktype)) self.LLcls = conf.raw_layer def __iter__(self): |