Skip to content

Fixed a bug in the sendrecv method when using multi-threading #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
p-l- merged 2 commits into from
Dec 23, 2016
Merged

Fixed a bug in the sendrecv method when using multi-threading #417

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97c926f
Fixed a bug in the sendrecv method when using multithreading
Aug 15, 2016
f18a8f5
Fix conflicts from https://github.com/Romounet/scapy:srfix + cleanup
p-l- Dec 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions scapy/sendrecv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
import errno
import cPickle,os,sys,time,subprocess
import itertools
from select import select
from select import select, error as select_error

from scapy.arch.consts import DARWIN, FREEBSD, OPENBSD
from scapy.data import *
from scapy.config import conf
Expand Down Expand Up @@ -140,8 +141,9 @@ def sndrcv(pks, pkt, timeout = None, inter = 0, verbose=None, chainCC=0, retry=0
inp = []
try:
inp, out, err = select(inmask,[],[], remaintime)
except IOError, exc:
if exc.errno != errno.EINTR:
except (IOError, select_error) as exc:
# select.error has no .errno attribute
if exc.args[0] != errno.EINTR:
raise
if len(inp) == 0:
break
Expand Down