Huw Davies : iphlpapi: Implement GetIpAddrTable() on top of nsi.
Alexandre Julliard
julliard at winehq.org
Thu Jul 22 16:28:19 CDT 2021
Module: wine
Branch: master
Commit: beb844448731a2413e3700877c237dc9f5968870
URL: https://source.winehq.org/git/wine.git/?a=commit;h=beb844448731a2413e3700877c237dc9f5968870
Author: Huw Davies <huw at codeweavers.com>
Date: Thu Jul 22 12:50:17 2021 +0100
iphlpapi: Implement GetIpAddrTable() on top of nsi.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/iphlpapi/iphlpapi_main.c | 103 ++++++++++++++++++++---------------------
dlls/iphlpapi/tests/iphlpapi.c | 2 +
2 files changed, 51 insertions(+), 54 deletions(-)
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 93d9b0440dd..8442bc2b4a9 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -148,19 +148,6 @@ static int IpAddrTableNumericSorter(const void *a, const void *b)
return ret;
}
-static int IpAddrTableLoopbackSorter(const void *a, const void *b)
-{
- const MIB_IPADDRROW *left = a, *right = b;
- int ret = 0;
-
- if (isIfIndexLoopback(left->dwIndex))
- ret = 1;
- else if (isIfIndexLoopback(right->dwIndex))
- ret = -1;
-
- return ret;
-}
-
/******************************************************************
* AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@)
*
@@ -2131,6 +2118,10 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size )
return ERROR_SUCCESS;
}
+static int ipaddrrow_cmp( const void *a, const void *b )
+{
+ return ((const MIB_IPADDRROW*)a)->dwAddr - ((const MIB_IPADDRROW*)b)->dwAddr;
+}
/******************************************************************
* GetIpAddrTable (IPHLPAPI.@)
@@ -2138,59 +2129,63 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size )
* Get interface-to-IP address mapping table.
*
* PARAMS
- * pIpAddrTable [Out] buffer for mapping table
- * pdwSize [In/Out] length of output buffer
- * bOrder [In] whether to sort the table
+ * table [Out] buffer for mapping table
+ * size [In/Out] length of output buffer
+ * sort [In] whether to sort the table
*
* RETURNS
* Success: NO_ERROR
* Failure: error code from winerror.h
*
- * NOTES
- * If pdwSize is less than required, the function will return
- * ERROR_INSUFFICIENT_BUFFER, and *pdwSize will be set to the required byte
- * size.
- * If bOrder is true, the returned table will be sorted by the next hop and
- * an assortment of arbitrary parameters.
*/
-DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL bOrder)
+DWORD WINAPI GetIpAddrTable( MIB_IPADDRTABLE *table, ULONG *size, BOOL sort )
{
- DWORD ret;
+ DWORD err, count, needed, i, loopback, row_num = 0;
+ struct nsi_ipv4_unicast_key *keys;
+ struct nsi_ip_unicast_rw *rw;
- TRACE("pIpAddrTable %p, pdwSize %p, bOrder %d\n", pIpAddrTable, pdwSize,
- (DWORD)bOrder);
- if (!pdwSize)
- ret = ERROR_INVALID_PARAMETER;
- else {
- PMIB_IPADDRTABLE table;
+ TRACE( "table %p, size %p, sort %d\n", table, size, sort );
+ if (!size) return ERROR_INVALID_PARAMETER;
+
+ err = NsiAllocateAndGetTable( 1, &NPI_MS_IPV4_MODULEID, NSI_IP_UNICAST_TABLE, (void **)&keys, sizeof(*keys),
+ (void **)&rw, sizeof(*rw), NULL, 0, NULL, 0, &count, 0 );
+ if (err) return err;
- ret = getIPAddrTable(&table, GetProcessHeap(), 0);
- if (ret == NO_ERROR)
+ needed = FIELD_OFFSET( MIB_IPADDRTABLE, table[count] );
+
+ if (!table || *size < needed)
{
- ULONG size = FIELD_OFFSET(MIB_IPADDRTABLE, table[table->dwNumEntries]);
+ *size = needed;
+ err = ERROR_INSUFFICIENT_BUFFER;
+ goto err;
+ }
- if (!pIpAddrTable || *pdwSize < size) {
- *pdwSize = size;
- ret = ERROR_INSUFFICIENT_BUFFER;
- }
- else {
- *pdwSize = size;
- memcpy(pIpAddrTable, table, size);
- /* sort by numeric IP value */
- if (bOrder)
- qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries,
- sizeof(MIB_IPADDRROW), IpAddrTableNumericSorter);
- /* sort ensuring loopback interfaces are in the end */
- else
- qsort(pIpAddrTable->table, pIpAddrTable->dwNumEntries,
- sizeof(MIB_IPADDRROW), IpAddrTableLoopbackSorter);
- ret = NO_ERROR;
- }
- HeapFree(GetProcessHeap(), 0, table);
+ table->dwNumEntries = count;
+
+ for (loopback = 0; loopback < 2; loopback++) /* Move the loopback addresses to the end */
+ {
+ for (i = 0; i < count; i++)
+ {
+ MIB_IPADDRROW *row = table->table + row_num;
+
+ if (!!loopback != (keys[i].luid.Info.IfType == MIB_IF_TYPE_LOOPBACK)) continue;
+
+ row->dwAddr = keys[i].addr.WS_s_addr;
+ ConvertInterfaceLuidToIndex( &keys[i].luid, &row->dwIndex );
+ ConvertLengthToIpv4Mask( rw[i].on_link_prefix, &row->dwMask );
+ row->dwBCastAddr = 1;
+ row->dwReasmSize = 0xffff;
+ row->unused1 = 0;
+ row->wType = MIB_IPADDR_PRIMARY;
+ row_num++;
+ }
}
- }
- TRACE("returning %d\n", ret);
- return ret;
+
+ if (sort) qsort( table->table, count, sizeof(MIB_IPADDRROW), ipaddrrow_cmp );
+err:
+ NsiFreeTable( keys, rw, NULL, NULL );
+
+ return err;
}
diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index 1deac9b64f1..51566034f51 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -203,6 +203,8 @@ static void testGetIpAddrTable(void)
for (i = 0; i < buf->dwNumEntries; i++)
{
ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i);
+ ok (buf->table[i].dwBCastAddr == 1, "Test[%d]: got %08x\n", i, buf->table[i].dwBCastAddr);
+ ok (buf->table[i].dwReasmSize == 0xffff, "Test[%d]: got %08x\n", i, buf->table[i].dwReasmSize);
trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i,
ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType);
}
More information about the wine-cvs
mailing list