Fix TCP race condition, remove fixed delay in CC #5167
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
ClientContext::_wait_for_sent9) could dereference a TCP's _pcb after the connection was dropped by the OS, resulting in a crash. Move the connection dropped check to catch this case, and replace a fixed millisecond delay() with a yield and timeout value to minimize wasted time when transmission completes.
d-a-v
approved these changes
Sep 25, 2018
| @@ -308,37 +308,37 @@ class ClientContext | |||
| if (!_pcb) | |||
| return true; | |||
|
|
|||
| int loop = -1; | |||
| int prevsndbuf = -1; | |||
| max_wait_ms++; | |||
There was a problem hiding this comment.
max_wait_ms++; no more necessary
|
|
||
| // force lwIP to send what can be sent | ||
| tcp_output(_pcb); | ||
|
|
||
| int sndbuf = tcp_sndbuf(_pcb); | ||
| if (sndbuf != prevsndbuf) { | ||
| // send buffer has changed (or first iteration) | ||
| // we received an ack: restart the loop counter | ||
| // we received an ack: restart the timeout |
There was a problem hiding this comment.
just remove this comment, your new one is better
| // wait until sent: timeout | ||
| DEBUGV(":wustmo\n"); | ||
| #endif | ||
| break; |
There was a problem hiding this comment.
this break would be return false;
| } | ||
| #endif | ||
|
|
||
| return max_wait_ms > 0; |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
ClientContext::_wait_for_sent() could dereference a TCP's _pcb after
the connection was dropped by the OS, resulting in a crash.
Move the connection dropped check to catch this case, and replace
a fixed millisecond delay() with a yield and timeout value to minimize
wasted time when transmission completes.