Modified Dns.GetHostAddressesAsync to be truly async #26850
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| using System.Net.Internals; | ||
| using System.Runtime.InteropServices; | ||
|
|
||
| namespace System.Net.Sockets | ||
| { | ||
| [StructLayout(LayoutKind.Sequential)] | ||
| internal unsafe struct AddressInfoEx | ||
| { | ||
| internal AddressInfoHints ai_flags; | ||
| internal AddressFamily ai_family; | ||
| internal SocketType ai_socktype; | ||
| internal ProtocolFamily ai_protocol; | ||
| internal int ai_addrlen; | ||
| internal IntPtr ai_canonname; // Ptr to the canonical name - check for NULL | ||
| internal byte* ai_addr; // Ptr to the sockaddr structure | ||
| internal IntPtr ai_blob; // Unused ptr to blob data about provider | ||
| internal int ai_bloblen; | ||
| internal IntPtr ai_provider; // Unused ptr to the namespace provider guid | ||
| internal AddressInfoEx* ai_next; // Next structure in linked list | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| using System; | ||
|
|
||
| using System.Net.Sockets; | ||
| using System.Runtime.ConstrainedExecution; | ||
| using System.Runtime.InteropServices; | ||
| using System.Threading; | ||
|
|
||
| internal static partial class Interop | ||
| { | ||
| internal static partial class Winsock | ||
| { | ||
| internal unsafe delegate void GetAddrInfoExCompletionCallback([In] int error, [In] int bytes, [In] NativeOverlapped* overlapped); | ||
|
There was a problem hiding this comment. Nit: |
||
|
|
||
| [DllImport(Interop.Libraries.Ws2_32, ExactSpelling = true, CharSet = CharSet.Unicode, BestFitMapping = false, ThrowOnUnmappableChar = true, SetLastError = true)] | ||
|
There was a problem hiding this comment. Why the There was a problem hiding this comment. I copied theses properties from the getaddrinfo declaration without thinking. It doesn't make sense since the call is Unicode, I will remove ThrowOnUnmappableChar and BestFitMapping properties. |
||
| internal static extern unsafe int GetAddrInfoExW( | ||
| [In] string name, | ||
| [In] string serviceName, | ||
| [In] int namespaceId, | ||
| [In] IntPtr providerId, | ||
| [In] ref AddressInfoEx hints, | ||
|
There was a problem hiding this comment. Can this use There was a problem hiding this comment. The build is passing but Visual Studio is complaining with "Feature 'readonly references' is not available in C# 7.0. Please use language version 7.2 or greater." I suggest leaving 'ref', I don't think it would change anything for a p/invoke call anyway. |
||
| [Out] out AddressInfoEx* result, | ||
| [In] IntPtr timeout, | ||
| [In] ref NativeOverlapped overlapped, | ||
| [In] GetAddrInfoExCompletionCallback callback, | ||
| [Out] out IntPtr cancelHandle | ||
| ); | ||
|
There was a problem hiding this comment. Nit: We try to use the same names as in the native definition, so e.g. |
||
|
|
||
| [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] | ||
|
There was a problem hiding this comment. These ReliabilityContract attributes don't have a meaning in .NET Core and can be removed. |
||
| [DllImport("ws2_32.dll", ExactSpelling = true, SetLastError = true)] | ||
| internal static extern unsafe void FreeAddrInfoEx([In] AddressInfoEx* addressInfo); | ||
|
|
||
| [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] | ||
| [DllImport("ws2_32.dll", ExactSpelling = true, SetLastError = true)] | ||
| internal static extern int GetAddrInfoExCancel([In] ref IntPtr cancelHandle); | ||
|
|
||
| } | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| namespace System.Net | ||
|
|
||
| { | ||
| internal class DnsResolveAsyncResult : ContextAwareResult | ||
|
|
||
| { | ||
| // Forward lookup | ||
| internal DnsResolveAsyncResult(string hostName, object myObject, bool includeIPv6, object myState, AsyncCallback myCallBack) : | ||
| base(myObject, myState, myCallBack) | ||
| { | ||
| this.hostName = hostName; | ||
| this.includeIPv6 = includeIPv6; | ||
| } | ||
|
|
||
| // Reverse lookup | ||
| internal DnsResolveAsyncResult(IPAddress address, object myObject, bool includeIPv6, object myState, AsyncCallback myCallBack) : | ||
| base(myObject, myState, myCallBack) | ||
| { | ||
| this.includeIPv6 = includeIPv6; | ||
| this.address = address; | ||
|
There was a problem hiding this comment. Nit: the "this"es shouldn't be necessary |
||
| } | ||
|
|
||
| internal readonly string hostName; | ||
| internal bool includeIPv6; | ||
| internal IPAddress address; | ||
|
There was a problem hiding this comment. Nit: these should be prefixed with _ There was a problem hiding this comment. This was existing code moved from DNS.cs, but I will make the changes |
||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing license header
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done