From a37e5520102e805e8a35dc6253519620ebacd028 Mon Sep 17 00:00:00 2001
From: dark-lbp <jtrkid@gmail.com>
Date: Wed, 18 May 2016 21:38:12 +0800
Subject: [PATCH] Fix StreamSocket on OS X
This fix #162
---
scapy/sendrecv.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scapy/sendrecv.py b/scapy/sendrecv.py
index 37a42940..29227409 100644
--- a/scapy/sendrecv.py
+++ b/scapy/sendrecv.py
@@ -19,6 +19,7 @@ from utils import warning,get_temp_file,PcapReader,wrpcap
import plist
from error import log_runtime,log_interactive
from base_classes import SetGen
+from supersocket import StreamSocket
#################
## Debug class ##
@@ -123,7 +124,7 @@ def sndrcv(pks, pkt, timeout = None, inter = 0, verbose=None, chainCC=0, retry=0
if remaintime <= 0:
break
r = None
- if arch.FREEBSD or arch.DARWIN:
+ if not isinstance(pks, StreamSocket) and (arch.FREEBSD or arch.DARWIN):
inp, out, err = select(inmask,[],[], 0.05)
if len(inp) == 0 or pks in inp:
r = pks.nonblock_recv()
--
GitLab