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

Merge pull request #293 from 6WIND/windows-arch-bugfix 

arch/windows: fix circular import
This commit is contained in:
Pierre Lalet 2016-09-26 13:13:51 +00:00 committed by GitHub
parent 5c74229bcf a300eac0e9
commit 3d027710b7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,6 @@ from scapy.error import Scapy_Exception,log_loading,log_runtime
from scapy.utils import atol, itom, inet_aton, inet_ntoa, PcapReader from scapy.utils import atol, itom, inet_aton, inet_ntoa, PcapReader
from scapy.base_classes import Gen, Net, SetGen from scapy.base_classes import Gen, Net, SetGen
import scapy.plist as plist import scapy.plist as plist
from scapy.sendrecv import debug, srp1
from scapy.data import MTU, ETHER_BROADCAST, ETH_P_ARP from scapy.data import MTU, ETHER_BROADCAST, ETH_P_ARP
conf.use_pcap = False conf.use_pcap = False
@ -461,6 +460,7 @@ def sndrcv(pks, pkt, timeout = 2, inter = 0, verbose=None, chainCC=0, retry=0, m
if verbose is None: if verbose is None:
verbose = conf.verb verbose = conf.verb
from scapy.sendrecv import debug
debug.recv = plist.PacketList([],"Unanswered") debug.recv = plist.PacketList([],"Unanswered")
debug.sent = plist.PacketList([],"Sent") debug.sent = plist.PacketList([],"Sent")
debug.match = plist.SndRcvList([]) debug.match = plist.SndRcvList([])