-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Fix for issue #1199 (regression against scapy<=2.3.2). #1282
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.
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
Conversation
Codecov Report
@@ Coverage Diff @@
## master #1282 +/- ##
==========================================
- Coverage 84.79% 84.79% -0.01%
==========================================
Files 160 160
Lines 38322 38340 +18
==========================================
+ Hits 32495 32510 +15
- Misses 5827 5830 +3
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks ok to me.
1e6640e
to
298d401
Compare
298d401
to
92637c4
Compare
92637c4
to
d4eb327
Compare
@gpotter2 Fixed |
@guedou You should review it again, changes are big |
scapy/sendrecv.py
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand why you removed this try, but this PR itself is already tricky, and it makes it real hard to review + is not needed.
If it’s not bothering you too much, it would be better that you leave the current useless try.
All of those fixes will surely be fixed through the PEPin project, which will come in time
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
test/regression.uts
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The logic between ˋsrand
sr1` is the same. Because networking tests tend to fail more often, it would be good not to have too many doing the same thing :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
d4eb327
to
8725782
Compare
PR is ready for merge to the master. |
Scapy Version: 2.4.0rc5-64
System: Windows7/Windows10
Python Version: 2.7.14/3.4.4/3.6.4
This PR fixes #1199 (regression against scapy<=2.3.2).
(+ some little obvious code improvement in sndrcv())
Please include it in TODO.
See also already closed #1276