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

Fix scapy used with Winpcap on Windows

This commit is contained in:
gpotter2 2018-03-07 22:54:14 +01:00
parent faeeef0026
commit f872f1be2a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scapy/arch/pcapdnet.py
View File

@ -143,7 +143,7 @@ if conf.use_winpcapy:
if pcap_set_rfmon(self.pcap, 1) != 0:
warning("Could not set monitor mode")
if pcap_activate(self.pcap) != 0:
warning("Could not activate the handler")
raise OSError("Could not activate the pcap handler")
else:
self.pcap = pcap_open_live(self.iface, snaplen, promisc, to_ms, self.errbuf)
self.header = POINTER(pcap_pkthdr)()

2
scapy/arch/windows/__init__.py
View File

@ -855,7 +855,7 @@ def open_pcap(iface, *args, **kargs):
iface_pcap_name = pcapname(iface)
if not isinstance(iface, NetworkInterface) and iface_pcap_name is not None:
iface = IFACES.dev_from_name(iface)
if isinstance(iface, NetworkInterface) and iface.ismonitor():
if conf.use_npcap and isinstance(iface, NetworkInterface) and iface.ismonitor():
kargs["monitor"] = True
return _orig_open_pcap(iface_pcap_name, *args, **kargs)
pcapdnet.open_pcap = open_pcap