From 8c3eff4716cce78e2f959c7ed77dbaee25a5f895 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 26 Aug 2024 21:36:42 +0200 Subject: [PATCH] istream/sink_fd: use SocketDescriptor::Send() --- libcommon | 2 +- src/istream/sink_fd.cxx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libcommon b/libcommon index 4fc62abdf..5f96a7e79 160000 --- a/libcommon +++ b/libcommon @@ -1 +1 @@ -Subproject commit 4fc62abdff7a31d52ab4b3ce39547fbc6a1ed2ed +Subproject commit 5f96a7e794dd78f64931039e48b3278af068d920 diff --git a/src/istream/sink_fd.cxx b/src/istream/sink_fd.cxx index c85019334..bb4a39d9d 100644 --- a/src/istream/sink_fd.cxx +++ b/src/istream/sink_fd.cxx @@ -112,8 +112,7 @@ SinkFd::OnData(std::span src) noexcept got_data = true; ssize_t nbytes = IsAnySocket(fd_type) - ? send(fd.Get(), src.data(), src.size(), - MSG_DONTWAIT|MSG_NOSIGNAL) + ? SocketDescriptor::FromFileDescriptor(fd).Send(src, MSG_DONTWAIT) : fd.Write(src); if (nbytes >= 0) { ScheduleWrite();