From f01f0e132f21f2b42bd08212dc42cb161f31c12f Mon Sep 17 00:00:00 2001
From: <insomniac@slackware.it>
Date: Wed, 20 Aug 2014 10:07:20 +0000
Subject: [PATCH] Made more robust _PcapWrapper_pypcap.next() by handling if
self.pcap.next() returns None.
---
scapy/arch/pcapdnet.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scapy/arch/pcapdnet.py b/scapy/arch/pcapdnet.py
index 468984d3..4ee4d99e 100644
--- a/scapy/arch/pcapdnet.py
+++ b/scapy/arch/pcapdnet.py
@@ -53,7 +53,10 @@ if conf.use_pcap:
def __del__(self):
warning("__del__: don't know how to close the file descriptor. Bugs ahead ! Please report this bug.")
def next(self):
- ts, pkt = self.pcap.next()
+ c = self.pcap.next()
+ if c is None
+ return
+ ts, pkt = c
return ts, str(pkt)
open_pcap = lambda *args,**kargs: _PcapWrapper_pypcap(*args,**kargs)
elif hasattr(pcap,"pcapObject"): # python-libpcap
--
GitLab