Restore sndrcv behaviour from before 53afe84 #4538
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Aims to fix #4531 |
gpotter2
reviewed
Sep 22, 2024
|
Thanks a lot for figuring this out, this is great work ! |
|
I was trying, if this would immediately fix the unit tests. But my next guess is, that we may need to remove the daemon flag of the send thread.
--
Mit freundlichen Grüßen
Dr. Nils Weiß
dissecto GmbH
Franz-Mayer-Str. 1
93053 Regensburg
________________________________
From: gpotter2 ***@***.***>
Sent: Sunday, September 22, 2024 2:48:59 PM
To: secdev/scapy ***@***.***>
Cc: Dr. Nils Weiß ***@***.***>; Author ***@***.***>
Subject: Re: [secdev/scapy] Restore sndrcv behaviour from before 53afe84 (PR #4538)
@gpotter2 commented on this pull request.
________________________________
In scapy/sendrecv.py<#4538 (comment)>:
@@ -357,6 +357,7 @@ def sndrcv(*args, **kwargs):
WARNING: This is an internal function. Using sr/srp/sr1/srp is
more appropriate in many cases.
"""
+ kwargs['threaded'] = kwargs.pop('threaded', True) or True
Why this commit?
—
Reply to this email directly, view it on GitHub<#4538 (review)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AAMZGFZ4CDPX6JVXG3VMTWDZX24DXAVCNFSM6AAAAABOUIRDESVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDGMRQHA2DQMRSG4>.
You are receiving this because you authored the thread.Message ID: ***@***.***>
|
gpotter2
force-pushed
the
issue_4531
branch
from
450d941
to
56e82b2
Compare
gpotter2
reviewed
Sep 22, 2024
gpotter2
force-pushed
the
issue_4531
branch
3 times, most recently
from
f4e06ce
to
9e5d6e6
Compare
|
Seems to really be failing on the |
gpotter2
reviewed
Sep 22, 2024
Try to get it debug as soon as possible |
|
Could I get #4533 merged before I start debugging? |
|
Sure thing ! |
polybassa
force-pushed
the
issue_4531
branch
from
6a5faf5
to
65100e7
Compare
polybassa
force-pushed
the
issue_4531
branch
from
a05c650
to
1b12525
Compare
|
@gpotter2 Ready from my side |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #4538 +/- ##
==========================================
- Coverage 81.59% 81.58% -0.01%
==========================================
Files 356 356
Lines 85272 85271 -1
==========================================
- Hits 69574 69571 -3
- Misses 15698 15700 +2
|
|
Seems stable enough. Thanks a lot ! |
gpotter2
approved these changes
Sep 24, 2024
This was referenced Sep 24, 2024
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR rolls back the internal behaviour of sndrcv from before 53afe84
Two major changes happend in 53afe84
interis only forwarded totime.sleepif it is not0. However, callingtime.sleep(0)gives the python threading system the possibility to do a context switch.srwas always executed inthreadedmode.