Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #869 from p-l-/fix-pcapy-close 

Close handles opened using pcapy
This commit is contained in:
Pierre Lalet 2017-10-06 14:17:16 +02:00 committed by GitHub
parent 597d4806a7 e3b8c55d6e
commit b715f1be47
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scapy/arch/pcapdnet.py
View File

@ -402,8 +402,7 @@ if conf.use_pcap:
def __getattr__(self, attr):
return getattr(self.pcap, attr)
def __del__(self):
fd = self.pcap.fileno()
os.close(fd)
os.close(self.pcap.fileno())
open_pcap = lambda *args,**kargs: _PcapWrapper_libpcap(*args,**kargs)
elif hasattr(pcap,"open_live"): # python-pcapy
class _PcapWrapper_pcapy:
@ -427,7 +426,11 @@ if conf.use_pcap:
def __getattr__(self, attr):
return getattr(self.pcap, attr)
def __del__(self):
warning("__del__: don't know how to close the file descriptor. Bugs ahead ! Please report this bug.")
try:
self.pcap.close()
except AttributeError:
warning("__del__: don't know how to close the file "
"descriptor. Bugs ahead! Please update pcapy!")
open_pcap = lambda *args,**kargs: _PcapWrapper_pcapy(*args,**kargs)