From 78aff2eb73390c6b5cdabce5fcf44154e9cdbc81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arturo=20Filast=C3=B2?= <arturo@filasto.net>
Date: Fri, 29 Apr 2016 11:17:41 +0200
Subject: [PATCH] Restart select when we see a EINTR
This fixes erratic behavior when scapy is run inside of a separate
thread or in another process.
The patch is taken from
https://bitbucket.org/secdev/scapy/issues/473/scapy-sendrecv-selects-eintr-problem-in
---
scapy/sendrecv.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/scapy/sendrecv.py b/scapy/sendrecv.py
index 04dabcb8..1d1d2afb 100644
--- a/scapy/sendrecv.py
+++ b/scapy/sendrecv.py
@@ -7,6 +7,7 @@
Functions to send and receive packets.
"""
+import errno
import cPickle,os,sys,time,subprocess
import itertools
from select import select
@@ -127,7 +128,12 @@ def sndrcv(pks, pkt, timeout = None, inter = 0, verbose=None, chainCC=0, retry=0
if len(inp) == 0 or pks in inp:
r = pks.nonblock_recv()
else:
- inp, out, err = select(inmask,[],[], remaintime)
+ inp = []
+ try:
+ inp, out, err = select(inmask,[],[], remaintime)
+ except IOError, exc:
+ if exc.errno != errno.EINTR:
+ raise
if len(inp) == 0:
break
if pks in inp:
--
GitLab