https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f87c88f6fe2376c3dfffdb990d8e5a40eb303451
commit f87c88f6fe2376c3dfffdb990d8e5a40eb303451 Author: Pierre Schweitzer <[email protected]> AuthorDate: Tue Nov 27 23:11:06 2018 +0100 Commit: Pierre Schweitzer <[email protected]> CommitDate: Tue Nov 27 23:12:57 2018 +0100 [IPHLPAPI] Implement the *_TABLE_OWNER_MODULE_* in GetExtendedTcp/UdpTable() functions This fixes CurrPorts in ReactOS. It now properly displays current connections along with their creation time. CORE-10134 --- dll/win32/iphlpapi/iphlpapi_main.c | 145 ++++++++++++++++++++++++++++++++++++- dll/win32/iphlpapi/ipstats.h | 10 +++ 2 files changed, 153 insertions(+), 2 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index ad979c19e5..31cf158c6d 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -1267,8 +1267,124 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U } break; + case TCP_TABLE_OWNER_MODULE_ALL: + { + PMIB_TCPTABLE_OWNER_MODULE pOurTcpTable = getOwnerModTcpTable(); + PMIB_TCPTABLE_OWNER_MODULE pTheirTcpTable = pTcpTable; + + if (pOurTcpTable) + { + if (sizeof(DWORD) + pOurTcpTable->dwNumEntries * sizeof(MIB_TCPROW_OWNER_MODULE) > *pdwSize || !pTheirTcpTable) + { + *pdwSize = sizeof(DWORD) + pOurTcpTable->dwNumEntries * sizeof(MIB_TCPROW_OWNER_MODULE); + ret = ERROR_INSUFFICIENT_BUFFER; + } + else + { + memcpy(pTheirTcpTable, pOurTcpTable, sizeof(DWORD) + pOurTcpTable->dwNumEntries * sizeof(MIB_TCPROW_OWNER_MODULE)); + + /* Don't sort on PID, so use basic helper */ + if (bOrder) + qsort(pTheirTcpTable->table, pTheirTcpTable->dwNumEntries, + sizeof(MIB_TCPROW_OWNER_MODULE), TcpTableSorter); + } + + free(pOurTcpTable); + } + } + break; + + case TCP_TABLE_OWNER_MODULE_CONNECTIONS: + { + PMIB_TCPTABLE_OWNER_MODULE pOurTcpTable = getOwnerModTcpTable(); + PMIB_TCPTABLE_OWNER_MODULE pTheirTcpTable = pTcpTable; + + if (pOurTcpTable) + { + for (i = 0, count = 0; i < pOurTcpTable->dwNumEntries; ++i) + { + if (pOurTcpTable->table[i].dwState != MIB_TCP_STATE_LISTEN) + { + ++count; + } + } + + if (sizeof(DWORD) + count * sizeof(MIB_TCPROW_OWNER_MODULE) > *pdwSize || !pTheirTcpTable) + { + *pdwSize = sizeof(DWORD) + count * sizeof(MIB_TCPROW_OWNER_MODULE); + ret = ERROR_INSUFFICIENT_BUFFER; + } + else + { + pTheirTcpTable->dwNumEntries = count; + + for (i = 0, count = 0; i < pOurTcpTable->dwNumEntries; ++i) + { + if (pOurTcpTable->table[i].dwState != MIB_TCP_STATE_LISTEN) + { + memcpy(&pTheirTcpTable->table[count], &pOurTcpTable->table[i], sizeof(MIB_TCPROW_OWNER_MODULE)); + ++count; + } + } + ASSERT(count == pTheirTcpTable->dwNumEntries); + + /* Don't sort on PID, so use basic helper */ + if (bOrder) + qsort(pTheirTcpTable->table, pTheirTcpTable->dwNumEntries, + sizeof(MIB_TCPROW_OWNER_MODULE), TcpTableSorter); + } + + free(pOurTcpTable); + } + } + break; + + case TCP_TABLE_OWNER_MODULE_LISTENER: + { + PMIB_TCPTABLE_OWNER_MODULE pOurTcpTable = getOwnerModTcpTable(); + PMIB_TCPTABLE_OWNER_MODULE pTheirTcpTable = pTcpTable; + + if (pOurTcpTable) + { + for (i = 0, count = 0; i < pOurTcpTable->dwNumEntries; ++i) + { + if (pOurTcpTable->table[i].dwState == MIB_TCP_STATE_LISTEN) + { + ++count; + } + } + + if (sizeof(DWORD) + count * sizeof(MIB_TCPROW_OWNER_MODULE) > *pdwSize || !pTheirTcpTable) + { + *pdwSize = sizeof(DWORD) + count * sizeof(MIB_TCPROW_OWNER_MODULE); + ret = ERROR_INSUFFICIENT_BUFFER; + } + else + { + pTheirTcpTable->dwNumEntries = count; + + for (i = 0, count = 0; i < pOurTcpTable->dwNumEntries; ++i) + { + if (pOurTcpTable->table[i].dwState == MIB_TCP_STATE_LISTEN) + { + memcpy(&pTheirTcpTable->table[count], &pOurTcpTable->table[i], sizeof(MIB_TCPROW_OWNER_MODULE)); + ++count; + } + } + ASSERT(count == pTheirTcpTable->dwNumEntries); + + /* Don't sort on PID, so use basic helper */ + if (bOrder) + qsort(pTheirTcpTable->table, pTheirTcpTable->dwNumEntries, + sizeof(MIB_TCPROW_OWNER_MODULE), TcpTableSorter); + } + + free(pOurTcpTable); + } + } + break; + default: - UNIMPLEMENTED; ret = ERROR_INVALID_PARAMETER; break; } @@ -1382,8 +1498,33 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, U } break; + case UDP_TABLE_OWNER_MODULE: + { + PMIB_UDPTABLE_OWNER_MODULE pOurUdpTable = getOwnerModUdpTable(); + PMIB_UDPTABLE_OWNER_MODULE pTheirUdpTable = pUdpTable; + + if (pOurUdpTable) + { + if (sizeof(DWORD) + pOurUdpTable->dwNumEntries * sizeof(MIB_UDPROW_OWNER_MODULE) > *pdwSize || !pTheirUdpTable) + { + *pdwSize = sizeof(DWORD) + pOurUdpTable->dwNumEntries * sizeof(MIB_UDPROW_OWNER_MODULE); + ret = ERROR_INSUFFICIENT_BUFFER; + } + else + { + memcpy(pTheirUdpTable, pOurUdpTable, sizeof(DWORD) + pOurUdpTable->dwNumEntries * sizeof(MIB_UDPROW_OWNER_MODULE)); + + if (bOrder) + qsort(pTheirUdpTable->table, pTheirUdpTable->dwNumEntries, + sizeof(MIB_UDPROW_OWNER_MODULE), UdpTableSorter); + } + + free(pOurUdpTable); + } + } + break; + default: - UNIMPLEMENTED; ret = ERROR_INVALID_PARAMETER; break; } diff --git a/dll/win32/iphlpapi/ipstats.h b/dll/win32/iphlpapi/ipstats.h index da49d2b1d3..6becd0014c 100644 --- a/dll/win32/iphlpapi/ipstats.h +++ b/dll/win32/iphlpapi/ipstats.h @@ -102,6 +102,11 @@ PMIB_UDPTABLE getUdpTable(void); */ PMIB_UDPTABLE_OWNER_PID getOwnerUdpTable(void); +/* Allocates and returns to you the UDP state table with module info, + * or NULL if it can't allocate enough memory. free() the returned table. + */ +PMIB_UDPTABLE_OWNER_MODULE getOwnerModUdpTable(void); + /* Returns the number of entries in the TCP state table. */ DWORD getNumTcpEntries(void); @@ -115,4 +120,9 @@ PMIB_TCPTABLE getTcpTable(void); */ PMIB_TCPTABLE_OWNER_PID getOwnerTcpTable(void); +/* Allocates and returns to you the TCP state table with module info, + * or NULL if it can't allocate enough memory. free() the returned table. + */ +PMIB_TCPTABLE_OWNER_MODULE getOwnerModTcpTable(void); + #endif /* ndef WINE_IPSTATS_H_ */
