Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-30 13:04:13 +01:00
Code Issues Projects Releases Wiki Activity

Re-enable TCP nodelay for ESP32 (#2390)

Browse Source
This commit is contained in:
Otto Winter 2021-09-27 11:40:28 +02:00 committed by Otto winter
parent 46b4c970d1
commit 9bf72ff05f
No known key found for this signature in database
GPG Key ID: 48ED2DDB96D7682C
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
esphome/components/api/api_frame_helper.cpp
View File

@ -126,6 +126,14 @@ APIError APINoiseFrameHelper::init() {
return APIError::TCP_NONBLOCKING_FAILED; return APIError::TCP_NONBLOCKING_FAILED;
} }
int enable = 1;
err = socket_->setsockopt(IPPROTO_TCP, TCP_NODELAY, &enable, sizeof(int));
if (err != 0) {
state_ = State::FAILED;
HELPER_LOG("Setting nodelay failed with errno %d", errno);
return APIError::TCP_NODELAY_FAILED;
}
// init prologue // init prologue
prologue_.insert(prologue_.end(), PROLOGUE_INIT, PROLOGUE_INIT + strlen(PROLOGUE_INIT)); prologue_.insert(prologue_.end(), PROLOGUE_INIT, PROLOGUE_INIT + strlen(PROLOGUE_INIT));
@ -721,6 +729,13 @@ APIError APIPlaintextFrameHelper::init() {
HELPER_LOG("Setting nonblocking failed with errno %d", errno); HELPER_LOG("Setting nonblocking failed with errno %d", errno);
return APIError::TCP_NONBLOCKING_FAILED; return APIError::TCP_NONBLOCKING_FAILED;
} }
int enable = 1;
err = socket_->setsockopt(IPPROTO_TCP, TCP_NODELAY, &enable, sizeof(int));
if (err != 0) {
state_ = State::FAILED;
HELPER_LOG("Setting nodelay failed with errno %d", errno);
return APIError::TCP_NODELAY_FAILED;
}
state_ = State::DATA; state_ = State::DATA;
return APIError::OK; return APIError::OK;

15
esphome/components/socket/lwip_raw_tcp_impl.cpp
View File

@ -256,7 +256,7 @@ class LWIPRawImpl : public Socket {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
*reinterpret_cast<int *>(optval) = tcp_nagle_disabled(pcb_); *reinterpret_cast<int *>(optval) = nodelay_;
*optlen = 4; *optlen = 4;
return 0; return 0;
} }
@ -285,11 +285,7 @@ class LWIPRawImpl : public Socket {
return -1; return -1;
} }
int val = *reinterpret_cast<const int *>(optval); int val = *reinterpret_cast<const int *>(optval);
if (val != 0) { nodelay_ = val;
tcp_nagle_disable(pcb_);
} else {
tcp_nagle_enable(pcb_);
}
return 0; return 0;
} }
@ -443,9 +439,11 @@ class LWIPRawImpl : public Socket {
if (written == 0) if (written == 0)
// no need to output if nothing written // no need to output if nothing written
return 0; return 0;
if (nodelay_) {
int err = internal_output(); int err = internal_output();
if (err == -1) if (err == -1)
return -1; return -1;
}
return written; return written;
} }
ssize_t writev(const struct iovec *iov, int iovcnt) override { ssize_t writev(const struct iovec *iov, int iovcnt) override {
@ -465,9 +463,11 @@ class LWIPRawImpl : public Socket {
if (written == 0) if (written == 0)
// no need to output if nothing written // no need to output if nothing written
return 0; return 0;
if (nodelay_) {
int err = internal_output(); int err = internal_output();
if (err == -1) if (err == -1)
return -1; return -1;
}
return written; return written;
} }
int setblocking(bool blocking) override { int setblocking(bool blocking) override {
@ -549,6 +549,9 @@ class LWIPRawImpl : public Socket {
bool rx_closed_ = false; bool rx_closed_ = false;
pbuf *rx_buf_ = nullptr; pbuf *rx_buf_ = nullptr;
size_t rx_buf_offset_ = 0; size_t rx_buf_offset_ = 0;
// don't use lwip nodelay flag, it sometimes causes reconnect
// instead use it for determining whether to call lwip_output
bool nodelay_ = false;
}; };
std::unique_ptr<Socket> socket(int domain, int type, int protocol) { std::unique_ptr<Socket> socket(int domain, int type, int protocol) {