github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-16 17:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[api] Fix write_raw_iov_ not attempting write when called directly with empty overflow

Browse Source 
When called from cold paths (write_raw_buf_, write_frame_) with
sent=-1 and empty overflow, the function would skip the write and
read a stale errno. Now always attempts the write when overflow is
empty, matching the original write_raw_ behavior.
This commit is contained in:
J. Nick Koston
2026-03-29 13:49:47 -10:00
parent b4de015706
commit 1c1ddf463b
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/api/api_frame_helper.cpp
+8 -9
View File
@@ -130,20 +130,19 @@ APIError APIFrameHelper::write_raw_iov_(const struct iovec *iov, int iovcnt, uin
#endif
if (sent == -1) {
// Either the fast path got -1, or we were called with overflow backlog
// Either the fast path write returned -1, or we were called directly (cold path)
if (!this->overflow_buf_.empty()) {
// Drain existing backlog first
APIError err = this->drain_overflow_and_handle_errors_();
if (err != APIError::OK)
return err;
// Try again after drain
if (this->overflow_buf_.empty()) {
sent =
(iovcnt == 1) ? this->socket_->write(iov[0].iov_base, iov[0].iov_len) : this->socket_->writev(iov, iovcnt);
if (sent == static_cast<ssize_t>(total_write_len))
return APIError::OK;
// Partial write or -1: fall through to error check / enqueue below
}
}
// Try write if backlog is clear (either was empty, or drain succeeded)
if (this->overflow_buf_.empty()) {
sent = (iovcnt == 1) ? this->socket_->write(iov[0].iov_base, iov[0].iov_len) : this->socket_->writev(iov, iovcnt);
if (sent == static_cast<ssize_t>(total_write_len))
return APIError::OK;
// Partial write or -1: fall through to error check / enqueue below
}
if (sent == -1) {
int err = errno;