[PATCH v2 2/2] iphlpapi: Don't request redundant static data in get_extended_tcp_table().
Huw Davies
huw at codeweavers.com
Wed Mar 23 04:07:25 CDT 2022
From: Paul Gofman <pgofman at codeweavers.com>
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
---
dlls/iphlpapi/iphlpapi_main.c | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 041e712f44f..afc400d26c1 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -3082,6 +3082,19 @@ static int tcp6_row_owner_cmp( const void *a, const void *b )
return RtlUshortByteSwap( rowA->dwRemotePort ) - RtlUshortByteSwap( rowB->dwRemotePort );
}
+static BOOL tcp_table_needs_pids( ULONG table_class )
+{
+ switch (table_class)
+ {
+ case TCP_TABLE_BASIC_LISTENER:
+ case TCP_TABLE_BASIC_CONNECTIONS:
+ case TCP_TABLE_BASIC_ALL:
+ return FALSE;
+
+ }
+ return TRUE;
+}
+
/*************************************************************************************
* get_extended_tcp_table
*
@@ -3093,13 +3106,19 @@ static DWORD get_extended_tcp_table( void *table, DWORD *size, BOOL sort, ULONG
DWORD err, count, needed, i, num = 0, row_size = 0;
struct nsi_tcp_conn_key *key;
struct nsi_tcp_conn_dynamic *dyn;
- struct nsi_tcp_conn_static *stat;
+ struct nsi_tcp_conn_static *stat = NULL;
if (!size) return ERROR_INVALID_PARAMETER;
- err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, tcp_table_id( table_class ), (void **)&key, sizeof(*key),
- NULL, 0, (void **)&dyn, sizeof(*dyn),
- (void **)&stat, sizeof(*stat), &count, 0 );
+ if (tcp_table_needs_pids( table_class ))
+ err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, tcp_table_id( table_class ), (void **)&key, sizeof(*key),
+ NULL, 0, (void **)&dyn, sizeof(*dyn),
+ (void **)&stat, sizeof(*stat), &count, 0 );
+ else /* Don't retrieve the static data if not required as this is expensive to compute */
+ err = NsiAllocateAndGetTable( 1, &NPI_MS_TCP_MODULEID, tcp_table_id( table_class ), (void **)&key, sizeof(*key),
+ NULL, 0, (void **)&dyn, sizeof(*dyn),
+ NULL, 0, &count, 0 );
+
if (err) return err;
for (i = 0; i < count; i++)
--
2.23.0
More information about the wine-devel
mailing list