PR feedback

Author: gfoidl

src/libraries/Native/Unix/System.Native/pal_networking.c

@@ -344,8 +344,7 @@ static int32_t GetHostEntries(const uint8_t* address, struct addrinfo* info, Hos
         }
     }
 #else
-    // Actually not needed, but to use the parameter in case of HAVE_GETIFADDRS expands to 0.
-    address = NULL;
+    (void)address;
 #endif
 
     if (entry->IPAddressCount > 0)
@@ -425,7 +424,6 @@ static int32_t GetHostEntries(const uint8_t* address, struct addrinfo* info, Hos
 #if HAVE_GETADDRINFO_A
 struct GetAddrInfoAsyncState
 {
-    struct addrinfo hint;
     struct gaicb gai_request;
     struct gaicb* gai_requests;
     struct sigevent sigevent;
@@ -443,59 +441,43 @@ static void GetHostEntryForNameAsyncComplete(sigval_t context)
 
     GetHostEntryForNameCallback callback = state->callback;
 
-    int result = gai_error(&state->gai_request);
-    HostEntry* entry = state->entry;
+    int ret = ConvertGetAddrInfoAndGetNameInfoErrorsToPal(gai_error(&state->gai_request));
 
-    int ret = ConvertGetAddrInfoAndGetNameInfoErrorsToPal(result);
-
-    if (result == 0)
+    if (ret == 0)
     {
         const uint8_t* address = state->address;
         struct addrinfo* info = state->gai_request.ar_result;
 
-        ret = GetHostEntries(address, info, entry);
+        ret = GetHostEntries(address, info, state->entry);
     }
 
-    free(state);
-
     if (callback != NULL)
     {
-        callback(entry, ret);
+        callback(state->entry, ret);
     }
-}
-#endif
 
-static void GetHostEntryForNameCreateHint(struct addrinfo* hint)
-{
-    // Get all address families and the canonical name
-
-    memset(hint, 0, sizeof(struct addrinfo));
-    hint->ai_family = AF_UNSPEC;
-    hint->ai_flags = AI_CANONNAME;
+    free(state);
 }
+#endif
 
 int32_t SystemNative_PlatformSupportsGetAddrInfoAsync()
 {
-#if HAVE_GETADDRINFO_A
-    return 1;
-#else
-    return 0;
-#endif
+    return HAVE_GETADDRINFO_A;
 }
 
+// Get all address families and the canonical name
+static const struct addrinfo s_hostEntryForNameHints = {.ai_family = AF_UNSPEC, .ai_flags = AI_CANONNAME};
+
 int32_t SystemNative_GetHostEntryForName(const uint8_t* address, HostEntry* entry)
 {
     if (address == NULL || entry == NULL)
     {
         return GetAddrInfoErrorFlags_EAI_BADARG;
     }
 
-    struct addrinfo hint;
-    GetHostEntryForNameCreateHint(&hint);
-
     struct addrinfo* info = NULL;
 
-    int result = getaddrinfo((const char*)address, NULL, &hint, &info);
+    int result = getaddrinfo((const char*)address, NULL, &s_hostEntryForNameHints, &info);
     if (result != 0)
     {
         return ConvertGetAddrInfoAndGetNameInfoErrorsToPal(result);
@@ -512,22 +494,32 @@ int32_t SystemNative_GetHostEntryForNameAsync(const uint8_t* address, HostEntry*
         return GetAddrInfoErrorFlags_EAI_BADARG;
     }
 
-    struct GetAddrInfoAsyncState* state = malloc(sizeof(struct GetAddrInfoAsyncState));
-
-    GetHostEntryForNameCreateHint(&state->hint);
-    state->gai_request.ar_name = (const char*)address;
-    state->gai_request.ar_service = NULL;
-    state->gai_request.ar_request = &state->hint;
-    state->gai_request.ar_result = NULL;
-    state->gai_requests = &state->gai_request;
+    struct GetAddrInfoAsyncState* state = malloc(sizeof(*state));
 
-    state->sigevent.sigev_notify = SIGEV_THREAD;
-    state->sigevent.sigev_value.sival_ptr = state;
-    state->sigevent.sigev_notify_function = GetHostEntryForNameAsyncComplete;
+    if (state == NULL)
+    {
+        return GetAddrInfoErrorFlags_EAI_MEMORY;
+    }
 
-    state->address = address;
-    state->entry = entry;
-    state->callback = callback;
+    *state = (struct GetAddrInfoAsyncState){
+        .gai_request = {
+            .ar_name = (const char*)address,
+            .ar_service = NULL,
+            .ar_request = &s_hostEntryForNameHints,
+            .ar_result = NULL
+        },
+        .gai_requests = &state->gai_request,
+        .sigevent = {
+            .sigev_notify = SIGEV_THREAD,
+            .sigev_value = {
+                .sival_ptr = state
+            },
+            .sigev_notify_function = GetHostEntryForNameAsyncComplete
+        },
+        .address = address,
+        .entry = entry,
+        .callback = callback
+    };
 
     atomic_thread_fence(memory_order_release);
 
@@ -541,11 +533,9 @@ int32_t SystemNative_GetHostEntryForNameAsync(const uint8_t* address, HostEntry*
 
     return result;
 #else
-    // Actually not needed, but otherwise the parameters are unused.
-    if (address != NULL && entry != NULL && callback != NULL)
-    {
-        return -1;
-    }
+    (void)address;
+    (void)entry;
+    (void)callback;
 
     // GetHostEntryForNameAsync is not supported on this platform.
     return -1;

src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Unix.cs

@@ -14,43 +14,11 @@ namespace System.Net
 {
     internal static partial class NameResolutionPal
     {
-        private static volatile bool s_initialized;
-        private static readonly object s_initializedLock = new object();
-
         private static readonly unsafe Interop.Sys.GetHostEntryForNameCallback s_getHostEntryForNameCallback = GetHostEntryForNameCallback;
-        private static bool s_platformSupportsGetAddrInfoAsync;
-
-        public static void EnsureSocketsAreInitialized()
-        {
-            // Actually a No-op for Unix as sockets don't need a startup, but used
-            // to check whether async address resolution is available or not.
 
-            if (!s_initialized)
-            {
-                Initialize();
-            }
+        public static bool SupportsGetAddrInfoAsync { get; } = Interop.Sys.PlatformSupportsGetAddrInfoAsync();
 
-            static void Initialize()
-            {
-                lock (s_initializedLock)
-                {
-                    if (!s_initialized)
-                    {
-                        s_platformSupportsGetAddrInfoAsync = Interop.Sys.PlatformSupportsGetAddrInfoAsync();
-                        s_initialized = true;
-                    }
-                }
-            }
-        }
-
-        public static bool SupportsGetAddrInfoAsync
-        {
-            get
-            {
-                EnsureSocketsAreInitialized();
-                return s_platformSupportsGetAddrInfoAsync;
-            }
-        }
+        public static void EnsureSocketsAreInitialized() { } // No-op for Unix
 
         public static unsafe SocketError TryGetAddrInfo(string name, bool justAddresses, out string? hostName, out string[] aliases, out IPAddress[] addresses, out int nativeErrorCode)
         {