diff --git a/scapy/sendrecv.py b/scapy/sendrecv.py index 75e84a5c0446140c974f7733430b3ad168c34ac8..5e6a4a6c6e7c51f260124a0b89a80a3af69d9443 100644 --- a/scapy/sendrecv.py +++ b/scapy/sendrecv.py @@ -6,7 +6,7 @@ import cPickle,os,sys,time,subprocess from select import select from data import * -from arch import * +import arch from config import conf from packet import Gen from utils import warning,get_temp_file,PcapReader @@ -117,7 +117,7 @@ def sndrcv(pks, pkt, timeout = None, inter = 0, verbose=None, chainCC=0, retry=0 if remaintime <= 0: break r = None - if FREEBSD or DARWIN: + if arch.FREEBSD or arch.DARWIN: inp, out, err = select(inmask,[],[], 0.05) if len(inp) == 0 or pks in inp: r = pks.nonblock_recv() diff --git a/scapy/supersocket.py b/scapy/supersocket.py index 916033d8a29c005a1a0b0d4afab7019761c6a981..9adf573323294ead65b7ad1b90c7b372639cac03 100644 --- a/scapy/supersocket.py +++ b/scapy/supersocket.py @@ -6,7 +6,6 @@ import socket,time from config import conf from data import * -from sendrecv import sndrcv class _SuperSocket_metaclass(type): def __repr__(self): @@ -42,15 +41,15 @@ class SuperSocket: if self.ins and self.ins.fileno() != -1: self.ins.close() def sr(self, *args, **kargs): - return sndrcv(self, *args, **kargs) + return sendrecv.sndrcv(self, *args, **kargs) def sr1(self, *args, **kargs): - a,b = sndrcv(self, *args, **kargs) + a,b = sendrecv.sndrcv(self, *args, **kargs) if len(a) > 0: return a[0][1] else: return None def sniff(self, *args, **kargs): - return sniff(opened_socket=self, *args, **kargs) + return sendrecv.sniff(opened_socket=self, *args, **kargs) class L3RawSocket(SuperSocket): desc = "Layer 3 using Raw sockets (PF_INET/SOCK_RAW)" @@ -102,3 +101,5 @@ class StreamSocket(SimpleSocket): if conf.L3socket is None: conf.L3socket = L3RawSocket + +import sendrecv