github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-07-11 09:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[socket] Combine shift and tcp_arg update into single loop in accept()

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-10 15:09:29 -10:00
parent 7cb32321b1
commit a0681bce6b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/socket/lwip_raw_tcp_impl.cpp
+4 -6
View File
@@ -753,18 +753,16 @@ std::unique_ptr<LWIPRawImpl> LWIPRawListenImpl::accept(struct sockaddr *addr, so
// The error callback nulled their pcb pointers; clean up buffered data and discard.
while (this->accepted_socket_count_ > 0) {
QueuedPcb entry = this->accepted_pcbs_[0];
// Shift remaining entries forward and update tcp_arg pointers (slots shifted by one).
// Shift remaining entries forward, updating tcp_arg pointers as we go.
// Safe because we hold LWIP_LOCK, so err/recv callbacks can't fire during the update.
for (uint8_t i = 1; i < this->accepted_socket_count_; i++) {
this->accepted_pcbs_[i - 1] = this->accepted_pcbs_[i];
if (this->accepted_pcbs_[i - 1].pcb != nullptr) {
tcp_arg(this->accepted_pcbs_[i - 1].pcb, &this->accepted_pcbs_[i - 1]);
}
}
this->accepted_pcbs_[this->accepted_socket_count_ - 1] = {};
this->accepted_socket_count_--;
for (uint8_t i = 0; i < this->accepted_socket_count_; i++) {
if (this->accepted_pcbs_[i].pcb != nullptr) {
tcp_arg(this->accepted_pcbs_[i].pcb, &this->accepted_pcbs_[i]);
}
}
if (entry.pcb == nullptr) {
// PCB was freed by lwip (RST/timeout) while queued — discard and try next
if (entry.rx_buf != nullptr) {