Skip to content

Fix TCP race condition, remove fixed delay in CC #5167

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
merged 2 commits into from
Sep 26, 2018
Merged

Fix TCP race condition, remove fixed delay in CC #5167

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7501986
Fix TCP race condition, remove fixed delay in CC
earlephilhower Sep 25, 2018
9ee6b01
Fix the return values and address review comments
earlephilhower Sep 25, 2018
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
33 changes: 17 additions & 16 deletions libraries/ESP8266WiFi/src/include/ClientContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,39 +308,40 @@ class ClientContext
if (!_pcb)
return true;

int loop = -1;
int prevsndbuf = -1;
max_wait_ms++;

// wait for peer's acks to flush lwIP's output buffer

uint32_t last_sent = millis();
while (1) {
if (millis() - last_sent > (uint32_t) max_wait_ms) {
#ifdef DEBUGV
// wait until sent: timeout
DEBUGV(":wustmo\n");
#endif
// All data was not flushed, timeout hit
return false;
}

// 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
prevsndbuf = sndbuf;
loop = max_wait_ms;
// We just sent a bit, move timeout forward
last_sent = millis();
}

if (state() != ESTABLISHED || sndbuf == TCP_SND_BUF || --loop <= 0)
break;

delay(1);
}
yield();

#ifdef DEBUGV
if (loop <= 0) {
// wait until sent: timeout
DEBUGV(":wustmo\n");
if ((state() != ESTABLISHED) || (sndbuf == TCP_SND_BUF)) {
break;
}
}
#endif

return max_wait_ms > 0;
// All data flushed
return true;
}

uint8_t state() const
Expand Down