use approved SocketAddress API instead of direct internal access#89841

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
wfurt merged 4 commits into from
Aug 4, 2023
Merged

use approved SocketAddress API instead of direct internal access #89841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8831344
use approved SocketAddress API instead of internal access
wfurt Aug 2, 2023
7a9040d
feedback
wfurt Aug 3, 2023
aaec906
Merge branch 'main' of https://github.com/dotnet/runtime into sockAddr3
wfurt Aug 3, 2023
5c7bb15
cleanup
wfurt Aug 4, 2023
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: 5 additions & 1 deletion src/libraries/Common/src/Interop/Unix/System.Native/Interop.Bind.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ internal static partial class Interop
internal static partial class Sys
{
[LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_Bind")]
internal static unsafe partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, byte* socketAddress, int socketAddressLen);
private static partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress, int socketAddressLen);

internal static Error Bind(
SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress)
=> Bind(socket, socketProtocolType, socketAddress, socketAddress.Length);
}
}
5 changes: 1 addition & 4 deletions src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASocketW.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System;
using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

internal static partial class Interop
{
Expand All@@ -15,7 +12,7 @@ internal static partial class Winsock
[LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
internal static partial IntPtr WSASocketW(
AddressFamily addressFamily,
SocketType socketType,
int socketType,
int protocolType,
IntPtr protocolInfo,
int group,
Expand Down
9 changes: 7 additions & 2 deletions src/libraries/Common/src/Interop/Windows/WinSock/Interop.bind.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Net.Sockets;

Expand All@@ -9,9 +10,13 @@ internal static partial class Interop
internal static partial class Winsock
{
[LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true)]
internal static partial SocketError bind(
private static partial SocketError bind(
SafeSocketHandle socketHandle,
byte[] socketAddress,
ReadOnlySpan<byte> socketAddress,
int socketAddressSize);

internal static SocketError bind(
SafeSocketHandle socketHandle,
ReadOnlySpan<byte> socketAddress) => bind(socketHandle, socketAddress, socketAddress.Length);
}
}
2 changes: 1 addition & 1 deletion src/libraries/Common/src/System/Net/IPEndPointExtensions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

namespace System.Net.Sockets
{
internal static class IPEndPointExtensions
internal static partial class IPEndPointExtensions
{
public static IPAddress GetIPAddress(ReadOnlySpan<byte> socketAddressBuffer)
{
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Common/src/System/Net/Internals/IPEndPointExtensions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@

namespace System.Net.Sockets
{
internal static class IPEndPointExtensions
internal static partial class IPEndPointExtensions
{
public static Internals.SocketAddress Serialize(EndPoint endpoint)
{
Expand Down
50 changes: 25 additions & 25 deletions src/libraries/Common/src/System/Net/SocketAddress.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ class SocketAddress : System.IEquatable<SocketAddress>
internal static readonly int MaxAddressSize = SocketAddressPal.MaxAddressSize;
#pragma warning restore CA1802

internal int InternalSize;
internal byte[] InternalBuffer;
private int _size;
private byte[] _buffer;

private const int MinSize = 2;
private const int DataOffset = 2;
Expand All@@ -39,21 +39,21 @@ public AddressFamily Family
{
get
{
return SocketAddressPal.GetAddressFamily(InternalBuffer);
return SocketAddressPal.GetAddressFamily(_buffer);
}
}

public int Size
{
get
{
return InternalSize;
return _size;
}
set
{
ArgumentOutOfRangeException.ThrowIfGreaterThan(value, InternalBuffer.Length);
ArgumentOutOfRangeException.ThrowIfGreaterThan(value, _buffer.Length);
ArgumentOutOfRangeException.ThrowIfLessThan(value, MinSize);
InternalSize = value;
_size = value;
}
}

Expand All@@ -69,15 +69,15 @@ public byte this[int offset]
{
throw new IndexOutOfRangeException();
}
return InternalBuffer[offset];
return _buffer[offset];
}
set
{
if ((uint)offset >= (uint)Size)
{
throw new IndexOutOfRangeException();
}
InternalBuffer[offset] = value;
_buffer[offset] = value;
}
}

Expand All@@ -97,11 +97,11 @@ public SocketAddress(AddressFamily family, int size)
{
ArgumentOutOfRangeException.ThrowIfLessThan(size, MinSize);

InternalSize = size;
InternalBuffer = new byte[size];
InternalBuffer[0] = (byte)InternalSize;
_size = size;
_buffer = new byte[size];
_buffer[0] = (byte)_size;

SocketAddressPal.SetAddressFamily(InternalBuffer, family);
SocketAddressPal.SetAddressFamily(_buffer, family);
}

internal SocketAddress(IPAddress ipAddress)
Expand All@@ -110,15 +110,15 @@ internal SocketAddress(IPAddress ipAddress)
{

// No Port.
SocketAddressPal.SetPort(InternalBuffer, 0);
SocketAddressPal.SetPort(_buffer, 0);

if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
{
Span<byte> addressBytes = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
ipAddress.TryWriteBytes(addressBytes, out int bytesWritten);
Debug.Assert(bytesWritten == IPAddressParserStatics.IPv6AddressBytes);

SocketAddressPal.SetIPv6Address(InternalBuffer, addressBytes, (uint)ipAddress.ScopeId);
SocketAddressPal.SetIPv6Address(_buffer, addressBytes, (uint)ipAddress.ScopeId);
}
else
{
Expand All@@ -127,21 +127,21 @@ internal SocketAddress(IPAddress ipAddress)
#pragma warning restore CS0618

Debug.Assert(ipAddress.AddressFamily == AddressFamily.InterNetwork);
SocketAddressPal.SetIPv4Address(InternalBuffer, address);
SocketAddressPal.SetIPv4Address(_buffer, address);
}
}

internal SocketAddress(IPAddress ipaddress, int port)
: this(ipaddress)
{
SocketAddressPal.SetPort(InternalBuffer, unchecked((ushort)port));
SocketAddressPal.SetPort(_buffer, unchecked((ushort)port));
}

internal SocketAddress(AddressFamily addressFamily, ReadOnlySpan<byte> buffer)
{
InternalBuffer = buffer.ToArray();
InternalSize = InternalBuffer.Length;
SocketAddressPal.SetAddressFamily(InternalBuffer, addressFamily);
_buffer = buffer.ToArray();
_size = _buffer.Length;
SocketAddressPal.SetAddressFamily(_buffer, addressFamily);
}

/// <summary>This represents underlying memory that can be passed to native OS calls.</summary>
Expand All@@ -152,7 +152,7 @@ public Memory<byte> Buffer
{
get
{
return new Memory<byte>(InternalBuffer, 0, InternalSize);
return new Memory<byte>(_buffer, 0, _size);
}
}

Expand All@@ -164,14 +164,14 @@ internal IPAddress GetIPAddress()

Span<byte> address = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
uint scope;
SocketAddressPal.GetIPv6Address(InternalBuffer, address, out scope);
SocketAddressPal.GetIPv6Address(_buffer, address, out scope);

return new IPAddress(address, (long)scope);
}
else if (Family == AddressFamily.InterNetwork)
{
Debug.Assert(Size >= IPv4AddressSize);
long address = (long)SocketAddressPal.GetIPv4Address(InternalBuffer) & 0x0FFFFFFFF;
long address = (long)SocketAddressPal.GetIPv4Address(_buffer) & 0x0FFFFFFFF;
return new IPAddress(address);
}
else
Expand All@@ -184,7 +184,7 @@ internal IPAddress GetIPAddress()
}
}

internal int GetPort() => (int)SocketAddressPal.GetPort(InternalBuffer);
internal int GetPort() => (int)SocketAddressPal.GetPort(_buffer);

internal IPEndPoint GetIPEndPoint()
{
Expand All@@ -199,7 +199,7 @@ public override bool Equals(object? comparand) =>
public override int GetHashCode()
{
HashCode hash = default;
hash.AddBytes(new ReadOnlySpan<byte>(InternalBuffer, 0, InternalSize));
hash.AddBytes(new ReadOnlySpan<byte>(_buffer, 0, _size));
return hash.ToHashCode();
}

Expand DownExpand Up@@ -234,7 +234,7 @@ public override string ToString()
result[length++] = ':';
result[length++] = '{';

byte[] buffer = InternalBuffer;
byte[] buffer = _buffer;
for (int i = DataOffset; i < Size; i++)
{
if (i > DataOffset)
Expand Down
1 change: 0 additions & 1 deletion src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Unix.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ namespace System.Net
{
internal static partial class SocketProtocolSupportPal
{
private const int DgramSocketType = 2;
private static unsafe bool IsSupported(AddressFamily af)
{
// Check for AF_UNIX on iOS/tvOS. The OS claims to support this, but returns EPERM on bind.
Expand Down
5 changes: 1 addition & 4 deletions src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Windows.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,6 @@

using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

namespace System.Net
{
Expand All@@ -19,7 +16,7 @@ private static bool IsSupported(AddressFamily af)
IntPtr socket = INVALID_SOCKET;
try
{
socket = Interop.Winsock.WSASocketW(af, SocketType.Stream, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
socket = Interop.Winsock.WSASocketW(af, DgramSocketType, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
return
socket != INVALID_SOCKET ||
(SocketError)Marshal.GetLastPInvokeError() != SocketError.AddressFamilyNotSupported;
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/Common/src/System/Net/SocketProtocolSupportPal.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ internal static partial class SocketProtocolSupportPal
public static bool OSSupportsIPv4 { get; } = IsSupported(AddressFamily.InterNetwork);
public static bool OSSupportsUnixDomainSockets { get; } = IsSupported(AddressFamily.Unix);

private const int DgramSocketType = 2;

private static bool IsIPv6Disabled()
{
// First check for the AppContext switch, giving it priority over the environment variable.
Expand Down
10 changes: 1 addition & 9 deletions src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,8 @@
<Compile Include="$(CommonPath)System\Net\InternalException.cs"
Link="Common\System\Net\InternalException.cs" />
<!-- System.Net common -->
<Compile Include="$(CommonPath)System\Net\Sockets\ProtocolType.cs"
Link="Common\System\Net\Sockets\ProtocolType.cs" />
<Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
Link="Common\System\Net\Sockets\SocketType.cs" />

@stephentoubstephentoubAug 4, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We can do it later if you'd prefer, but these files should also move out of common into the appropriate library folder

@wfurtwfurtAug 4, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

yes, I was thinking about SocketAddress.cs as well once the changes are over. Probably separate PR with just moves/renames.

<Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
Link="Common\System\Net\IPAddressParserStatics.cs" />
<Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
Link="Common\System\Net\IPEndPointStatics.cs" />
<Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
Link="Common\System\Net\SocketProtocolSupportPal.cs" />
</ItemGroup>
Expand All@@ -37,9 +31,7 @@
<!-- Debug only -->
<Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs"
Link="Common\System\Net\DebugSafeHandle.cs" />
<!-- System.Net.Internals -->
<Compile Include="$(CommonPath)System\Net\Internals\IPAddressExtensions.cs"
Link="Common\System\Net\Internals\IPAddressExtensions.cs" />
<!-- System.Net common -->
<Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
Link="Common\System\Net\SocketProtocolSupportPal.Windows" />
<Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Net.Internals;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Internals;
using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Text;
Expand Down
14 changes: 4 additions & 10 deletions src/libraries/System.Net.Ping/src/System.Net.Ping.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,8 @@
<Compile Include="$(CommonPath)System\Obsoletions.cs"
Link="Common\System\Obsoletions.cs" />
<!-- System.Net Common -->
<Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
Link="Common\System\Net\IPAddressParserStatics.cs" />
<Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
Link="Common\System\Net\SocketProtocolSupportPal.cs" />
<Compile Include="$(CommonPath)System\Net\InternalException.cs"
Link="Common\System\Net\InternalException.cs" />
<Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
Link="Common\System\Net\IPEndPointExtensions.cs" />
<Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
Link="Common\System\Net\Sockets\SocketType.cs" />
</ItemGroup>
<ItemGroup Condition="('$(TargetPlatformIdentifier)' != '' and '$(TargetPlatformIdentifier)' != 'windows')">
<Compile Include="System\Net\NetworkInformation\IcmpV4MessageConstants.cs" />
Expand All@@ -40,8 +32,6 @@
<!-- System.Net Common -->
<Compile Include="$(CommonPath)System\Net\RawSocketPermissions.cs"
Link="Common\System\Net\RawSocketPermissions.cs" />
<Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs"
Link="Common\System\Net\SocketAddressPal.Unix.cs" />
<Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Unix.cs"
Link="Common\System\Net\SocketProtocolSupportPal.Unix.cs" />
<Compile Include="$(CommonPath)System\Net\NetworkInformation\UnixCommandLinePing.cs"
Expand DownExpand Up@@ -72,6 +62,10 @@
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
<Compile Include="System\Net\NetworkInformation\Ping.Windows.cs" />
<!-- System.Net Common -->
<Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
Link="Common\System\Net\IPAddressParserStatics.cs" />
<Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
Link="Common\System\Net\IPEndPointExtensions.cs" />
<Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
Link="Common\System\Net\SocketAddressPal.Windows.cs" />
<Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,8 @@
<Compile Include="$(CommonPath)System\Net\DebugSafeHandleMinusOneIsInvalid.cs"
Link="Common\System\Net\DebugSafeHandleMinusOneIsInvalid.cs" />
<!-- System.Net common -->
<Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
Comment thread
stephentoub marked this conversation as resolved.
Link="Common\System\Net\IPEndPointExtensions.cs" />
<Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
Link="Common\System\Net\IPEndPointStatics.cs" />
<Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
Expand Down
7 changes: 4 additions & 3 deletions src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,17 +71,18 @@ public Socket(SocketInformation socketInformation)
IPEndPoint ep = new IPEndPoint(tempAddress, 0);

Internals.SocketAddress socketAddress = IPEndPointExtensions.Serialize(ep);
int size = socketAddress.Buffer.Length;
unsafe
{
fixed (byte* bufferPtr = socketAddress.InternalBuffer)
fixed (int* sizePtr = &socketAddress.InternalSize)
fixed (byte* bufferPtr = socketAddress.Buffer.Span)
{
errorCode = SocketPal.GetSockName(_handle, bufferPtr, sizePtr);
errorCode = SocketPal.GetSockName(_handle, bufferPtr, &size);
}
}

if (errorCode == SocketError.Success)
{
socketAddress.Size = size;
_rightEndPoint = ep.Create(socketAddress);
}
else if (errorCode == SocketError.InvalidArgument)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
use approved SocketAddress API instead of direct internal access#89841

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

wfurt
merged 4 commits into

from

Aug 4, 2023
 Merged


use approved SocketAddress API instead of direct internal access
#89841
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8831344

use approved SocketAddress API instead of internal access


wfurt Aug 2, 2023
7a9040d

feedback


wfurt Aug 3, 2023
aaec906

Merge branch 'main' of https://github.com/dotnet/runtime into sockAddr3


wfurt Aug 3, 2023
5c7bb15

cleanup


wfurt Aug 4, 2023

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: 5 additions & 1 deletion
src/libraries/Common/src/Interop/Unix/System.Native/Interop.Bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ internal static partial class Interop
 internal static partial class Sys
 {
 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_Bind")]
 internal static unsafe partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, byte* socketAddress, int socketAddressLen);
 private static partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress, int socketAddressLen);

 internal static Error Bind(
 SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress)
 => Bind(socket, socketProtocolType, socketAddress, socketAddress.Length);
 }
}

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASocketW.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System;
using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

internal static partial class Interop
{
Expand All@@ -15,7 +12,7 @@ internal static partial class Winsock
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
 internal static partial IntPtr WSASocketW(
 AddressFamily addressFamily,
SocketType socketType,
int socketType,
 int protocolType,
 IntPtr protocolInfo,
 int group,
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Net.Sockets;

Expand All@@ -9,9 +10,13 @@ internal static partial class Interop
 internal static partial class Winsock
 {
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true)]
internal static partial SocketError bind(
private static partial SocketError bind(
 SafeSocketHandle socketHandle,
 byte[] socketAddress,
ReadOnlySpan<byte> socketAddress,
 int socketAddressSize);

 internal static SocketError bind(
 SafeSocketHandle socketHandle,
 ReadOnlySpan<byte> socketAddress) => bind(socketHandle, socketAddress, socketAddress.Length);
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static IPAddress GetIPAddress(ReadOnlySpan<byte> socketAddressBuffer)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/Internals/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static Internals.SocketAddress Serialize(EndPoint endpoint)
 {
Expand Down

50 changes: 25 additions & 25 deletions
src/libraries/Common/src/System/Net/SocketAddress.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ class SocketAddress : System.IEquatable<SocketAddress>
 internal static readonly int MaxAddressSize = SocketAddressPal.MaxAddressSize;
#pragma warning restore CA1802

internal int InternalSize;
internal byte[] InternalBuffer;
private int _size;
private byte[] _buffer;

 private const int MinSize = 2;
 private const int DataOffset = 2;
Expand All@@ -39,21 +39,21 @@ public AddressFamily Family
 {
 get
 {
 return SocketAddressPal.GetAddressFamily(InternalBuffer);
 return SocketAddressPal.GetAddressFamily(_buffer);
 }
 }

 public int Size
 {
 get
 {
 return InternalSize;
 return _size;
 }
 set
 {
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, InternalBuffer.Length);
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, _buffer.Length);
 ArgumentOutOfRangeException.ThrowIfLessThan(value, MinSize);
InternalSize = value;
_size = value;
 }
 }

Expand All@@ -69,15 +69,15 @@ public byte this[int offset]
 {
 throw new IndexOutOfRangeException();
 }
 return InternalBuffer[offset];
 return _buffer[offset];
 }
 set
 {
 if ((uint)offset >= (uint)Size)
 {
 throw new IndexOutOfRangeException();
 }
InternalBuffer[offset] = value;
_buffer[offset] = value;
 }
 }

Expand All@@ -97,11 +97,11 @@ public SocketAddress(AddressFamily family, int size)
 {
 ArgumentOutOfRangeException.ThrowIfLessThan(size, MinSize);

InternalSize = size;
InternalBuffer = new byte[size];
InternalBuffer[0] = (byte)InternalSize;
_size = size;
_buffer = new byte[size];
_buffer[0] = (byte)_size;

 SocketAddressPal.SetAddressFamily(InternalBuffer, family);
 SocketAddressPal.SetAddressFamily(_buffer, family);
 }

 internal SocketAddress(IPAddress ipAddress)
Expand All@@ -110,15 +110,15 @@ internal SocketAddress(IPAddress ipAddress)
 {

 // No Port.
 SocketAddressPal.SetPort(InternalBuffer, 0);
 SocketAddressPal.SetPort(_buffer, 0);

 if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
 {
 Span<byte> addressBytes = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 ipAddress.TryWriteBytes(addressBytes, out int bytesWritten);
 Debug.Assert(bytesWritten == IPAddressParserStatics.IPv6AddressBytes);

 SocketAddressPal.SetIPv6Address(InternalBuffer, addressBytes, (uint)ipAddress.ScopeId);
 SocketAddressPal.SetIPv6Address(_buffer, addressBytes, (uint)ipAddress.ScopeId);
 }
 else
 {
Expand All@@ -127,21 +127,21 @@ internal SocketAddress(IPAddress ipAddress)
#pragma warning restore CS0618

 Debug.Assert(ipAddress.AddressFamily == AddressFamily.InterNetwork);
 SocketAddressPal.SetIPv4Address(InternalBuffer, address);
 SocketAddressPal.SetIPv4Address(_buffer, address);
 }
 }

 internal SocketAddress(IPAddress ipaddress, int port)
 : this(ipaddress)
 {
 SocketAddressPal.SetPort(InternalBuffer, unchecked((ushort)port));
 SocketAddressPal.SetPort(_buffer, unchecked((ushort)port));
 }

 internal SocketAddress(AddressFamily addressFamily, ReadOnlySpan<byte> buffer)
 {
InternalBuffer = buffer.ToArray();
InternalSize = InternalBuffer.Length;
 SocketAddressPal.SetAddressFamily(InternalBuffer, addressFamily);
_buffer = buffer.ToArray();
_size = _buffer.Length;
 SocketAddressPal.SetAddressFamily(_buffer, addressFamily);
 }

 /// <summary>This represents underlying memory that can be passed to native OS calls.</summary>
Expand All@@ -152,7 +152,7 @@ public Memory<byte> Buffer
 {
 get
 {
 return new Memory<byte>(InternalBuffer, 0, InternalSize);
 return new Memory<byte>(_buffer, 0, _size);
 }
 }

Expand All@@ -164,14 +164,14 @@ internal IPAddress GetIPAddress()

 Span<byte> address = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 uint scope;
 SocketAddressPal.GetIPv6Address(InternalBuffer, address, out scope);
 SocketAddressPal.GetIPv6Address(_buffer, address, out scope);

 return new IPAddress(address, (long)scope);
 }
 else if (Family == AddressFamily.InterNetwork)
 {
 Debug.Assert(Size >= IPv4AddressSize);
 long address = (long)SocketAddressPal.GetIPv4Address(InternalBuffer) & 0x0FFFFFFFF;
 long address = (long)SocketAddressPal.GetIPv4Address(_buffer) & 0x0FFFFFFFF;
 return new IPAddress(address);
 }
 else
Expand All@@ -184,7 +184,7 @@ internal IPAddress GetIPAddress()
 }
 }

 internal int GetPort() => (int)SocketAddressPal.GetPort(InternalBuffer);
 internal int GetPort() => (int)SocketAddressPal.GetPort(_buffer);

 internal IPEndPoint GetIPEndPoint()
 {
Expand All@@ -199,7 +199,7 @@ public override bool Equals(object? comparand) =>
 public override int GetHashCode()
 {
 HashCode hash = default;
 hash.AddBytes(new ReadOnlySpan<byte>(InternalBuffer, 0, InternalSize));
 hash.AddBytes(new ReadOnlySpan<byte>(_buffer, 0, _size));
 return hash.ToHashCode();
 }

Expand DownExpand Up@@ -234,7 +234,7 @@ public override string ToString()
 result[length++] = ':';
 result[length++] = '{';

 byte[] buffer = InternalBuffer;
 byte[] buffer = _buffer;
 for (int i = DataOffset; i < Size; i++)
 {
 if (i > DataOffset)
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ namespace System.Net
{
 internal static partial class SocketProtocolSupportPal
 {
 private const int DgramSocketType = 2;
 private static unsafe bool IsSupported(AddressFamily af)
 {
 // Check for AF_UNIX on iOS/tvOS. The OS claims to support this, but returns EPERM on bind.
Expand Down

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,6 @@

using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

namespace System.Net
{
Expand All@@ -19,7 +16,7 @@ private static bool IsSupported(AddressFamily af)
 IntPtr socket = INVALID_SOCKET;
 try
 {
 socket = Interop.Winsock.WSASocketW(af, SocketType.Stream, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 socket = Interop.Winsock.WSASocketW(af, DgramSocketType, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 return
 socket != INVALID_SOCKET ||
 (SocketError)Marshal.GetLastPInvokeError() != SocketError.AddressFamilyNotSupported;
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ internal static partial class SocketProtocolSupportPal
 public static bool OSSupportsIPv4 { get; } = IsSupported(AddressFamily.InterNetwork);
 public static bool OSSupportsUnixDomainSockets { get; } = IsSupported(AddressFamily.Unix);

 private const int DgramSocketType = 2;

 private static bool IsIPv6Disabled()
 {
 // First check for the AppContext switch, giving it priority over the environment variable.
Expand Down

10 changes: 1 addition & 9 deletions
src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,8 @@
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolType.cs"
 Link="Common\System\Net\Sockets\ProtocolType.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
@stephentoubstephentoubAug 4, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We can do it later if you'd prefer, but these files should also move out of common into the appropriate library folder
@wfurtwfurtAug 4, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

yes, I was thinking about SocketAddress.cs as well once the changes are over. Probably separate PR with just moves/renames.
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 </ItemGroup>
Expand All@@ -37,9 +31,7 @@
 <!-- Debug only -->
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs"
 Link="Common\System\Net\DebugSafeHandle.cs" />
 <!-- System.Net.Internals -->
 <Compile Include="$(CommonPath)System\Net\Internals\IPAddressExtensions.cs"
 Link="Common\System\Net\Internals\IPAddressExtensions.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Windows" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Net.Internals;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Internals;
using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Text;
Expand Down

14 changes: 4 additions & 10 deletions
src/libraries/System.Net.Ping/src/System.Net.Ping.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,8 @@
 <Compile Include="$(CommonPath)System\Obsoletions.cs"
 Link="Common\System\Obsoletions.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
 </ItemGroup>
 <ItemGroup Condition="('$(TargetPlatformIdentifier)' != '' and '$(TargetPlatformIdentifier)' != 'windows')">
 <Compile Include="System\Net\NetworkInformation\IcmpV4MessageConstants.cs" />
Expand All@@ -40,8 +32,6 @@
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\RawSocketPermissions.cs"
 Link="Common\System\Net\RawSocketPermissions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs"
 Link="Common\System\Net\SocketAddressPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Unix.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\NetworkInformation\UnixCommandLinePing.cs"
Expand DownExpand Up@@ -72,6 +62,10 @@
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="System\Net\NetworkInformation\Ping.Windows.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
 Link="Common\System\Net\SocketAddressPal.Windows.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,8 @@
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandleMinusOneIsInvalid.cs"
 Link="Common\System\Net\DebugSafeHandleMinusOneIsInvalid.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
Comment thread
stephentoub marked this conversation as resolved.

 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
Expand Down

7 changes: 4 additions & 3 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,17 +71,18 @@ public Socket(SocketInformation socketInformation)
 IPEndPoint ep = new IPEndPoint(tempAddress, 0);

 Internals.SocketAddress socketAddress = IPEndPointExtensions.Serialize(ep);
 int size = socketAddress.Buffer.Length;
 unsafe
 {
 fixed (byte* bufferPtr = socketAddress.InternalBuffer)
 fixed (int* sizePtr = &socketAddress.InternalSize)
 fixed (byte* bufferPtr = socketAddress.Buffer.Span)
 {
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, sizePtr);
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, &size);
 }
 }

 if (errorCode == SocketError.Success)
 {
 socketAddress.Size = size;
 _rightEndPoint = ep.Create(socketAddress);
 }
 else if (errorCode == SocketError.InvalidArgument)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
use approved SocketAddress API instead of direct internal access#89841

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

wfurt
merged 4 commits into

from

Aug 4, 2023
 Merged


use approved SocketAddress API instead of direct internal access
#89841
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8831344

use approved SocketAddress API instead of internal access


wfurt Aug 2, 2023
7a9040d

feedback


wfurt Aug 3, 2023
aaec906

Merge branch 'main' of https://github.com/dotnet/runtime into sockAddr3


wfurt Aug 3, 2023
5c7bb15

cleanup


wfurt Aug 4, 2023

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: 5 additions & 1 deletion
src/libraries/Common/src/Interop/Unix/System.Native/Interop.Bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ internal static partial class Interop
 internal static partial class Sys
 {
 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_Bind")]
 internal static unsafe partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, byte* socketAddress, int socketAddressLen);
 private static partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress, int socketAddressLen);

 internal static Error Bind(
 SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress)
 => Bind(socket, socketProtocolType, socketAddress, socketAddress.Length);
 }
}

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASocketW.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System;
using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

internal static partial class Interop
{
Expand All@@ -15,7 +12,7 @@ internal static partial class Winsock
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
 internal static partial IntPtr WSASocketW(
 AddressFamily addressFamily,
SocketType socketType,
int socketType,
 int protocolType,
 IntPtr protocolInfo,
 int group,
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Net.Sockets;

Expand All@@ -9,9 +10,13 @@ internal static partial class Interop
 internal static partial class Winsock
 {
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true)]
internal static partial SocketError bind(
private static partial SocketError bind(
 SafeSocketHandle socketHandle,
 byte[] socketAddress,
ReadOnlySpan<byte> socketAddress,
 int socketAddressSize);

 internal static SocketError bind(
 SafeSocketHandle socketHandle,
 ReadOnlySpan<byte> socketAddress) => bind(socketHandle, socketAddress, socketAddress.Length);
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static IPAddress GetIPAddress(ReadOnlySpan<byte> socketAddressBuffer)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/Internals/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static Internals.SocketAddress Serialize(EndPoint endpoint)
 {
Expand Down

50 changes: 25 additions & 25 deletions
src/libraries/Common/src/System/Net/SocketAddress.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ class SocketAddress : System.IEquatable<SocketAddress>
 internal static readonly int MaxAddressSize = SocketAddressPal.MaxAddressSize;
#pragma warning restore CA1802

internal int InternalSize;
internal byte[] InternalBuffer;
private int _size;
private byte[] _buffer;

 private const int MinSize = 2;
 private const int DataOffset = 2;
Expand All@@ -39,21 +39,21 @@ public AddressFamily Family
 {
 get
 {
 return SocketAddressPal.GetAddressFamily(InternalBuffer);
 return SocketAddressPal.GetAddressFamily(_buffer);
 }
 }

 public int Size
 {
 get
 {
 return InternalSize;
 return _size;
 }
 set
 {
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, InternalBuffer.Length);
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, _buffer.Length);
 ArgumentOutOfRangeException.ThrowIfLessThan(value, MinSize);
InternalSize = value;
_size = value;
 }
 }

Expand All@@ -69,15 +69,15 @@ public byte this[int offset]
 {
 throw new IndexOutOfRangeException();
 }
 return InternalBuffer[offset];
 return _buffer[offset];
 }
 set
 {
 if ((uint)offset >= (uint)Size)
 {
 throw new IndexOutOfRangeException();
 }
InternalBuffer[offset] = value;
_buffer[offset] = value;
 }
 }

Expand All@@ -97,11 +97,11 @@ public SocketAddress(AddressFamily family, int size)
 {
 ArgumentOutOfRangeException.ThrowIfLessThan(size, MinSize);

InternalSize = size;
InternalBuffer = new byte[size];
InternalBuffer[0] = (byte)InternalSize;
_size = size;
_buffer = new byte[size];
_buffer[0] = (byte)_size;

 SocketAddressPal.SetAddressFamily(InternalBuffer, family);
 SocketAddressPal.SetAddressFamily(_buffer, family);
 }

 internal SocketAddress(IPAddress ipAddress)
Expand All@@ -110,15 +110,15 @@ internal SocketAddress(IPAddress ipAddress)
 {

 // No Port.
 SocketAddressPal.SetPort(InternalBuffer, 0);
 SocketAddressPal.SetPort(_buffer, 0);

 if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
 {
 Span<byte> addressBytes = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 ipAddress.TryWriteBytes(addressBytes, out int bytesWritten);
 Debug.Assert(bytesWritten == IPAddressParserStatics.IPv6AddressBytes);

 SocketAddressPal.SetIPv6Address(InternalBuffer, addressBytes, (uint)ipAddress.ScopeId);
 SocketAddressPal.SetIPv6Address(_buffer, addressBytes, (uint)ipAddress.ScopeId);
 }
 else
 {
Expand All@@ -127,21 +127,21 @@ internal SocketAddress(IPAddress ipAddress)
#pragma warning restore CS0618

 Debug.Assert(ipAddress.AddressFamily == AddressFamily.InterNetwork);
 SocketAddressPal.SetIPv4Address(InternalBuffer, address);
 SocketAddressPal.SetIPv4Address(_buffer, address);
 }
 }

 internal SocketAddress(IPAddress ipaddress, int port)
 : this(ipaddress)
 {
 SocketAddressPal.SetPort(InternalBuffer, unchecked((ushort)port));
 SocketAddressPal.SetPort(_buffer, unchecked((ushort)port));
 }

 internal SocketAddress(AddressFamily addressFamily, ReadOnlySpan<byte> buffer)
 {
InternalBuffer = buffer.ToArray();
InternalSize = InternalBuffer.Length;
 SocketAddressPal.SetAddressFamily(InternalBuffer, addressFamily);
_buffer = buffer.ToArray();
_size = _buffer.Length;
 SocketAddressPal.SetAddressFamily(_buffer, addressFamily);
 }

 /// <summary>This represents underlying memory that can be passed to native OS calls.</summary>
Expand All@@ -152,7 +152,7 @@ public Memory<byte> Buffer
 {
 get
 {
 return new Memory<byte>(InternalBuffer, 0, InternalSize);
 return new Memory<byte>(_buffer, 0, _size);
 }
 }

Expand All@@ -164,14 +164,14 @@ internal IPAddress GetIPAddress()

 Span<byte> address = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 uint scope;
 SocketAddressPal.GetIPv6Address(InternalBuffer, address, out scope);
 SocketAddressPal.GetIPv6Address(_buffer, address, out scope);

 return new IPAddress(address, (long)scope);
 }
 else if (Family == AddressFamily.InterNetwork)
 {
 Debug.Assert(Size >= IPv4AddressSize);
 long address = (long)SocketAddressPal.GetIPv4Address(InternalBuffer) & 0x0FFFFFFFF;
 long address = (long)SocketAddressPal.GetIPv4Address(_buffer) & 0x0FFFFFFFF;
 return new IPAddress(address);
 }
 else
Expand All@@ -184,7 +184,7 @@ internal IPAddress GetIPAddress()
 }
 }

 internal int GetPort() => (int)SocketAddressPal.GetPort(InternalBuffer);
 internal int GetPort() => (int)SocketAddressPal.GetPort(_buffer);

 internal IPEndPoint GetIPEndPoint()
 {
Expand All@@ -199,7 +199,7 @@ public override bool Equals(object? comparand) =>
 public override int GetHashCode()
 {
 HashCode hash = default;
 hash.AddBytes(new ReadOnlySpan<byte>(InternalBuffer, 0, InternalSize));
 hash.AddBytes(new ReadOnlySpan<byte>(_buffer, 0, _size));
 return hash.ToHashCode();
 }

Expand DownExpand Up@@ -234,7 +234,7 @@ public override string ToString()
 result[length++] = ':';
 result[length++] = '{';

 byte[] buffer = InternalBuffer;
 byte[] buffer = _buffer;
 for (int i = DataOffset; i < Size; i++)
 {
 if (i > DataOffset)
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ namespace System.Net
{
 internal static partial class SocketProtocolSupportPal
 {
 private const int DgramSocketType = 2;
 private static unsafe bool IsSupported(AddressFamily af)
 {
 // Check for AF_UNIX on iOS/tvOS. The OS claims to support this, but returns EPERM on bind.
Expand Down

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,6 @@

using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

namespace System.Net
{
Expand All@@ -19,7 +16,7 @@ private static bool IsSupported(AddressFamily af)
 IntPtr socket = INVALID_SOCKET;
 try
 {
 socket = Interop.Winsock.WSASocketW(af, SocketType.Stream, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 socket = Interop.Winsock.WSASocketW(af, DgramSocketType, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 return
 socket != INVALID_SOCKET ||
 (SocketError)Marshal.GetLastPInvokeError() != SocketError.AddressFamilyNotSupported;
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ internal static partial class SocketProtocolSupportPal
 public static bool OSSupportsIPv4 { get; } = IsSupported(AddressFamily.InterNetwork);
 public static bool OSSupportsUnixDomainSockets { get; } = IsSupported(AddressFamily.Unix);

 private const int DgramSocketType = 2;

 private static bool IsIPv6Disabled()
 {
 // First check for the AppContext switch, giving it priority over the environment variable.
Expand Down

10 changes: 1 addition & 9 deletions
src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,8 @@
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolType.cs"
 Link="Common\System\Net\Sockets\ProtocolType.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
@stephentoubstephentoubAug 4, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We can do it later if you'd prefer, but these files should also move out of common into the appropriate library folder
@wfurtwfurtAug 4, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

yes, I was thinking about SocketAddress.cs as well once the changes are over. Probably separate PR with just moves/renames.
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 </ItemGroup>
Expand All@@ -37,9 +31,7 @@
 <!-- Debug only -->
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs"
 Link="Common\System\Net\DebugSafeHandle.cs" />
 <!-- System.Net.Internals -->
 <Compile Include="$(CommonPath)System\Net\Internals\IPAddressExtensions.cs"
 Link="Common\System\Net\Internals\IPAddressExtensions.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Windows" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Net.Internals;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Internals;
using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Text;
Expand Down

14 changes: 4 additions & 10 deletions
src/libraries/System.Net.Ping/src/System.Net.Ping.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,8 @@
 <Compile Include="$(CommonPath)System\Obsoletions.cs"
 Link="Common\System\Obsoletions.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
 </ItemGroup>
 <ItemGroup Condition="('$(TargetPlatformIdentifier)' != '' and '$(TargetPlatformIdentifier)' != 'windows')">
 <Compile Include="System\Net\NetworkInformation\IcmpV4MessageConstants.cs" />
Expand All@@ -40,8 +32,6 @@
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\RawSocketPermissions.cs"
 Link="Common\System\Net\RawSocketPermissions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs"
 Link="Common\System\Net\SocketAddressPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Unix.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\NetworkInformation\UnixCommandLinePing.cs"
Expand DownExpand Up@@ -72,6 +62,10 @@
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="System\Net\NetworkInformation\Ping.Windows.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
 Link="Common\System\Net\SocketAddressPal.Windows.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,8 @@
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandleMinusOneIsInvalid.cs"
 Link="Common\System\Net\DebugSafeHandleMinusOneIsInvalid.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
Comment thread
stephentoub marked this conversation as resolved.

 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
Expand Down

7 changes: 4 additions & 3 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,17 +71,18 @@ public Socket(SocketInformation socketInformation)
 IPEndPoint ep = new IPEndPoint(tempAddress, 0);

 Internals.SocketAddress socketAddress = IPEndPointExtensions.Serialize(ep);
 int size = socketAddress.Buffer.Length;
 unsafe
 {
 fixed (byte* bufferPtr = socketAddress.InternalBuffer)
 fixed (int* sizePtr = &socketAddress.InternalSize)
 fixed (byte* bufferPtr = socketAddress.Buffer.Span)
 {
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, sizePtr);
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, &size);
 }
 }

 if (errorCode == SocketError.Success)
 {
 socketAddress.Size = size;
 _rightEndPoint = ep.Create(socketAddress);
 }
 else if (errorCode == SocketError.InvalidArgument)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
use approved SocketAddress API instead of direct internal access#89841

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

wfurt
merged 4 commits into

from

Aug 4, 2023
 Merged


use approved SocketAddress API instead of direct internal access
#89841
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8831344

use approved SocketAddress API instead of internal access


wfurt Aug 2, 2023
7a9040d

feedback


wfurt Aug 3, 2023
aaec906

Merge branch 'main' of https://github.com/dotnet/runtime into sockAddr3


wfurt Aug 3, 2023
5c7bb15

cleanup


wfurt Aug 4, 2023

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: 5 additions & 1 deletion
src/libraries/Common/src/Interop/Unix/System.Native/Interop.Bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ internal static partial class Interop
 internal static partial class Sys
 {
 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_Bind")]
 internal static unsafe partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, byte* socketAddress, int socketAddressLen);
 private static partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress, int socketAddressLen);

 internal static Error Bind(
 SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress)
 => Bind(socket, socketProtocolType, socketAddress, socketAddress.Length);
 }
}

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASocketW.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System;
using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

internal static partial class Interop
{
Expand All@@ -15,7 +12,7 @@ internal static partial class Winsock
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
 internal static partial IntPtr WSASocketW(
 AddressFamily addressFamily,
SocketType socketType,
int socketType,
 int protocolType,
 IntPtr protocolInfo,
 int group,
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Net.Sockets;

Expand All@@ -9,9 +10,13 @@ internal static partial class Interop
 internal static partial class Winsock
 {
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true)]
internal static partial SocketError bind(
private static partial SocketError bind(
 SafeSocketHandle socketHandle,
 byte[] socketAddress,
ReadOnlySpan<byte> socketAddress,
 int socketAddressSize);

 internal static SocketError bind(
 SafeSocketHandle socketHandle,
 ReadOnlySpan<byte> socketAddress) => bind(socketHandle, socketAddress, socketAddress.Length);
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static IPAddress GetIPAddress(ReadOnlySpan<byte> socketAddressBuffer)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/Internals/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static Internals.SocketAddress Serialize(EndPoint endpoint)
 {
Expand Down

50 changes: 25 additions & 25 deletions
src/libraries/Common/src/System/Net/SocketAddress.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ class SocketAddress : System.IEquatable<SocketAddress>
 internal static readonly int MaxAddressSize = SocketAddressPal.MaxAddressSize;
#pragma warning restore CA1802

internal int InternalSize;
internal byte[] InternalBuffer;
private int _size;
private byte[] _buffer;

 private const int MinSize = 2;
 private const int DataOffset = 2;
Expand All@@ -39,21 +39,21 @@ public AddressFamily Family
 {
 get
 {
 return SocketAddressPal.GetAddressFamily(InternalBuffer);
 return SocketAddressPal.GetAddressFamily(_buffer);
 }
 }

 public int Size
 {
 get
 {
 return InternalSize;
 return _size;
 }
 set
 {
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, InternalBuffer.Length);
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, _buffer.Length);
 ArgumentOutOfRangeException.ThrowIfLessThan(value, MinSize);
InternalSize = value;
_size = value;
 }
 }

Expand All@@ -69,15 +69,15 @@ public byte this[int offset]
 {
 throw new IndexOutOfRangeException();
 }
 return InternalBuffer[offset];
 return _buffer[offset];
 }
 set
 {
 if ((uint)offset >= (uint)Size)
 {
 throw new IndexOutOfRangeException();
 }
InternalBuffer[offset] = value;
_buffer[offset] = value;
 }
 }

Expand All@@ -97,11 +97,11 @@ public SocketAddress(AddressFamily family, int size)
 {
 ArgumentOutOfRangeException.ThrowIfLessThan(size, MinSize);

InternalSize = size;
InternalBuffer = new byte[size];
InternalBuffer[0] = (byte)InternalSize;
_size = size;
_buffer = new byte[size];
_buffer[0] = (byte)_size;

 SocketAddressPal.SetAddressFamily(InternalBuffer, family);
 SocketAddressPal.SetAddressFamily(_buffer, family);
 }

 internal SocketAddress(IPAddress ipAddress)
Expand All@@ -110,15 +110,15 @@ internal SocketAddress(IPAddress ipAddress)
 {

 // No Port.
 SocketAddressPal.SetPort(InternalBuffer, 0);
 SocketAddressPal.SetPort(_buffer, 0);

 if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
 {
 Span<byte> addressBytes = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 ipAddress.TryWriteBytes(addressBytes, out int bytesWritten);
 Debug.Assert(bytesWritten == IPAddressParserStatics.IPv6AddressBytes);

 SocketAddressPal.SetIPv6Address(InternalBuffer, addressBytes, (uint)ipAddress.ScopeId);
 SocketAddressPal.SetIPv6Address(_buffer, addressBytes, (uint)ipAddress.ScopeId);
 }
 else
 {
Expand All@@ -127,21 +127,21 @@ internal SocketAddress(IPAddress ipAddress)
#pragma warning restore CS0618

 Debug.Assert(ipAddress.AddressFamily == AddressFamily.InterNetwork);
 SocketAddressPal.SetIPv4Address(InternalBuffer, address);
 SocketAddressPal.SetIPv4Address(_buffer, address);
 }
 }

 internal SocketAddress(IPAddress ipaddress, int port)
 : this(ipaddress)
 {
 SocketAddressPal.SetPort(InternalBuffer, unchecked((ushort)port));
 SocketAddressPal.SetPort(_buffer, unchecked((ushort)port));
 }

 internal SocketAddress(AddressFamily addressFamily, ReadOnlySpan<byte> buffer)
 {
InternalBuffer = buffer.ToArray();
InternalSize = InternalBuffer.Length;
 SocketAddressPal.SetAddressFamily(InternalBuffer, addressFamily);
_buffer = buffer.ToArray();
_size = _buffer.Length;
 SocketAddressPal.SetAddressFamily(_buffer, addressFamily);
 }

 /// <summary>This represents underlying memory that can be passed to native OS calls.</summary>
Expand All@@ -152,7 +152,7 @@ public Memory<byte> Buffer
 {
 get
 {
 return new Memory<byte>(InternalBuffer, 0, InternalSize);
 return new Memory<byte>(_buffer, 0, _size);
 }
 }

Expand All@@ -164,14 +164,14 @@ internal IPAddress GetIPAddress()

 Span<byte> address = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 uint scope;
 SocketAddressPal.GetIPv6Address(InternalBuffer, address, out scope);
 SocketAddressPal.GetIPv6Address(_buffer, address, out scope);

 return new IPAddress(address, (long)scope);
 }
 else if (Family == AddressFamily.InterNetwork)
 {
 Debug.Assert(Size >= IPv4AddressSize);
 long address = (long)SocketAddressPal.GetIPv4Address(InternalBuffer) & 0x0FFFFFFFF;
 long address = (long)SocketAddressPal.GetIPv4Address(_buffer) & 0x0FFFFFFFF;
 return new IPAddress(address);
 }
 else
Expand All@@ -184,7 +184,7 @@ internal IPAddress GetIPAddress()
 }
 }

 internal int GetPort() => (int)SocketAddressPal.GetPort(InternalBuffer);
 internal int GetPort() => (int)SocketAddressPal.GetPort(_buffer);

 internal IPEndPoint GetIPEndPoint()
 {
Expand All@@ -199,7 +199,7 @@ public override bool Equals(object? comparand) =>
 public override int GetHashCode()
 {
 HashCode hash = default;
 hash.AddBytes(new ReadOnlySpan<byte>(InternalBuffer, 0, InternalSize));
 hash.AddBytes(new ReadOnlySpan<byte>(_buffer, 0, _size));
 return hash.ToHashCode();
 }

Expand DownExpand Up@@ -234,7 +234,7 @@ public override string ToString()
 result[length++] = ':';
 result[length++] = '{';

 byte[] buffer = InternalBuffer;
 byte[] buffer = _buffer;
 for (int i = DataOffset; i < Size; i++)
 {
 if (i > DataOffset)
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ namespace System.Net
{
 internal static partial class SocketProtocolSupportPal
 {
 private const int DgramSocketType = 2;
 private static unsafe bool IsSupported(AddressFamily af)
 {
 // Check for AF_UNIX on iOS/tvOS. The OS claims to support this, but returns EPERM on bind.
Expand Down

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,6 @@

using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

namespace System.Net
{
Expand All@@ -19,7 +16,7 @@ private static bool IsSupported(AddressFamily af)
 IntPtr socket = INVALID_SOCKET;
 try
 {
 socket = Interop.Winsock.WSASocketW(af, SocketType.Stream, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 socket = Interop.Winsock.WSASocketW(af, DgramSocketType, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 return
 socket != INVALID_SOCKET ||
 (SocketError)Marshal.GetLastPInvokeError() != SocketError.AddressFamilyNotSupported;
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ internal static partial class SocketProtocolSupportPal
 public static bool OSSupportsIPv4 { get; } = IsSupported(AddressFamily.InterNetwork);
 public static bool OSSupportsUnixDomainSockets { get; } = IsSupported(AddressFamily.Unix);

 private const int DgramSocketType = 2;

 private static bool IsIPv6Disabled()
 {
 // First check for the AppContext switch, giving it priority over the environment variable.
Expand Down

10 changes: 1 addition & 9 deletions
src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,8 @@
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolType.cs"
 Link="Common\System\Net\Sockets\ProtocolType.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
@stephentoubstephentoubAug 4, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We can do it later if you'd prefer, but these files should also move out of common into the appropriate library folder
@wfurtwfurtAug 4, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

yes, I was thinking about SocketAddress.cs as well once the changes are over. Probably separate PR with just moves/renames.
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 </ItemGroup>
Expand All@@ -37,9 +31,7 @@
 <!-- Debug only -->
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs"
 Link="Common\System\Net\DebugSafeHandle.cs" />
 <!-- System.Net.Internals -->
 <Compile Include="$(CommonPath)System\Net\Internals\IPAddressExtensions.cs"
 Link="Common\System\Net\Internals\IPAddressExtensions.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Windows" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Net.Internals;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Internals;
using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Text;
Expand Down

14 changes: 4 additions & 10 deletions
src/libraries/System.Net.Ping/src/System.Net.Ping.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,8 @@
 <Compile Include="$(CommonPath)System\Obsoletions.cs"
 Link="Common\System\Obsoletions.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
 </ItemGroup>
 <ItemGroup Condition="('$(TargetPlatformIdentifier)' != '' and '$(TargetPlatformIdentifier)' != 'windows')">
 <Compile Include="System\Net\NetworkInformation\IcmpV4MessageConstants.cs" />
Expand All@@ -40,8 +32,6 @@
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\RawSocketPermissions.cs"
 Link="Common\System\Net\RawSocketPermissions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs"
 Link="Common\System\Net\SocketAddressPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Unix.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\NetworkInformation\UnixCommandLinePing.cs"
Expand DownExpand Up@@ -72,6 +62,10 @@
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="System\Net\NetworkInformation\Ping.Windows.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
 Link="Common\System\Net\SocketAddressPal.Windows.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,8 @@
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandleMinusOneIsInvalid.cs"
 Link="Common\System\Net\DebugSafeHandleMinusOneIsInvalid.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
Comment thread
stephentoub marked this conversation as resolved.

 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
Expand Down

7 changes: 4 additions & 3 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,17 +71,18 @@ public Socket(SocketInformation socketInformation)
 IPEndPoint ep = new IPEndPoint(tempAddress, 0);

 Internals.SocketAddress socketAddress = IPEndPointExtensions.Serialize(ep);
 int size = socketAddress.Buffer.Length;
 unsafe
 {
 fixed (byte* bufferPtr = socketAddress.InternalBuffer)
 fixed (int* sizePtr = &socketAddress.InternalSize)
 fixed (byte* bufferPtr = socketAddress.Buffer.Span)
 {
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, sizePtr);
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, &size);
 }
 }

 if (errorCode == SocketError.Success)
 {
 socketAddress.Size = size;
 _rightEndPoint = ep.Create(socketAddress);
 }
 else if (errorCode == SocketError.InvalidArgument)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
use approved SocketAddress API instead of direct internal access#89841

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

wfurt
merged 4 commits into

from

Aug 4, 2023
 Merged


use approved SocketAddress API instead of direct internal access
#89841
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8831344

use approved SocketAddress API instead of internal access


wfurt Aug 2, 2023
7a9040d

feedback


wfurt Aug 3, 2023
aaec906

Merge branch 'main' of https://github.com/dotnet/runtime into sockAddr3


wfurt Aug 3, 2023
5c7bb15

cleanup


wfurt Aug 4, 2023

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: 5 additions & 1 deletion
src/libraries/Common/src/Interop/Unix/System.Native/Interop.Bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ internal static partial class Interop
 internal static partial class Sys
 {
 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_Bind")]
 internal static unsafe partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, byte* socketAddress, int socketAddressLen);
 private static partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress, int socketAddressLen);

 internal static Error Bind(
 SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress)
 => Bind(socket, socketProtocolType, socketAddress, socketAddress.Length);
 }
}

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASocketW.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System;
using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

internal static partial class Interop
{
Expand All@@ -15,7 +12,7 @@ internal static partial class Winsock
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
 internal static partial IntPtr WSASocketW(
 AddressFamily addressFamily,
SocketType socketType,
int socketType,
 int protocolType,
 IntPtr protocolInfo,
 int group,
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Net.Sockets;

Expand All@@ -9,9 +10,13 @@ internal static partial class Interop
 internal static partial class Winsock
 {
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true)]
internal static partial SocketError bind(
private static partial SocketError bind(
 SafeSocketHandle socketHandle,
 byte[] socketAddress,
ReadOnlySpan<byte> socketAddress,
 int socketAddressSize);

 internal static SocketError bind(
 SafeSocketHandle socketHandle,
 ReadOnlySpan<byte> socketAddress) => bind(socketHandle, socketAddress, socketAddress.Length);
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static IPAddress GetIPAddress(ReadOnlySpan<byte> socketAddressBuffer)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/Internals/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static Internals.SocketAddress Serialize(EndPoint endpoint)
 {
Expand Down

50 changes: 25 additions & 25 deletions
src/libraries/Common/src/System/Net/SocketAddress.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ class SocketAddress : System.IEquatable<SocketAddress>
 internal static readonly int MaxAddressSize = SocketAddressPal.MaxAddressSize;
#pragma warning restore CA1802

internal int InternalSize;
internal byte[] InternalBuffer;
private int _size;
private byte[] _buffer;

 private const int MinSize = 2;
 private const int DataOffset = 2;
Expand All@@ -39,21 +39,21 @@ public AddressFamily Family
 {
 get
 {
 return SocketAddressPal.GetAddressFamily(InternalBuffer);
 return SocketAddressPal.GetAddressFamily(_buffer);
 }
 }

 public int Size
 {
 get
 {
 return InternalSize;
 return _size;
 }
 set
 {
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, InternalBuffer.Length);
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, _buffer.Length);
 ArgumentOutOfRangeException.ThrowIfLessThan(value, MinSize);
InternalSize = value;
_size = value;
 }
 }

Expand All@@ -69,15 +69,15 @@ public byte this[int offset]
 {
 throw new IndexOutOfRangeException();
 }
 return InternalBuffer[offset];
 return _buffer[offset];
 }
 set
 {
 if ((uint)offset >= (uint)Size)
 {
 throw new IndexOutOfRangeException();
 }
InternalBuffer[offset] = value;
_buffer[offset] = value;
 }
 }

Expand All@@ -97,11 +97,11 @@ public SocketAddress(AddressFamily family, int size)
 {
 ArgumentOutOfRangeException.ThrowIfLessThan(size, MinSize);

InternalSize = size;
InternalBuffer = new byte[size];
InternalBuffer[0] = (byte)InternalSize;
_size = size;
_buffer = new byte[size];
_buffer[0] = (byte)_size;

 SocketAddressPal.SetAddressFamily(InternalBuffer, family);
 SocketAddressPal.SetAddressFamily(_buffer, family);
 }

 internal SocketAddress(IPAddress ipAddress)
Expand All@@ -110,15 +110,15 @@ internal SocketAddress(IPAddress ipAddress)
 {

 // No Port.
 SocketAddressPal.SetPort(InternalBuffer, 0);
 SocketAddressPal.SetPort(_buffer, 0);

 if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
 {
 Span<byte> addressBytes = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 ipAddress.TryWriteBytes(addressBytes, out int bytesWritten);
 Debug.Assert(bytesWritten == IPAddressParserStatics.IPv6AddressBytes);

 SocketAddressPal.SetIPv6Address(InternalBuffer, addressBytes, (uint)ipAddress.ScopeId);
 SocketAddressPal.SetIPv6Address(_buffer, addressBytes, (uint)ipAddress.ScopeId);
 }
 else
 {
Expand All@@ -127,21 +127,21 @@ internal SocketAddress(IPAddress ipAddress)
#pragma warning restore CS0618

 Debug.Assert(ipAddress.AddressFamily == AddressFamily.InterNetwork);
 SocketAddressPal.SetIPv4Address(InternalBuffer, address);
 SocketAddressPal.SetIPv4Address(_buffer, address);
 }
 }

 internal SocketAddress(IPAddress ipaddress, int port)
 : this(ipaddress)
 {
 SocketAddressPal.SetPort(InternalBuffer, unchecked((ushort)port));
 SocketAddressPal.SetPort(_buffer, unchecked((ushort)port));
 }

 internal SocketAddress(AddressFamily addressFamily, ReadOnlySpan<byte> buffer)
 {
InternalBuffer = buffer.ToArray();
InternalSize = InternalBuffer.Length;
 SocketAddressPal.SetAddressFamily(InternalBuffer, addressFamily);
_buffer = buffer.ToArray();
_size = _buffer.Length;
 SocketAddressPal.SetAddressFamily(_buffer, addressFamily);
 }

 /// <summary>This represents underlying memory that can be passed to native OS calls.</summary>
Expand All@@ -152,7 +152,7 @@ public Memory<byte> Buffer
 {
 get
 {
 return new Memory<byte>(InternalBuffer, 0, InternalSize);
 return new Memory<byte>(_buffer, 0, _size);
 }
 }

Expand All@@ -164,14 +164,14 @@ internal IPAddress GetIPAddress()

 Span<byte> address = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 uint scope;
 SocketAddressPal.GetIPv6Address(InternalBuffer, address, out scope);
 SocketAddressPal.GetIPv6Address(_buffer, address, out scope);

 return new IPAddress(address, (long)scope);
 }
 else if (Family == AddressFamily.InterNetwork)
 {
 Debug.Assert(Size >= IPv4AddressSize);
 long address = (long)SocketAddressPal.GetIPv4Address(InternalBuffer) & 0x0FFFFFFFF;
 long address = (long)SocketAddressPal.GetIPv4Address(_buffer) & 0x0FFFFFFFF;
 return new IPAddress(address);
 }
 else
Expand All@@ -184,7 +184,7 @@ internal IPAddress GetIPAddress()
 }
 }

 internal int GetPort() => (int)SocketAddressPal.GetPort(InternalBuffer);
 internal int GetPort() => (int)SocketAddressPal.GetPort(_buffer);

 internal IPEndPoint GetIPEndPoint()
 {
Expand All@@ -199,7 +199,7 @@ public override bool Equals(object? comparand) =>
 public override int GetHashCode()
 {
 HashCode hash = default;
 hash.AddBytes(new ReadOnlySpan<byte>(InternalBuffer, 0, InternalSize));
 hash.AddBytes(new ReadOnlySpan<byte>(_buffer, 0, _size));
 return hash.ToHashCode();
 }

Expand DownExpand Up@@ -234,7 +234,7 @@ public override string ToString()
 result[length++] = ':';
 result[length++] = '{';

 byte[] buffer = InternalBuffer;
 byte[] buffer = _buffer;
 for (int i = DataOffset; i < Size; i++)
 {
 if (i > DataOffset)
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ namespace System.Net
{
 internal static partial class SocketProtocolSupportPal
 {
 private const int DgramSocketType = 2;
 private static unsafe bool IsSupported(AddressFamily af)
 {
 // Check for AF_UNIX on iOS/tvOS. The OS claims to support this, but returns EPERM on bind.
Expand Down

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,6 @@

using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

namespace System.Net
{
Expand All@@ -19,7 +16,7 @@ private static bool IsSupported(AddressFamily af)
 IntPtr socket = INVALID_SOCKET;
 try
 {
 socket = Interop.Winsock.WSASocketW(af, SocketType.Stream, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 socket = Interop.Winsock.WSASocketW(af, DgramSocketType, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 return
 socket != INVALID_SOCKET ||
 (SocketError)Marshal.GetLastPInvokeError() != SocketError.AddressFamilyNotSupported;
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ internal static partial class SocketProtocolSupportPal
 public static bool OSSupportsIPv4 { get; } = IsSupported(AddressFamily.InterNetwork);
 public static bool OSSupportsUnixDomainSockets { get; } = IsSupported(AddressFamily.Unix);

 private const int DgramSocketType = 2;

 private static bool IsIPv6Disabled()
 {
 // First check for the AppContext switch, giving it priority over the environment variable.
Expand Down

10 changes: 1 addition & 9 deletions
src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,8 @@
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolType.cs"
 Link="Common\System\Net\Sockets\ProtocolType.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
@stephentoubstephentoubAug 4, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We can do it later if you'd prefer, but these files should also move out of common into the appropriate library folder
@wfurtwfurtAug 4, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

yes, I was thinking about SocketAddress.cs as well once the changes are over. Probably separate PR with just moves/renames.
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 </ItemGroup>
Expand All@@ -37,9 +31,7 @@
 <!-- Debug only -->
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs"
 Link="Common\System\Net\DebugSafeHandle.cs" />
 <!-- System.Net.Internals -->
 <Compile Include="$(CommonPath)System\Net\Internals\IPAddressExtensions.cs"
 Link="Common\System\Net\Internals\IPAddressExtensions.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Windows" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Net.Internals;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Internals;
using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Text;
Expand Down

14 changes: 4 additions & 10 deletions
src/libraries/System.Net.Ping/src/System.Net.Ping.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,8 @@
 <Compile Include="$(CommonPath)System\Obsoletions.cs"
 Link="Common\System\Obsoletions.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
 </ItemGroup>
 <ItemGroup Condition="('$(TargetPlatformIdentifier)' != '' and '$(TargetPlatformIdentifier)' != 'windows')">
 <Compile Include="System\Net\NetworkInformation\IcmpV4MessageConstants.cs" />
Expand All@@ -40,8 +32,6 @@
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\RawSocketPermissions.cs"
 Link="Common\System\Net\RawSocketPermissions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs"
 Link="Common\System\Net\SocketAddressPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Unix.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\NetworkInformation\UnixCommandLinePing.cs"
Expand DownExpand Up@@ -72,6 +62,10 @@
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="System\Net\NetworkInformation\Ping.Windows.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
 Link="Common\System\Net\SocketAddressPal.Windows.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,8 @@
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandleMinusOneIsInvalid.cs"
 Link="Common\System\Net\DebugSafeHandleMinusOneIsInvalid.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
Comment thread
stephentoub marked this conversation as resolved.

 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
Expand Down

7 changes: 4 additions & 3 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,17 +71,18 @@ public Socket(SocketInformation socketInformation)
 IPEndPoint ep = new IPEndPoint(tempAddress, 0);

 Internals.SocketAddress socketAddress = IPEndPointExtensions.Serialize(ep);
 int size = socketAddress.Buffer.Length;
 unsafe
 {
 fixed (byte* bufferPtr = socketAddress.InternalBuffer)
 fixed (int* sizePtr = &socketAddress.InternalSize)
 fixed (byte* bufferPtr = socketAddress.Buffer.Span)
 {
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, sizePtr);
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, &size);
 }
 }

 if (errorCode == SocketError.Success)
 {
 socketAddress.Size = size;
 _rightEndPoint = ep.Create(socketAddress);
 }
 else if (errorCode == SocketError.InvalidArgument)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
use approved SocketAddress API instead of direct internal access#89841

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

wfurt
merged 4 commits into

from

Aug 4, 2023
 Merged


use approved SocketAddress API instead of direct internal access
#89841
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8831344

use approved SocketAddress API instead of internal access


wfurt Aug 2, 2023
7a9040d

feedback


wfurt Aug 3, 2023
aaec906

Merge branch 'main' of https://github.com/dotnet/runtime into sockAddr3


wfurt Aug 3, 2023
5c7bb15

cleanup


wfurt Aug 4, 2023

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: 5 additions & 1 deletion
src/libraries/Common/src/Interop/Unix/System.Native/Interop.Bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ internal static partial class Interop
 internal static partial class Sys
 {
 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_Bind")]
 internal static unsafe partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, byte* socketAddress, int socketAddressLen);
 private static partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress, int socketAddressLen);

 internal static Error Bind(
 SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress)
 => Bind(socket, socketProtocolType, socketAddress, socketAddress.Length);
 }
}

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASocketW.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System;
using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

internal static partial class Interop
{
Expand All@@ -15,7 +12,7 @@ internal static partial class Winsock
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
 internal static partial IntPtr WSASocketW(
 AddressFamily addressFamily,
SocketType socketType,
int socketType,
 int protocolType,
 IntPtr protocolInfo,
 int group,
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Net.Sockets;

Expand All@@ -9,9 +10,13 @@ internal static partial class Interop
 internal static partial class Winsock
 {
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true)]
internal static partial SocketError bind(
private static partial SocketError bind(
 SafeSocketHandle socketHandle,
 byte[] socketAddress,
ReadOnlySpan<byte> socketAddress,
 int socketAddressSize);

 internal static SocketError bind(
 SafeSocketHandle socketHandle,
 ReadOnlySpan<byte> socketAddress) => bind(socketHandle, socketAddress, socketAddress.Length);
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static IPAddress GetIPAddress(ReadOnlySpan<byte> socketAddressBuffer)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/Internals/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static Internals.SocketAddress Serialize(EndPoint endpoint)
 {
Expand Down

50 changes: 25 additions & 25 deletions
src/libraries/Common/src/System/Net/SocketAddress.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ class SocketAddress : System.IEquatable<SocketAddress>
 internal static readonly int MaxAddressSize = SocketAddressPal.MaxAddressSize;
#pragma warning restore CA1802

internal int InternalSize;
internal byte[] InternalBuffer;
private int _size;
private byte[] _buffer;

 private const int MinSize = 2;
 private const int DataOffset = 2;
Expand All@@ -39,21 +39,21 @@ public AddressFamily Family
 {
 get
 {
 return SocketAddressPal.GetAddressFamily(InternalBuffer);
 return SocketAddressPal.GetAddressFamily(_buffer);
 }
 }

 public int Size
 {
 get
 {
 return InternalSize;
 return _size;
 }
 set
 {
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, InternalBuffer.Length);
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, _buffer.Length);
 ArgumentOutOfRangeException.ThrowIfLessThan(value, MinSize);
InternalSize = value;
_size = value;
 }
 }

Expand All@@ -69,15 +69,15 @@ public byte this[int offset]
 {
 throw new IndexOutOfRangeException();
 }
 return InternalBuffer[offset];
 return _buffer[offset];
 }
 set
 {
 if ((uint)offset >= (uint)Size)
 {
 throw new IndexOutOfRangeException();
 }
InternalBuffer[offset] = value;
_buffer[offset] = value;
 }
 }

Expand All@@ -97,11 +97,11 @@ public SocketAddress(AddressFamily family, int size)
 {
 ArgumentOutOfRangeException.ThrowIfLessThan(size, MinSize);

InternalSize = size;
InternalBuffer = new byte[size];
InternalBuffer[0] = (byte)InternalSize;
_size = size;
_buffer = new byte[size];
_buffer[0] = (byte)_size;

 SocketAddressPal.SetAddressFamily(InternalBuffer, family);
 SocketAddressPal.SetAddressFamily(_buffer, family);
 }

 internal SocketAddress(IPAddress ipAddress)
Expand All@@ -110,15 +110,15 @@ internal SocketAddress(IPAddress ipAddress)
 {

 // No Port.
 SocketAddressPal.SetPort(InternalBuffer, 0);
 SocketAddressPal.SetPort(_buffer, 0);

 if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
 {
 Span<byte> addressBytes = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 ipAddress.TryWriteBytes(addressBytes, out int bytesWritten);
 Debug.Assert(bytesWritten == IPAddressParserStatics.IPv6AddressBytes);

 SocketAddressPal.SetIPv6Address(InternalBuffer, addressBytes, (uint)ipAddress.ScopeId);
 SocketAddressPal.SetIPv6Address(_buffer, addressBytes, (uint)ipAddress.ScopeId);
 }
 else
 {
Expand All@@ -127,21 +127,21 @@ internal SocketAddress(IPAddress ipAddress)
#pragma warning restore CS0618

 Debug.Assert(ipAddress.AddressFamily == AddressFamily.InterNetwork);
 SocketAddressPal.SetIPv4Address(InternalBuffer, address);
 SocketAddressPal.SetIPv4Address(_buffer, address);
 }
 }

 internal SocketAddress(IPAddress ipaddress, int port)
 : this(ipaddress)
 {
 SocketAddressPal.SetPort(InternalBuffer, unchecked((ushort)port));
 SocketAddressPal.SetPort(_buffer, unchecked((ushort)port));
 }

 internal SocketAddress(AddressFamily addressFamily, ReadOnlySpan<byte> buffer)
 {
InternalBuffer = buffer.ToArray();
InternalSize = InternalBuffer.Length;
 SocketAddressPal.SetAddressFamily(InternalBuffer, addressFamily);
_buffer = buffer.ToArray();
_size = _buffer.Length;
 SocketAddressPal.SetAddressFamily(_buffer, addressFamily);
 }

 /// <summary>This represents underlying memory that can be passed to native OS calls.</summary>
Expand All@@ -152,7 +152,7 @@ public Memory<byte> Buffer
 {
 get
 {
 return new Memory<byte>(InternalBuffer, 0, InternalSize);
 return new Memory<byte>(_buffer, 0, _size);
 }
 }

Expand All@@ -164,14 +164,14 @@ internal IPAddress GetIPAddress()

 Span<byte> address = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 uint scope;
 SocketAddressPal.GetIPv6Address(InternalBuffer, address, out scope);
 SocketAddressPal.GetIPv6Address(_buffer, address, out scope);

 return new IPAddress(address, (long)scope);
 }
 else if (Family == AddressFamily.InterNetwork)
 {
 Debug.Assert(Size >= IPv4AddressSize);
 long address = (long)SocketAddressPal.GetIPv4Address(InternalBuffer) & 0x0FFFFFFFF;
 long address = (long)SocketAddressPal.GetIPv4Address(_buffer) & 0x0FFFFFFFF;
 return new IPAddress(address);
 }
 else
Expand All@@ -184,7 +184,7 @@ internal IPAddress GetIPAddress()
 }
 }

 internal int GetPort() => (int)SocketAddressPal.GetPort(InternalBuffer);
 internal int GetPort() => (int)SocketAddressPal.GetPort(_buffer);

 internal IPEndPoint GetIPEndPoint()
 {
Expand All@@ -199,7 +199,7 @@ public override bool Equals(object? comparand) =>
 public override int GetHashCode()
 {
 HashCode hash = default;
 hash.AddBytes(new ReadOnlySpan<byte>(InternalBuffer, 0, InternalSize));
 hash.AddBytes(new ReadOnlySpan<byte>(_buffer, 0, _size));
 return hash.ToHashCode();
 }

Expand DownExpand Up@@ -234,7 +234,7 @@ public override string ToString()
 result[length++] = ':';
 result[length++] = '{';

 byte[] buffer = InternalBuffer;
 byte[] buffer = _buffer;
 for (int i = DataOffset; i < Size; i++)
 {
 if (i > DataOffset)
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ namespace System.Net
{
 internal static partial class SocketProtocolSupportPal
 {
 private const int DgramSocketType = 2;
 private static unsafe bool IsSupported(AddressFamily af)
 {
 // Check for AF_UNIX on iOS/tvOS. The OS claims to support this, but returns EPERM on bind.
Expand Down

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,6 @@

using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

namespace System.Net
{
Expand All@@ -19,7 +16,7 @@ private static bool IsSupported(AddressFamily af)
 IntPtr socket = INVALID_SOCKET;
 try
 {
 socket = Interop.Winsock.WSASocketW(af, SocketType.Stream, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 socket = Interop.Winsock.WSASocketW(af, DgramSocketType, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 return
 socket != INVALID_SOCKET ||
 (SocketError)Marshal.GetLastPInvokeError() != SocketError.AddressFamilyNotSupported;
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ internal static partial class SocketProtocolSupportPal
 public static bool OSSupportsIPv4 { get; } = IsSupported(AddressFamily.InterNetwork);
 public static bool OSSupportsUnixDomainSockets { get; } = IsSupported(AddressFamily.Unix);

 private const int DgramSocketType = 2;

 private static bool IsIPv6Disabled()
 {
 // First check for the AppContext switch, giving it priority over the environment variable.
Expand Down

10 changes: 1 addition & 9 deletions
src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,8 @@
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolType.cs"
 Link="Common\System\Net\Sockets\ProtocolType.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
@stephentoubstephentoubAug 4, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We can do it later if you'd prefer, but these files should also move out of common into the appropriate library folder
@wfurtwfurtAug 4, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

yes, I was thinking about SocketAddress.cs as well once the changes are over. Probably separate PR with just moves/renames.
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 </ItemGroup>
Expand All@@ -37,9 +31,7 @@
 <!-- Debug only -->
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs"
 Link="Common\System\Net\DebugSafeHandle.cs" />
 <!-- System.Net.Internals -->
 <Compile Include="$(CommonPath)System\Net\Internals\IPAddressExtensions.cs"
 Link="Common\System\Net\Internals\IPAddressExtensions.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Windows" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Net.Internals;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Internals;
using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Text;
Expand Down

14 changes: 4 additions & 10 deletions
src/libraries/System.Net.Ping/src/System.Net.Ping.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,8 @@
 <Compile Include="$(CommonPath)System\Obsoletions.cs"
 Link="Common\System\Obsoletions.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
 </ItemGroup>
 <ItemGroup Condition="('$(TargetPlatformIdentifier)' != '' and '$(TargetPlatformIdentifier)' != 'windows')">
 <Compile Include="System\Net\NetworkInformation\IcmpV4MessageConstants.cs" />
Expand All@@ -40,8 +32,6 @@
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\RawSocketPermissions.cs"
 Link="Common\System\Net\RawSocketPermissions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs"
 Link="Common\System\Net\SocketAddressPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Unix.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\NetworkInformation\UnixCommandLinePing.cs"
Expand DownExpand Up@@ -72,6 +62,10 @@
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="System\Net\NetworkInformation\Ping.Windows.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
 Link="Common\System\Net\SocketAddressPal.Windows.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,8 @@
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandleMinusOneIsInvalid.cs"
 Link="Common\System\Net\DebugSafeHandleMinusOneIsInvalid.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
Comment thread
stephentoub marked this conversation as resolved.

 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
Expand Down

7 changes: 4 additions & 3 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,17 +71,18 @@ public Socket(SocketInformation socketInformation)
 IPEndPoint ep = new IPEndPoint(tempAddress, 0);

 Internals.SocketAddress socketAddress = IPEndPointExtensions.Serialize(ep);
 int size = socketAddress.Buffer.Length;
 unsafe
 {
 fixed (byte* bufferPtr = socketAddress.InternalBuffer)
 fixed (int* sizePtr = &socketAddress.InternalSize)
 fixed (byte* bufferPtr = socketAddress.Buffer.Span)
 {
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, sizePtr);
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, &size);
 }
 }

 if (errorCode == SocketError.Success)
 {
 socketAddress.Size = size;
 _rightEndPoint = ep.Create(socketAddress);
 }
 else if (errorCode == SocketError.InvalidArgument)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
use approved SocketAddress API instead of direct internal access#89841

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

wfurt
merged 4 commits into

from

Aug 4, 2023
 Merged


use approved SocketAddress API instead of direct internal access
#89841
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8831344

use approved SocketAddress API instead of internal access


wfurt Aug 2, 2023
7a9040d

feedback


wfurt Aug 3, 2023
aaec906

Merge branch 'main' of https://github.com/dotnet/runtime into sockAddr3


wfurt Aug 3, 2023
5c7bb15

cleanup


wfurt Aug 4, 2023

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: 5 additions & 1 deletion
src/libraries/Common/src/Interop/Unix/System.Native/Interop.Bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ internal static partial class Interop
 internal static partial class Sys
 {
 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_Bind")]
 internal static unsafe partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, byte* socketAddress, int socketAddressLen);
 private static partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress, int socketAddressLen);

 internal static Error Bind(
 SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress)
 => Bind(socket, socketProtocolType, socketAddress, socketAddress.Length);
 }
}

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASocketW.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System;
using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

internal static partial class Interop
{
Expand All@@ -15,7 +12,7 @@ internal static partial class Winsock
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
 internal static partial IntPtr WSASocketW(
 AddressFamily addressFamily,
SocketType socketType,
int socketType,
 int protocolType,
 IntPtr protocolInfo,
 int group,
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Net.Sockets;

Expand All@@ -9,9 +10,13 @@ internal static partial class Interop
 internal static partial class Winsock
 {
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true)]
internal static partial SocketError bind(
private static partial SocketError bind(
 SafeSocketHandle socketHandle,
 byte[] socketAddress,
ReadOnlySpan<byte> socketAddress,
 int socketAddressSize);

 internal static SocketError bind(
 SafeSocketHandle socketHandle,
 ReadOnlySpan<byte> socketAddress) => bind(socketHandle, socketAddress, socketAddress.Length);
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static IPAddress GetIPAddress(ReadOnlySpan<byte> socketAddressBuffer)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/Internals/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static Internals.SocketAddress Serialize(EndPoint endpoint)
 {
Expand Down

50 changes: 25 additions & 25 deletions
src/libraries/Common/src/System/Net/SocketAddress.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ class SocketAddress : System.IEquatable<SocketAddress>
 internal static readonly int MaxAddressSize = SocketAddressPal.MaxAddressSize;
#pragma warning restore CA1802

internal int InternalSize;
internal byte[] InternalBuffer;
private int _size;
private byte[] _buffer;

 private const int MinSize = 2;
 private const int DataOffset = 2;
Expand All@@ -39,21 +39,21 @@ public AddressFamily Family
 {
 get
 {
 return SocketAddressPal.GetAddressFamily(InternalBuffer);
 return SocketAddressPal.GetAddressFamily(_buffer);
 }
 }

 public int Size
 {
 get
 {
 return InternalSize;
 return _size;
 }
 set
 {
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, InternalBuffer.Length);
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, _buffer.Length);
 ArgumentOutOfRangeException.ThrowIfLessThan(value, MinSize);
InternalSize = value;
_size = value;
 }
 }

Expand All@@ -69,15 +69,15 @@ public byte this[int offset]
 {
 throw new IndexOutOfRangeException();
 }
 return InternalBuffer[offset];
 return _buffer[offset];
 }
 set
 {
 if ((uint)offset >= (uint)Size)
 {
 throw new IndexOutOfRangeException();
 }
InternalBuffer[offset] = value;
_buffer[offset] = value;
 }
 }

Expand All@@ -97,11 +97,11 @@ public SocketAddress(AddressFamily family, int size)
 {
 ArgumentOutOfRangeException.ThrowIfLessThan(size, MinSize);

InternalSize = size;
InternalBuffer = new byte[size];
InternalBuffer[0] = (byte)InternalSize;
_size = size;
_buffer = new byte[size];
_buffer[0] = (byte)_size;

 SocketAddressPal.SetAddressFamily(InternalBuffer, family);
 SocketAddressPal.SetAddressFamily(_buffer, family);
 }

 internal SocketAddress(IPAddress ipAddress)
Expand All@@ -110,15 +110,15 @@ internal SocketAddress(IPAddress ipAddress)
 {

 // No Port.
 SocketAddressPal.SetPort(InternalBuffer, 0);
 SocketAddressPal.SetPort(_buffer, 0);

 if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
 {
 Span<byte> addressBytes = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 ipAddress.TryWriteBytes(addressBytes, out int bytesWritten);
 Debug.Assert(bytesWritten == IPAddressParserStatics.IPv6AddressBytes);

 SocketAddressPal.SetIPv6Address(InternalBuffer, addressBytes, (uint)ipAddress.ScopeId);
 SocketAddressPal.SetIPv6Address(_buffer, addressBytes, (uint)ipAddress.ScopeId);
 }
 else
 {
Expand All@@ -127,21 +127,21 @@ internal SocketAddress(IPAddress ipAddress)
#pragma warning restore CS0618

 Debug.Assert(ipAddress.AddressFamily == AddressFamily.InterNetwork);
 SocketAddressPal.SetIPv4Address(InternalBuffer, address);
 SocketAddressPal.SetIPv4Address(_buffer, address);
 }
 }

 internal SocketAddress(IPAddress ipaddress, int port)
 : this(ipaddress)
 {
 SocketAddressPal.SetPort(InternalBuffer, unchecked((ushort)port));
 SocketAddressPal.SetPort(_buffer, unchecked((ushort)port));
 }

 internal SocketAddress(AddressFamily addressFamily, ReadOnlySpan<byte> buffer)
 {
InternalBuffer = buffer.ToArray();
InternalSize = InternalBuffer.Length;
 SocketAddressPal.SetAddressFamily(InternalBuffer, addressFamily);
_buffer = buffer.ToArray();
_size = _buffer.Length;
 SocketAddressPal.SetAddressFamily(_buffer, addressFamily);
 }

 /// <summary>This represents underlying memory that can be passed to native OS calls.</summary>
Expand All@@ -152,7 +152,7 @@ public Memory<byte> Buffer
 {
 get
 {
 return new Memory<byte>(InternalBuffer, 0, InternalSize);
 return new Memory<byte>(_buffer, 0, _size);
 }
 }

Expand All@@ -164,14 +164,14 @@ internal IPAddress GetIPAddress()

 Span<byte> address = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 uint scope;
 SocketAddressPal.GetIPv6Address(InternalBuffer, address, out scope);
 SocketAddressPal.GetIPv6Address(_buffer, address, out scope);

 return new IPAddress(address, (long)scope);
 }
 else if (Family == AddressFamily.InterNetwork)
 {
 Debug.Assert(Size >= IPv4AddressSize);
 long address = (long)SocketAddressPal.GetIPv4Address(InternalBuffer) & 0x0FFFFFFFF;
 long address = (long)SocketAddressPal.GetIPv4Address(_buffer) & 0x0FFFFFFFF;
 return new IPAddress(address);
 }
 else
Expand All@@ -184,7 +184,7 @@ internal IPAddress GetIPAddress()
 }
 }

 internal int GetPort() => (int)SocketAddressPal.GetPort(InternalBuffer);
 internal int GetPort() => (int)SocketAddressPal.GetPort(_buffer);

 internal IPEndPoint GetIPEndPoint()
 {
Expand All@@ -199,7 +199,7 @@ public override bool Equals(object? comparand) =>
 public override int GetHashCode()
 {
 HashCode hash = default;
 hash.AddBytes(new ReadOnlySpan<byte>(InternalBuffer, 0, InternalSize));
 hash.AddBytes(new ReadOnlySpan<byte>(_buffer, 0, _size));
 return hash.ToHashCode();
 }

Expand DownExpand Up@@ -234,7 +234,7 @@ public override string ToString()
 result[length++] = ':';
 result[length++] = '{';

 byte[] buffer = InternalBuffer;
 byte[] buffer = _buffer;
 for (int i = DataOffset; i < Size; i++)
 {
 if (i > DataOffset)
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ namespace System.Net
{
 internal static partial class SocketProtocolSupportPal
 {
 private const int DgramSocketType = 2;
 private static unsafe bool IsSupported(AddressFamily af)
 {
 // Check for AF_UNIX on iOS/tvOS. The OS claims to support this, but returns EPERM on bind.
Expand Down

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,6 @@

using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

namespace System.Net
{
Expand All@@ -19,7 +16,7 @@ private static bool IsSupported(AddressFamily af)
 IntPtr socket = INVALID_SOCKET;
 try
 {
 socket = Interop.Winsock.WSASocketW(af, SocketType.Stream, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 socket = Interop.Winsock.WSASocketW(af, DgramSocketType, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 return
 socket != INVALID_SOCKET ||
 (SocketError)Marshal.GetLastPInvokeError() != SocketError.AddressFamilyNotSupported;
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ internal static partial class SocketProtocolSupportPal
 public static bool OSSupportsIPv4 { get; } = IsSupported(AddressFamily.InterNetwork);
 public static bool OSSupportsUnixDomainSockets { get; } = IsSupported(AddressFamily.Unix);

 private const int DgramSocketType = 2;

 private static bool IsIPv6Disabled()
 {
 // First check for the AppContext switch, giving it priority over the environment variable.
Expand Down

10 changes: 1 addition & 9 deletions
src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,8 @@
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolType.cs"
 Link="Common\System\Net\Sockets\ProtocolType.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
@stephentoubstephentoubAug 4, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We can do it later if you'd prefer, but these files should also move out of common into the appropriate library folder
@wfurtwfurtAug 4, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

yes, I was thinking about SocketAddress.cs as well once the changes are over. Probably separate PR with just moves/renames.
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 </ItemGroup>
Expand All@@ -37,9 +31,7 @@
 <!-- Debug only -->
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs"
 Link="Common\System\Net\DebugSafeHandle.cs" />
 <!-- System.Net.Internals -->
 <Compile Include="$(CommonPath)System\Net\Internals\IPAddressExtensions.cs"
 Link="Common\System\Net\Internals\IPAddressExtensions.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Windows" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Net.Internals;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Internals;
using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Text;
Expand Down

14 changes: 4 additions & 10 deletions
src/libraries/System.Net.Ping/src/System.Net.Ping.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,8 @@
 <Compile Include="$(CommonPath)System\Obsoletions.cs"
 Link="Common\System\Obsoletions.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
 </ItemGroup>
 <ItemGroup Condition="('$(TargetPlatformIdentifier)' != '' and '$(TargetPlatformIdentifier)' != 'windows')">
 <Compile Include="System\Net\NetworkInformation\IcmpV4MessageConstants.cs" />
Expand All@@ -40,8 +32,6 @@
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\RawSocketPermissions.cs"
 Link="Common\System\Net\RawSocketPermissions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs"
 Link="Common\System\Net\SocketAddressPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Unix.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\NetworkInformation\UnixCommandLinePing.cs"
Expand DownExpand Up@@ -72,6 +62,10 @@
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="System\Net\NetworkInformation\Ping.Windows.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
 Link="Common\System\Net\SocketAddressPal.Windows.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,8 @@
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandleMinusOneIsInvalid.cs"
 Link="Common\System\Net\DebugSafeHandleMinusOneIsInvalid.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
Comment thread
stephentoub marked this conversation as resolved.

 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
Expand Down

7 changes: 4 additions & 3 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,17 +71,18 @@ public Socket(SocketInformation socketInformation)
 IPEndPoint ep = new IPEndPoint(tempAddress, 0);

 Internals.SocketAddress socketAddress = IPEndPointExtensions.Serialize(ep);
 int size = socketAddress.Buffer.Length;
 unsafe
 {
 fixed (byte* bufferPtr = socketAddress.InternalBuffer)
 fixed (int* sizePtr = &socketAddress.InternalSize)
 fixed (byte* bufferPtr = socketAddress.Buffer.Span)
 {
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, sizePtr);
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, &size);
 }
 }

 if (errorCode == SocketError.Success)
 {
 socketAddress.Size = size;
 _rightEndPoint = ep.Create(socketAddress);
 }
 else if (errorCode == SocketError.InvalidArgument)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
use approved SocketAddress API instead of direct internal access#89841

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

wfurt
merged 4 commits into

from

Aug 4, 2023
 Merged


use approved SocketAddress API instead of direct internal access
#89841
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
8831344

use approved SocketAddress API instead of internal access


wfurt Aug 2, 2023
7a9040d

feedback


wfurt Aug 3, 2023
aaec906

Merge branch 'main' of https://github.com/dotnet/runtime into sockAddr3


wfurt Aug 3, 2023
5c7bb15

cleanup


wfurt Aug 4, 2023

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: 5 additions & 1 deletion
src/libraries/Common/src/Interop/Unix/System.Native/Interop.Bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,10 @@ internal static partial class Interop
 internal static partial class Sys
 {
 [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_Bind")]
 internal static unsafe partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, byte* socketAddress, int socketAddressLen);
 private static partial Error Bind(SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress, int socketAddressLen);

 internal static Error Bind(
 SafeHandle socket, ProtocolType socketProtocolType, ReadOnlySpan<byte> socketAddress)
 => Bind(socket, socketProtocolType, socketAddress, socketAddress.Length);
 }
}

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.WSASocketW.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,9 +4,6 @@
using System;
using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

internal static partial class Interop
{
Expand All@@ -15,7 +12,7 @@ internal static partial class Winsock
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
 internal static partial IntPtr WSASocketW(
 AddressFamily addressFamily,
SocketType socketType,
int socketType,
 int protocolType,
 IntPtr protocolInfo,
 int group,
Expand Down

9 changes: 7 additions & 2 deletions
src/libraries/Common/src/Interop/Windows/WinSock/Interop.bind.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Runtime.InteropServices;
using System.Net.Sockets;

Expand All@@ -9,9 +10,13 @@ internal static partial class Interop
 internal static partial class Winsock
 {
 [LibraryImport(Interop.Libraries.Ws2_32, SetLastError = true)]
internal static partial SocketError bind(
private static partial SocketError bind(
 SafeSocketHandle socketHandle,
 byte[] socketAddress,
ReadOnlySpan<byte> socketAddress,
 int socketAddressSize);

 internal static SocketError bind(
 SafeSocketHandle socketHandle,
 ReadOnlySpan<byte> socketAddress) => bind(socketHandle, socketAddress, socketAddress.Length);
 }
}

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static IPAddress GetIPAddress(ReadOnlySpan<byte> socketAddressBuffer)
 {
Expand Down

2 changes: 1 addition & 1 deletion
src/libraries/Common/src/System/Net/Internals/IPEndPointExtensions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@

namespace System.Net.Sockets
{
 internal static class IPEndPointExtensions
 internal static partial class IPEndPointExtensions
 {
 public static Internals.SocketAddress Serialize(EndPoint endpoint)
 {
Expand Down

50 changes: 25 additions & 25 deletions
src/libraries/Common/src/System/Net/SocketAddress.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,8 +29,8 @@ class SocketAddress : System.IEquatable<SocketAddress>
 internal static readonly int MaxAddressSize = SocketAddressPal.MaxAddressSize;
#pragma warning restore CA1802

internal int InternalSize;
internal byte[] InternalBuffer;
private int _size;
private byte[] _buffer;

 private const int MinSize = 2;
 private const int DataOffset = 2;
Expand All@@ -39,21 +39,21 @@ public AddressFamily Family
 {
 get
 {
 return SocketAddressPal.GetAddressFamily(InternalBuffer);
 return SocketAddressPal.GetAddressFamily(_buffer);
 }
 }

 public int Size
 {
 get
 {
 return InternalSize;
 return _size;
 }
 set
 {
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, InternalBuffer.Length);
 ArgumentOutOfRangeException.ThrowIfGreaterThan(value, _buffer.Length);
 ArgumentOutOfRangeException.ThrowIfLessThan(value, MinSize);
InternalSize = value;
_size = value;
 }
 }

Expand All@@ -69,15 +69,15 @@ public byte this[int offset]
 {
 throw new IndexOutOfRangeException();
 }
 return InternalBuffer[offset];
 return _buffer[offset];
 }
 set
 {
 if ((uint)offset >= (uint)Size)
 {
 throw new IndexOutOfRangeException();
 }
InternalBuffer[offset] = value;
_buffer[offset] = value;
 }
 }

Expand All@@ -97,11 +97,11 @@ public SocketAddress(AddressFamily family, int size)
 {
 ArgumentOutOfRangeException.ThrowIfLessThan(size, MinSize);

InternalSize = size;
InternalBuffer = new byte[size];
InternalBuffer[0] = (byte)InternalSize;
_size = size;
_buffer = new byte[size];
_buffer[0] = (byte)_size;

 SocketAddressPal.SetAddressFamily(InternalBuffer, family);
 SocketAddressPal.SetAddressFamily(_buffer, family);
 }

 internal SocketAddress(IPAddress ipAddress)
Expand All@@ -110,15 +110,15 @@ internal SocketAddress(IPAddress ipAddress)
 {

 // No Port.
 SocketAddressPal.SetPort(InternalBuffer, 0);
 SocketAddressPal.SetPort(_buffer, 0);

 if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
 {
 Span<byte> addressBytes = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 ipAddress.TryWriteBytes(addressBytes, out int bytesWritten);
 Debug.Assert(bytesWritten == IPAddressParserStatics.IPv6AddressBytes);

 SocketAddressPal.SetIPv6Address(InternalBuffer, addressBytes, (uint)ipAddress.ScopeId);
 SocketAddressPal.SetIPv6Address(_buffer, addressBytes, (uint)ipAddress.ScopeId);
 }
 else
 {
Expand All@@ -127,21 +127,21 @@ internal SocketAddress(IPAddress ipAddress)
#pragma warning restore CS0618

 Debug.Assert(ipAddress.AddressFamily == AddressFamily.InterNetwork);
 SocketAddressPal.SetIPv4Address(InternalBuffer, address);
 SocketAddressPal.SetIPv4Address(_buffer, address);
 }
 }

 internal SocketAddress(IPAddress ipaddress, int port)
 : this(ipaddress)
 {
 SocketAddressPal.SetPort(InternalBuffer, unchecked((ushort)port));
 SocketAddressPal.SetPort(_buffer, unchecked((ushort)port));
 }

 internal SocketAddress(AddressFamily addressFamily, ReadOnlySpan<byte> buffer)
 {
InternalBuffer = buffer.ToArray();
InternalSize = InternalBuffer.Length;
 SocketAddressPal.SetAddressFamily(InternalBuffer, addressFamily);
_buffer = buffer.ToArray();
_size = _buffer.Length;
 SocketAddressPal.SetAddressFamily(_buffer, addressFamily);
 }

 /// <summary>This represents underlying memory that can be passed to native OS calls.</summary>
Expand All@@ -152,7 +152,7 @@ public Memory<byte> Buffer
 {
 get
 {
 return new Memory<byte>(InternalBuffer, 0, InternalSize);
 return new Memory<byte>(_buffer, 0, _size);
 }
 }

Expand All@@ -164,14 +164,14 @@ internal IPAddress GetIPAddress()

 Span<byte> address = stackalloc byte[IPAddressParserStatics.IPv6AddressBytes];
 uint scope;
 SocketAddressPal.GetIPv6Address(InternalBuffer, address, out scope);
 SocketAddressPal.GetIPv6Address(_buffer, address, out scope);

 return new IPAddress(address, (long)scope);
 }
 else if (Family == AddressFamily.InterNetwork)
 {
 Debug.Assert(Size >= IPv4AddressSize);
 long address = (long)SocketAddressPal.GetIPv4Address(InternalBuffer) & 0x0FFFFFFFF;
 long address = (long)SocketAddressPal.GetIPv4Address(_buffer) & 0x0FFFFFFFF;
 return new IPAddress(address);
 }
 else
Expand All@@ -184,7 +184,7 @@ internal IPAddress GetIPAddress()
 }
 }

 internal int GetPort() => (int)SocketAddressPal.GetPort(InternalBuffer);
 internal int GetPort() => (int)SocketAddressPal.GetPort(_buffer);

 internal IPEndPoint GetIPEndPoint()
 {
Expand All@@ -199,7 +199,7 @@ public override bool Equals(object? comparand) =>
 public override int GetHashCode()
 {
 HashCode hash = default;
 hash.AddBytes(new ReadOnlySpan<byte>(InternalBuffer, 0, InternalSize));
 hash.AddBytes(new ReadOnlySpan<byte>(_buffer, 0, _size));
 return hash.ToHashCode();
 }

Expand DownExpand Up@@ -234,7 +234,7 @@ public override string ToString()
 result[length++] = ':';
 result[length++] = '{';

 byte[] buffer = InternalBuffer;
 byte[] buffer = _buffer;
 for (int i = DataOffset; i < Size; i++)
 {
 if (i > DataOffset)
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,6 @@ namespace System.Net
{
 internal static partial class SocketProtocolSupportPal
 {
 private const int DgramSocketType = 2;
 private static unsafe bool IsSupported(AddressFamily af)
 {
 // Check for AF_UNIX on iOS/tvOS. The OS claims to support this, but returns EPERM on bind.
Expand Down

5 changes: 1 addition & 4 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,6 @@

using System.Net.Sockets;
using System.Runtime.InteropServices;
#if !SYSTEM_NET_SOCKETS_DLL
using SocketType = System.Net.Internals.SocketType;
#endif

namespace System.Net
{
Expand All@@ -19,7 +16,7 @@ private static bool IsSupported(AddressFamily af)
 IntPtr socket = INVALID_SOCKET;
 try
 {
 socket = Interop.Winsock.WSASocketW(af, SocketType.Stream, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 socket = Interop.Winsock.WSASocketW(af, DgramSocketType, 0, IntPtr.Zero, 0, (int)Interop.Winsock.SocketConstructorFlags.WSA_FLAG_NO_HANDLE_INHERIT);
 return
 socket != INVALID_SOCKET ||
 (SocketError)Marshal.GetLastPInvokeError() != SocketError.AddressFamilyNotSupported;
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/Common/src/System/Net/SocketProtocolSupportPal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,8 @@ internal static partial class SocketProtocolSupportPal
 public static bool OSSupportsIPv4 { get; } = IsSupported(AddressFamily.InterNetwork);
 public static bool OSSupportsUnixDomainSockets { get; } = IsSupported(AddressFamily.Unix);

 private const int DgramSocketType = 2;

 private static bool IsIPv6Disabled()
 {
 // First check for the AppContext switch, giving it priority over the environment variable.
Expand Down

10 changes: 1 addition & 9 deletions
src/libraries/System.Net.NameResolution/src/System.Net.NameResolution.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,14 +21,8 @@
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\Sockets\ProtocolType.cs"
 Link="Common\System\Net\Sockets\ProtocolType.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
@stephentoubstephentoubAug 4, 2023

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

We can do it later if you'd prefer, but these files should also move out of common into the appropriate library folder
@wfurtwfurtAug 4, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

yes, I was thinking about SocketAddress.cs as well once the changes are over. Probably separate PR with just moves/renames.
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 </ItemGroup>
Expand All@@ -37,9 +31,7 @@
 <!-- Debug only -->
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandle.cs"
 Link="Common\System\Net\DebugSafeHandle.cs" />
 <!-- System.Net.Internals -->
 <Compile Include="$(CommonPath)System\Net\Internals\IPAddressExtensions.cs"
 Link="Common\System\Net\Internals\IPAddressExtensions.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Windows" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,6 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.Net.Internals;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
Expand Down

1 change: 0 additions & 1 deletion
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

using System.Collections.Generic;
using System.Diagnostics;
using System.Net.Internals;
using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Text;
Expand Down

14 changes: 4 additions & 10 deletions
src/libraries/System.Net.Ping/src/System.Net.Ping.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,16 +22,8 @@
 <Compile Include="$(CommonPath)System\Obsoletions.cs"
 Link="Common\System\Obsoletions.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.cs" />
 <Compile Include="$(CommonPath)System\Net\InternalException.cs"
 Link="Common\System\Net\InternalException.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\Sockets\SocketType.cs"
 Link="Common\System\Net\Sockets\SocketType.cs" />
 </ItemGroup>
 <ItemGroup Condition="('$(TargetPlatformIdentifier)' != '' and '$(TargetPlatformIdentifier)' != 'windows')">
 <Compile Include="System\Net\NetworkInformation\IcmpV4MessageConstants.cs" />
Expand All@@ -40,8 +32,6 @@
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\RawSocketPermissions.cs"
 Link="Common\System\Net\RawSocketPermissions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Unix.cs"
 Link="Common\System\Net\SocketAddressPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Unix.cs"
 Link="Common\System\Net\SocketProtocolSupportPal.Unix.cs" />
 <Compile Include="$(CommonPath)System\Net\NetworkInformation\UnixCommandLinePing.cs"
Expand DownExpand Up@@ -72,6 +62,10 @@
 <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">
 <Compile Include="System\Net\NetworkInformation\Ping.Windows.cs" />
 <!-- System.Net Common -->
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
 Link="Common\System\Net\IPAddressParserStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketAddressPal.Windows.cs"
 Link="Common\System\Net\SocketAddressPal.Windows.cs" />
 <Compile Include="$(CommonPath)System\Net\SocketProtocolSupportPal.Windows.cs"
Expand Down

2 changes: 2 additions & 0 deletions
src/libraries/System.Net.Sockets/src/System.Net.Sockets.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,8 @@
 <Compile Include="$(CommonPath)System\Net\DebugSafeHandleMinusOneIsInvalid.cs"
 Link="Common\System\Net\DebugSafeHandleMinusOneIsInvalid.cs" />
 <!-- System.Net common -->
 <Compile Include="$(CommonPath)System\Net\IPEndPointExtensions.cs"
Comment thread
stephentoub marked this conversation as resolved.

 Link="Common\System\Net\IPEndPointExtensions.cs" />
 <Compile Include="$(CommonPath)System\Net\IPEndPointStatics.cs"
 Link="Common\System\Net\IPEndPointStatics.cs" />
 <Compile Include="$(CommonPath)System\Net\IPAddressParserStatics.cs"
Expand Down

7 changes: 4 additions & 3 deletions
src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.Windows.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,17 +71,18 @@ public Socket(SocketInformation socketInformation)
 IPEndPoint ep = new IPEndPoint(tempAddress, 0);

 Internals.SocketAddress socketAddress = IPEndPointExtensions.Serialize(ep);
 int size = socketAddress.Buffer.Length;
 unsafe
 {
 fixed (byte* bufferPtr = socketAddress.InternalBuffer)
 fixed (int* sizePtr = &socketAddress.InternalSize)
 fixed (byte* bufferPtr = socketAddress.Buffer.Span)
 {
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, sizePtr);
 errorCode = SocketPal.GetSockName(_handle, bufferPtr, &size);
 }
 }

 if (errorCode == SocketError.Success)
 {
 socketAddress.Size = size;
 _rightEndPoint = ep.Create(socketAddress);
 }
 else if (errorCode == SocketError.InvalidArgument)
Expand Down
Loading