Skip to content

Fix BidirectionalRelay half-close handling #41328

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

Draft
Eamon (Eamon2009) wants to merge 3 commits into
base: master
Choose a base branch
from
+7 −5
Draft

Fix BidirectionalRelay half-close handling #41328

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f597857
Fix Windows relay half-close and sync-success EOF spin
Eamon2009 Aug 12, 2026
31ab1cf
Fix BidirectionalRelay half-close handling
Eamon2009 Aug 12, 2026
9dca9ab
Fix BidirectionalRelay half-close handling
Eamon2009 Aug 12, 2026
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
12 changes: 7 additions & 5 deletions src/windows/common/relay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,8 @@ void wsl::windows::common::relay::BidirectionalRelay(_In_ HANDLE LeftHandle, _In

bool leftReadPending = false;
bool rightReadPending = false;
bool leftReadClosed = (LeftHandle == nullptr);
bool rightReadClosed = (RightHandle == nullptr);
auto cancelReads = wil::scope_exit_log(WI_DIAGNOSTICS_INFO, [&] {
DWORD bytes;
if (leftReadPending)
Expand All @@ -316,13 +318,13 @@ void wsl::windows::common::relay::BidirectionalRelay(_In_ HANDLE LeftHandle, _In
const HANDLE waitObjects[] = {leftOverlapped.hEvent, rightOverlapped.hEvent};
for (;;)
{
if ((LeftHandle == nullptr) || (RightHandle == nullptr))
if (leftReadClosed && rightReadClosed)
{
break;
}
Comment on lines +321 to 324

DWORD leftBytesRead = 0;
if (!leftReadPending && LeftHandle)
if (!leftReadPending && !leftReadClosed && LeftHandle)
{
if (!ReadFile(LeftHandle, leftReadSpan.data(), gsl::narrow_cast<DWORD>(leftReadSpan.size()), &leftBytesRead, &leftOverlapped))
{
Expand All @@ -333,7 +335,7 @@ void wsl::windows::common::relay::BidirectionalRelay(_In_ HANDLE LeftHandle, _In
}

DWORD rightBytesRead = 0;
if (!rightReadPending && RightHandle)
if (!rightReadPending && !rightReadClosed && RightHandle)
{
if (!ReadFile(RightHandle, rightReadSpan.data(), gsl::narrow_cast<DWORD>(rightReadSpan.size()), &rightBytesRead, &rightOverlapped))
{
Expand All @@ -352,7 +354,7 @@ void wsl::windows::common::relay::BidirectionalRelay(_In_ HANDLE LeftHandle, _In
leftReadPending = false;
if (leftBytesRead == 0)
{
LeftHandle = nullptr;
leftReadClosed = true;
if (WI_IsFlagSet(Flags, RelayFlags::RightIsSocket))
{
LOG_LAST_ERROR_IF(shutdown(reinterpret_cast<SOCKET>(RightHandle), SD_SEND) == SOCKET_ERROR);
Expand Down Expand Up @@ -380,7 +382,7 @@ void wsl::windows::common::relay::BidirectionalRelay(_In_ HANDLE LeftHandle, _In
rightReadPending = false;
if (rightBytesRead == 0)
{
RightHandle = nullptr;
rightReadClosed = true;
if (WI_IsFlagSet(Flags, RelayFlags::LeftIsSocket))
{
LOG_LAST_ERROR_IF(shutdown(reinterpret_cast<SOCKET>(LeftHandle), SD_SEND) == SOCKET_ERROR);
Expand Down