Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scapy
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
public-release-test-restored
platform
external
scapy
Commits
a37e5520
Commit
a37e5520
authored
8 years ago
by
dark-lbp
Browse files
Options
Downloads
Patches
Plain Diff
Fix StreamSocket on OS X
This fix #162
parent
136b76f4
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scapy/sendrecv.py
+2
-1
2 additions, 1 deletion
scapy/sendrecv.py
with
2 additions
and
1 deletion
scapy/sendrecv.py
+
2
−
1
View file @
a37e5520
...
@@ -19,6 +19,7 @@ from utils import warning,get_temp_file,PcapReader,wrpcap
...
@@ -19,6 +19,7 @@ from utils import warning,get_temp_file,PcapReader,wrpcap
import
plist
import
plist
from
error
import
log_runtime
,
log_interactive
from
error
import
log_runtime
,
log_interactive
from
base_classes
import
SetGen
from
base_classes
import
SetGen
from
supersocket
import
StreamSocket
#################
#################
## Debug class ##
## Debug class ##
...
@@ -123,7 +124,7 @@ def sndrcv(pks, pkt, timeout = None, inter = 0, verbose=None, chainCC=0, retry=0
...
@@ -123,7 +124,7 @@ def sndrcv(pks, pkt, timeout = None, inter = 0, verbose=None, chainCC=0, retry=0
if
remaintime
<=
0
:
if
remaintime
<=
0
:
break
break
r
=
None
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
)
inp
,
out
,
err
=
select
(
inmask
,[],[],
0.05
)
if
len
(
inp
)
==
0
or
pks
in
inp
:
if
len
(
inp
)
==
0
or
pks
in
inp
:
r
=
pks
.
nonblock_recv
()
r
=
pks
.
nonblock_recv
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment