Skip to content

Use File.OpenHandle in Socket.SendFile directly #56777

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

Merged
stephentoub merged 4 commits into from
Aug 3, 2021
Merged

Use File.OpenHandle in Socket.SendFile directly #56777

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00ae72a
Directly open file handle in Windows.
huoyaoyuan Aug 3, 2021
cc9d665
Directly open file handle on Unix.
huoyaoyuan Aug 3, 2021
8a2bbc1
Dispose FileHandle.
huoyaoyuan Aug 3, 2021
83d2fec
Update scope of using.
huoyaoyuan Aug 3, 2021
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
11 changes: 7 additions & 4 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,14 @@ private void SendFileInternal(string? fileName, ReadOnlySpan<byte> preBuffer, Re
Send(preBuffer);
}

// Send the file, if any
if (fileHandle != null)
using (fileHandle)
Copy link
Member

@stephentoub stephentoub Aug 3, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be done earlier. The preBuffer sending above should be a part of this so that the fileHandle will be disposed if that Send throws.

{
// This can throw ObjectDisposedException.
errorCode = SocketPal.SendFile(_handle, fileHandle);
// Send the file, if any
if (fileHandle != null)
{
// This can throw ObjectDisposedException.
errorCode = SocketPal.SendFile(_handle, fileHandle);
}
}

if (errorCode != SocketError.Success)
Expand Down
9 changes: 6 additions & 3 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,10 +399,13 @@ private void SendFileInternal(string? fileName, ReadOnlySpan<byte> preBuffer, Re
{
// Open the file, if any
SafeFileHandle? fileHandle = OpenFileHandle(fileName);

SocketError errorCode;
// This can throw ObjectDisposedException.
errorCode = SocketPal.SendFile(_handle, fileHandle, preBuffer, postBuffer, flags);

using (fileHandle)
{
// This can throw ObjectDisposedException.
errorCode = SocketPal.SendFile(_handle, fileHandle, preBuffer, postBuffer, flags);
}
Copy link
Member

@stephentoub stephentoub Aug 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be:

SocketError errorCode;
using (SafeFileHandle? fileHandle = OpenFileHandle(fileName))
{
    // This can throw ObjectDisposedException.
    errorCode = SocketPal.SendFile(_handle, fileHandle, preBuffer, postBuffer, flags);
}


if (errorCode != SocketError.Success)
{
Expand Down