Skip to content

improve symlink handling in Ping #79323

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
merged 3 commits into from
Dec 10, 2022
Merged

improve symlink handling in Ping #79323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07ec016
improve symlink handling in Ping
wfurt Dec 7, 2022
812731f
update comment
wfurt Dec 7, 2022
6ceb241
feedback from review
wfurt Dec 9, 2022
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
6 changes: 2 additions & 4 deletions src/libraries/Common/src/System/Net/NetworkInformation/UnixCommandLinePing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@ private static bool IsBusyboxPing(string? pingBinary)
{
if (pingBinary != null)
{
string? linkedName = Interop.Sys.ReadLink(pingBinary);

// If pingBinary is not link linkedName will be null
if (linkedName != null && linkedName.EndsWith("busybox", StringComparison.Ordinal))
System.IO.FileSystemInfo? linkInfo = File.ResolveLinkTarget(pingBinary, returnFinalTarget: true);
if (linkInfo?.Name.EndsWith("busybox", StringComparison.Ordinal) == true)
{
return true;
}
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@
Link="Common\Interop\Unix\Interop.Libraries.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Close.cs"
Link="Common\Interop\Unix\System.Native\Interop.Close.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.ReadLink.cs"
Link="Common\Interop\Unix\System.Native\Interop.ReadLink.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.Socket.cs"
Link="Common\Interop\Unix\System.Native\Interop.Socket.cs" />
<Compile Include="$(CommonPath)Interop\Unix\System.Native\Interop.SocketAddress.cs"
Expand Down