[PATCH 0/3] MR8994: Iphlpapi, nsiproxy: Implement GetBestRoute2() and GetBestInterfaceEx() part 1.

[Paul Gofman (＠gofman)]

Split off from https://gitlab.winehq.org/wine/wine/-/merge_requests/8991

[PATCH 1/3] nsiproxy.sys: Only enumerate active routes in ipv6_forward_enumerate_all() on Linux.

[Paul Gofman]

From: Paul Gofman

---
 dlls/nsiproxy.sys/ip.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c
index 6d285dcfaca..388a819d5e9 100644
--- a/dlls/nsiproxy.sys/ip.c
+++ b/dlls/nsiproxy.sys/ip.c
@@ -1818,6 +1818,7 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void
             strtoul( ptr + 1, &ptr, 16 ); /* refcount, skip */
             strtoul( ptr + 1, &ptr, 16 ); /* use, skip */
             rtf_flags = strtoul( ptr + 1, &ptr, 16);
+            if (!(rtf_flags & RTF_UP)) continue;
             entry.protocol = (rtf_flags & RTF_GATEWAY) ? MIB_IPPROTO_NETMGMT : MIB_IPPROTO_LOCAL;
             entry.loopback = entry.protocol == MIB_IPPROTO_LOCAL && entry.prefix_len == 32;

[PATCH 2/3] nsiproxy.sys: Improve loopback detection in ipv6_forward_enumerate_all() on Linux.

[Paul Gofman]

From: Paul Gofman

---
 dlls/nsiproxy.sys/ip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/nsiproxy.sys/ip.c b/dlls/nsiproxy.sys/ip.c
index 388a819d5e9..3e24ba44c56 100644
--- a/dlls/nsiproxy.sys/ip.c
+++ b/dlls/nsiproxy.sys/ip.c
@@ -1820,7 +1820,7 @@ static NTSTATUS ipv6_forward_enumerate_all( void *key_data, UINT key_size, void
             rtf_flags = strtoul( ptr + 1, &ptr, 16);
             if (!(rtf_flags & RTF_UP)) continue;
             entry.protocol = (rtf_flags & RTF_GATEWAY) ? MIB_IPPROTO_NETMGMT : MIB_IPPROTO_LOCAL;
-            entry.loopback = entry.protocol == MIB_IPPROTO_LOCAL && entry.prefix_len == 32;
+            entry.loopback = entry.prefix_len == 128 && IN6_IS_ADDR_LOOPBACK(&entry.prefix);

while (isspace( *ptr )) ptr++;
             end = ptr;

[PATCH 3/3] iphlpapi: Fully zero init address in unicast_row_fill().

[Paul Gofman]

From: Paul Gofman

---
 dlls/iphlpapi/iphlpapi_main.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 0abf8c55299..1231b98e656 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -3654,19 +3654,16 @@ static void unicast_row_fill( MIB_UNICASTIPADDRESS_ROW *row, USHORT fam, void *k
     struct nsi_ipv4_unicast_key *key4 = (struct nsi_ipv4_unicast_key *)key;
     struct nsi_ipv6_unicast_key *key6 = (struct nsi_ipv6_unicast_key *)key;

+    memset( &row->Address, 0, sizeof(row->Address) );
     if (fam == AF_INET)
     {
         row->Address.Ipv4.sin_family = fam;
-        row->Address.Ipv4.sin_port = 0;
         row->Address.Ipv4.sin_addr = key4->addr;
-        memset( row->Address.Ipv4.sin_zero, 0, sizeof(row->Address.Ipv4.sin_zero) );
         row->InterfaceLuid.Value = key4->luid.Value;
     }
     else
     {
         row->Address.Ipv6.sin6_family = fam;
-        row->Address.Ipv6.sin6_port = 0;
-        row->Address.Ipv6.sin6_flowinfo = 0;
         row->Address.Ipv6.sin6_addr = key6->addr;
         row->Address.Ipv6.sin6_scope_id = dyn->scope_id;
         row->InterfaceLuid.Value = key6->luid.Value;

[PATCH 0/3] MR8994: Iphlpapi, nsiproxy: Implement GetBestRoute2() and GetBestInterfaceEx() part 1. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.