Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 04/05: [IPHLPAPI_APITEST] Add tests for GetOwnerModuleFromTcpEntry()
by Pierre Schweitzer 29 Nov '18

29 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e9c7c6fd2c26e02ed2c81… commit e9c7c6fd2c26e02ed2c813f2c7f96802488ca332 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Nov 29 19:58:36 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Nov 29 20:30:23 2018 +0100 [IPHLPAPI_APITEST] Add tests for GetOwnerModuleFromTcpEntry() --- modules/rostests/apitests/iphlpapi/CMakeLists.txt | 1 + .../apitests/iphlpapi/GetExtendedTcpTable.c | 2 +- .../apitests/iphlpapi/GetOwnerModuleFromTcpEntry.c | 163 +++++++++++++++++++++ modules/rostests/apitests/iphlpapi/testlist.c | 12 +- 4 files changed, 172 insertions(+), 6 deletions(-) diff --git a/modules/rostests/apitests/iphlpapi/CMakeLists.txt b/modules/rostests/apitests/iphlpapi/CMakeLists.txt index 23b8218972..81ca68cae9 100644 --- a/modules/rostests/apitests/iphlpapi/CMakeLists.txt +++ b/modules/rostests/apitests/iphlpapi/CMakeLists.txt @@ -3,6 +3,7 @@ list(APPEND SOURCE GetExtendedTcpTable.c GetInterfaceName.c GetNetworkParams.c + GetOwnerModuleFromTcpEntry.c icmp.c SendARP.c testlist.c) diff --git a/modules/rostests/apitests/iphlpapi/GetExtendedTcpTable.c b/modules/rostests/apitests/iphlpapi/GetExtendedTcpTable.c index 3beda7e8fd..87f3b65d3a 100644 --- a/modules/rostests/apitests/iphlpapi/GetExtendedTcpTable.c +++ b/modules/rostests/apitests/iphlpapi/GetExtendedTcpTable.c @@ -11,7 +11,7 @@ #include <iphlpapi.h> #include <winsock2.h> -DWORD GetExtendedTcpTableWithAlloc(PVOID *TcpTable, BOOL Order, DWORD Family, TCP_TABLE_CLASS Class) +static DWORD GetExtendedTcpTableWithAlloc(PVOID *TcpTable, BOOL Order, DWORD Family, TCP_TABLE_CLASS Class) { DWORD ret; DWORD Size = 0; diff --git a/modules/rostests/apitests/iphlpapi/GetOwnerModuleFromTcpEntry.c b/modules/rostests/apitests/iphlpapi/GetOwnerModuleFromTcpEntry.c new file mode 100644 index 0000000000..a57142118f --- /dev/null +++ b/modules/rostests/apitests/iphlpapi/GetOwnerModuleFromTcpEntry.c @@ -0,0 +1,163 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for TCP connections owner functions + * COPYRIGHT: Copyright 2018 Pierre Schweitzer + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <iphlpapi.h> +#include <winsock2.h> + +static DWORD GetExtendedTcpTableWithAlloc(PVOID *TcpTable, BOOL Order, DWORD Family, TCP_TABLE_CLASS Class) +{ + DWORD ret; + DWORD Size = 0; + + *TcpTable = NULL; + + ret = GetExtendedTcpTable(*TcpTable, &Size, Order, Family, Class, 0); + if (ret == ERROR_INSUFFICIENT_BUFFER) + { + *TcpTable = HeapAlloc(GetProcessHeap(), 0, Size); + if (*TcpTable == NULL) + { + return ERROR_OUTOFMEMORY; + } + + ret = GetExtendedTcpTable(*TcpTable, &Size, Order, Family, Class, 0); + if (ret != NO_ERROR) + { + HeapFree(GetProcessHeap(), 0, *TcpTable); + *TcpTable = NULL; + } + } + + return ret; +} + +START_TEST(GetOwnerModuleFromTcpEntry) +{ + WSADATA wsaData; + SOCKET sock; + SOCKADDR_IN server; + PMIB_TCPTABLE_OWNER_MODULE TcpTableOwnerMod; + DWORD i; + BOOLEAN Found; + FILETIME Creation; + LARGE_INTEGER CreationTime; + DWORD Pid = GetCurrentProcessId(); + + if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) + { + skip("Failed to init WS2\n"); + return; + } + + GetSystemTimeAsFileTime(&Creation); + CreationTime.LowPart = Creation.dwLowDateTime; + CreationTime.HighPart = Creation.dwHighDateTime; + + sock = socket(AF_INET, SOCK_STREAM, 0); + if (sock == INVALID_SOCKET) + { + skip("Cannot create socket\n"); + goto quit; + } + + ZeroMemory(&server, sizeof(SOCKADDR_IN)); + server.sin_family = AF_INET; + server.sin_addr.s_addr = htonl(INADDR_ANY); + server.sin_port = htons(9876); + + if (bind(sock, (SOCKADDR*)&server, sizeof(SOCKADDR_IN)) == SOCKET_ERROR) + { + skip("Cannot bind socket\n"); + goto quit2; + } + + if (listen(sock, SOMAXCONN) == SOCKET_ERROR) + { + skip("Cannot listen on socket\n"); + goto quit2; + } + + if (GetExtendedTcpTableWithAlloc((PVOID *)&TcpTableOwnerMod, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER) == ERROR_SUCCESS) + { + ok(TcpTableOwnerMod->dwNumEntries > 0, "No TCP connections?!\n"); + + Found = FALSE; + for (i = 0; i < TcpTableOwnerMod->dwNumEntries; ++i) + { + if (TcpTableOwnerMod->table[i].dwState == MIB_TCP_STATE_LISTEN && + TcpTableOwnerMod->table[i].dwLocalAddr == 0 && + TcpTableOwnerMod->table[i].dwLocalPort == htons(9876) && + TcpTableOwnerMod->table[i].dwRemoteAddr == 0) + { + Found = TRUE; + break; + } + } + + if (!Found) + { + skip("Our socket wasn't found!\n"); + } + else + { + DWORD Size = 0; + PTCPIP_OWNER_MODULE_BASIC_INFO BasicInfo = NULL; + + ok(TcpTableOwnerMod->table[i].dwOwningPid == Pid, "Invalid owner\n"); + + ok(TcpTableOwnerMod->table[i].liCreateTimestamp.QuadPart >= CreationTime.QuadPart, "Invalid time\n"); + ok(TcpTableOwnerMod->table[i].liCreateTimestamp.QuadPart <= CreationTime.QuadPart + 60000000000LL, "Invalid time\n"); + + if (GetOwnerModuleFromTcpEntry(&TcpTableOwnerMod->table[i], TCPIP_OWNER_MODULE_INFO_BASIC, BasicInfo, &Size) == ERROR_INSUFFICIENT_BUFFER) + { + BasicInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Size); + ok(BasicInfo != NULL, "HeapAlloc failed\n"); + + if (GetOwnerModuleFromTcpEntry(&TcpTableOwnerMod->table[i], TCPIP_OWNER_MODULE_INFO_BASIC, BasicInfo, &Size) == ERROR_SUCCESS) + { + WCHAR CurrentModule[MAX_PATH]; + PWSTR FileName; + + if (GetModuleFileNameW(NULL, CurrentModule, MAX_PATH) != 0) + { + FileName = wcsrchr(CurrentModule, L'\\'); + ++FileName; + + ok(_wcsicmp(CurrentModule, BasicInfo->pModulePath) == 0, "Mismatching names (%S, %S)\n", CurrentModule, BasicInfo->pModulePath); + ok(_wcsicmp(FileName, BasicInfo->pModuleName) == 0, "Mismatching names (%S, %S)\n", FileName, BasicInfo->pModuleName); + } + else + { + skip("GetModuleFileNameW failed\n"); + } + } + else + { + skip("GetOwnerModuleFromTcpEntry failed\n"); + } + } + else + { + skip("GetOwnerModuleFromTcpEntry failed\n"); + } + } + + HeapFree(GetProcessHeap(), 0, TcpTableOwnerMod); + } + else + { + skip("GetExtendedTcpTableWithAlloc failure\n"); + } + +quit2: + closesocket(sock); +quit: + WSACleanup(); +} diff --git a/modules/rostests/apitests/iphlpapi/testlist.c b/modules/rostests/apitests/iphlpapi/testlist.c index fb2e999445..4f56d9da55 100644 --- a/modules/rostests/apitests/iphlpapi/testlist.c +++ b/modules/rostests/apitests/iphlpapi/testlist.c @@ -6,16 +6,18 @@ extern void func_GetExtendedTcpTable(void); extern void func_GetInterfaceName(void); extern void func_GetNetworkParams(void); +extern void func_GetOwnerModuleFromTcpEntry(void); extern void func_icmp(void); extern void func_SendARP(void); const struct test winetest_testlist[] = { - { "GetExtendedTcpTable", func_GetExtendedTcpTable }, - { "GetInterfaceName", func_GetInterfaceName }, - { "GetNetworkParams", func_GetNetworkParams }, - { "icmp", func_icmp }, - { "SendARP", func_SendARP }, + { "GetExtendedTcpTable", func_GetExtendedTcpTable }, + { "GetInterfaceName", func_GetInterfaceName }, + { "GetNetworkParams", func_GetNetworkParams }, + { "GetOwnerModuleFromTcpEntry", func_GetOwnerModuleFromTcpEntry }, + { "icmp", func_icmp }, + { "SendARP", func_SendARP }, { 0, 0 } };

1 0

[reactos] 03/05: [SDK] Move TCPIP_OWNER_MODULE_BASIC_INFO definition to the right file
by Pierre Schweitzer 29 Nov '18

29 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9476baf616c24106c6a76… commit 9476baf616c24106c6a7670ea5321313b6bce0ab Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Nov 29 19:31:07 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Nov 29 20:30:23 2018 +0100 [SDK] Move TCPIP_OWNER_MODULE_BASIC_INFO definition to the right file --- sdk/include/psdk/iprtrmib.h | 5 +++++ sdk/include/psdk/iptypes.h | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/include/psdk/iprtrmib.h b/sdk/include/psdk/iprtrmib.h index b09f1cec5b..1d6fc7d421 100644 --- a/sdk/include/psdk/iprtrmib.h +++ b/sdk/include/psdk/iprtrmib.h @@ -51,4 +51,9 @@ typedef enum _TCPIP_OWNER_MODULE_INFO_CLASS TCPIP_OWNER_MODULE_INFO_BASIC } TCPIP_OWNER_MODULE_INFO_CLASS, *PTCPIP_OWNER_MODULE_INFO_CLASS; +typedef struct _TCPIP_OWNER_MODULE_BASIC_INFO { + PWCHAR pModuleName; + PWCHAR pModulePath; +} TCPIP_OWNER_MODULE_BASIC_INFO, *PTCPIP_OWNER_MODULE_BASIC_INFO; + #endif /* WINE_IPRTRMIB_H__ */ diff --git a/sdk/include/psdk/iptypes.h b/sdk/include/psdk/iptypes.h index c837af2e21..256c675217 100644 --- a/sdk/include/psdk/iptypes.h +++ b/sdk/include/psdk/iptypes.h @@ -313,11 +313,6 @@ typedef IP_ADAPTER_ADDRESSES_XP IP_ADAPTER_ADDRESSES; typedef IP_ADAPTER_ADDRESSES_XP *PIP_ADAPTER_ADDRESSES; #endif -typedef struct _TCPIP_OWNER_MODULE_BASIC_INFO { - PWCHAR pModuleName; - PWCHAR pModulePath; -} TCPIP_OWNER_MODULE_BASIC_INFO, *PTCPIP_OWNER_MODULE_BASIC_INFO; - #define GAA_FLAG_SKIP_UNICAST 0x00000001 #define GAA_FLAG_SKIP_ANYCAST 0x00000002 #define GAA_FLAG_SKIP_MULTICAST 0x00000004

1 0

[reactos] 02/05: [IPHLPAPI_APITEST] Test GetExtendedTcpTable rather than AllocateAndGetTcpExTable2FromStack
by Pierre Schweitzer 29 Nov '18

29 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e9fb35fbc0dc50c99b36… commit 1e9fb35fbc0dc50c99b36816e40154875f822809 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Nov 29 08:42:13 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Nov 29 20:30:22 2018 +0100 [IPHLPAPI_APITEST] Test GetExtendedTcpTable rather than AllocateAndGetTcpExTable2FromStack --- modules/rostests/apitests/iphlpapi/CMakeLists.txt | 2 +- ...cpExTable2FromStack.c => GetExtendedTcpTable.c} | 80 ++++++++++++---------- modules/rostests/apitests/iphlpapi/testlist.c | 12 ++-- 3 files changed, 52 insertions(+), 42 deletions(-) diff --git a/modules/rostests/apitests/iphlpapi/CMakeLists.txt b/modules/rostests/apitests/iphlpapi/CMakeLists.txt index 8e59d25643..23b8218972 100644 --- a/modules/rostests/apitests/iphlpapi/CMakeLists.txt +++ b/modules/rostests/apitests/iphlpapi/CMakeLists.txt @@ -1,6 +1,6 @@ list(APPEND SOURCE - AllocateAndGetTcpExTable2FromStack.c + GetExtendedTcpTable.c GetInterfaceName.c GetNetworkParams.c icmp.c diff --git a/modules/rostests/apitests/iphlpapi/AllocateAndGetTcpExTable2FromStack.c b/modules/rostests/apitests/iphlpapi/GetExtendedTcpTable.c similarity index 76% rename from modules/rostests/apitests/iphlpapi/AllocateAndGetTcpExTable2FromStack.c rename to modules/rostests/apitests/iphlpapi/GetExtendedTcpTable.c index 1f49664fc1..3beda7e8fd 100644 --- a/modules/rostests/apitests/iphlpapi/AllocateAndGetTcpExTable2FromStack.c +++ b/modules/rostests/apitests/iphlpapi/GetExtendedTcpTable.c @@ -11,9 +11,34 @@ #include <iphlpapi.h> #include <winsock2.h> -static DWORD (WINAPI * pAllocateAndGetTcpExTable2FromStack)(PVOID*,BOOL,HANDLE,DWORD,DWORD,TCP_TABLE_CLASS); +DWORD GetExtendedTcpTableWithAlloc(PVOID *TcpTable, BOOL Order, DWORD Family, TCP_TABLE_CLASS Class) +{ + DWORD ret; + DWORD Size = 0; + + *TcpTable = NULL; + + ret = GetExtendedTcpTable(*TcpTable, &Size, Order, Family, Class, 0); + if (ret == ERROR_INSUFFICIENT_BUFFER) + { + *TcpTable = HeapAlloc(GetProcessHeap(), 0, Size); + if (*TcpTable == NULL) + { + return ERROR_OUTOFMEMORY; + } + + ret = GetExtendedTcpTable(*TcpTable, &Size, Order, Family, Class, 0); + if (ret != NO_ERROR) + { + HeapFree(GetProcessHeap(), 0, *TcpTable); + *TcpTable = NULL; + } + } -START_TEST(AllocateAndGetTcpExTable2FromStack) + return ret; +} + +START_TEST(GetExtendedTcpTable) { WSADATA wsaData; SOCKET sock; @@ -23,25 +48,10 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) PMIB_TCPTABLE_OWNER_MODULE TcpTableOwnerMod; DWORD i; BOOLEAN Found; - HINSTANCE hIpHlpApi; FILETIME Creation; LARGE_INTEGER CreationTime; DWORD Pid = GetCurrentProcessId(); - hIpHlpApi = GetModuleHandleW(L"iphlpapi.dll"); - if (!hIpHlpApi) - { - skip("Failed to load iphlpapi.dll\n"); - return; - } - - pAllocateAndGetTcpExTable2FromStack = (void *)GetProcAddress(hIpHlpApi, "AllocateAndGetTcpExTable2FromStack"); - if (pAllocateAndGetTcpExTable2FromStack == NULL) - { - skip("AllocateAndGetTcpExTable2FromStack not found\n"); - return; - } - if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) { skip("Failed to init WS2\n"); @@ -76,7 +86,7 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) goto quit2; } - if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTable, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_BASIC_ALL) == ERROR_SUCCESS) + if (GetExtendedTcpTableWithAlloc((PVOID *)&TcpTable, TRUE, AF_INET, TCP_TABLE_BASIC_ALL) == ERROR_SUCCESS) { ok(TcpTable->dwNumEntries > 0, "No TCP connections?!\n"); @@ -98,10 +108,10 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) } else { - skip("AllocateAndGetTcpExTable2FromStack failure\n"); + skip("GetExtendedTcpTableWithAlloc failure\n"); } - if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTable, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_BASIC_CONNECTIONS) == ERROR_SUCCESS) + if (GetExtendedTcpTableWithAlloc((PVOID *)&TcpTable, TRUE, AF_INET, TCP_TABLE_BASIC_CONNECTIONS) == ERROR_SUCCESS) { Found = FALSE; for (i = 0; i < TcpTable->dwNumEntries; ++i) @@ -121,10 +131,10 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) } else { - skip("AllocateAndGetTcpExTable2FromStack failure\n"); + skip("GetExtendedTcpTableWithAlloc failure\n"); } - if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTable, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_BASIC_LISTENER) == ERROR_SUCCESS) + if (GetExtendedTcpTableWithAlloc((PVOID *)&TcpTable, TRUE, AF_INET, TCP_TABLE_BASIC_LISTENER) == ERROR_SUCCESS) { ok(TcpTable->dwNumEntries > 0, "No TCP connections?!\n"); @@ -146,10 +156,10 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) } else { - skip("AllocateAndGetTcpExTable2FromStack failure\n"); + skip("GetExtendedTcpTableWithAlloc failure\n"); } - if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTableOwner, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_OWNER_PID_ALL) == ERROR_SUCCESS) + if (GetExtendedTcpTableWithAlloc((PVOID *)&TcpTableOwner, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL) == ERROR_SUCCESS) { ok(TcpTableOwner->dwNumEntries > 0, "No TCP connections?!\n"); @@ -179,10 +189,10 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) } else { - skip("AllocateAndGetTcpExTable2FromStack failure\n"); + skip("GetExtendedTcpTableWithAlloc failure\n"); } - if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTableOwner, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_OWNER_PID_CONNECTIONS) == ERROR_SUCCESS) + if (GetExtendedTcpTableWithAlloc((PVOID *)&TcpTableOwner, TRUE, AF_INET, TCP_TABLE_OWNER_PID_CONNECTIONS) == ERROR_SUCCESS) { Found = FALSE; for (i = 0; i < TcpTableOwner->dwNumEntries; ++i) @@ -202,10 +212,10 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) } else { - skip("AllocateAndGetTcpExTable2FromStack failure\n"); + skip("GetExtendedTcpTableWithAlloc failure\n"); } - if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTableOwner, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_OWNER_PID_LISTENER) == ERROR_SUCCESS) + if (GetExtendedTcpTableWithAlloc((PVOID *)&TcpTableOwner, TRUE, AF_INET, TCP_TABLE_OWNER_PID_LISTENER) == ERROR_SUCCESS) { ok(TcpTableOwner->dwNumEntries > 0, "No TCP connections?!\n"); @@ -235,10 +245,10 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) } else { - skip("AllocateAndGetTcpExTable2FromStack failure\n"); + skip("GetExtendedTcpTableWithAlloc failure\n"); } - if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTableOwnerMod, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_OWNER_MODULE_ALL) == ERROR_SUCCESS) + if (GetExtendedTcpTableWithAlloc((PVOID *)&TcpTableOwnerMod, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_ALL) == ERROR_SUCCESS) { ok(TcpTableOwnerMod->dwNumEntries > 0, "No TCP connections?!\n"); @@ -271,10 +281,10 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) } else { - skip("AllocateAndGetTcpExTable2FromStack failure\n"); + skip("GetExtendedTcpTableWithAlloc failure\n"); } - if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTableOwnerMod, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_OWNER_MODULE_CONNECTIONS) == ERROR_SUCCESS) + if (GetExtendedTcpTableWithAlloc((PVOID *)&TcpTableOwnerMod, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_CONNECTIONS) == ERROR_SUCCESS) { Found = FALSE; for (i = 0; i < TcpTableOwnerMod->dwNumEntries; ++i) @@ -294,10 +304,10 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) } else { - skip("AllocateAndGetTcpExTable2FromStack failure\n"); + skip("GetExtendedTcpTableWithAlloc failure\n"); } - if (pAllocateAndGetTcpExTable2FromStack((PVOID *)&TcpTableOwnerMod, TRUE, GetProcessHeap(), 0, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER) == ERROR_SUCCESS) + if (GetExtendedTcpTableWithAlloc((PVOID *)&TcpTableOwnerMod, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER) == ERROR_SUCCESS) { ok(TcpTableOwnerMod->dwNumEntries > 0, "No TCP connections?!\n"); @@ -330,7 +340,7 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) } else { - skip("AllocateAndGetTcpExTable2FromStack failure\n"); + skip("GetExtendedTcpTableWithAlloc failure\n"); } quit2: diff --git a/modules/rostests/apitests/iphlpapi/testlist.c b/modules/rostests/apitests/iphlpapi/testlist.c index 78843f5b5e..fb2e999445 100644 --- a/modules/rostests/apitests/iphlpapi/testlist.c +++ b/modules/rostests/apitests/iphlpapi/testlist.c @@ -3,7 +3,7 @@ #define STANDALONE #include <apitest.h> -extern void func_AllocateAndGetTcpExTable2FromStack(void); +extern void func_GetExtendedTcpTable(void); extern void func_GetInterfaceName(void); extern void func_GetNetworkParams(void); extern void func_icmp(void); @@ -11,11 +11,11 @@ extern void func_SendARP(void); const struct test winetest_testlist[] = { - { "AllocateAndGetTcpExTable2FromStack", func_AllocateAndGetTcpExTable2FromStack }, - { "GetInterfaceName", func_GetInterfaceName }, - { "GetNetworkParams", func_GetNetworkParams }, - { "icmp", func_icmp }, - { "SendARP", func_SendARP }, + { "GetExtendedTcpTable", func_GetExtendedTcpTable }, + { "GetInterfaceName", func_GetInterfaceName }, + { "GetNetworkParams", func_GetNetworkParams }, + { "icmp", func_icmp }, + { "SendARP", func_SendARP }, { 0, 0 } };

1 0

[reactos] 01/05: [SDK] Define TCPIP_OWNER_MODULE_BASIC_INFO
by Pierre Schweitzer 29 Nov '18

29 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60203092d79c9dfb75147… commit 60203092d79c9dfb75147854b82f8816a977e3bd Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Nov 29 08:16:46 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Nov 29 20:30:22 2018 +0100 [SDK] Define TCPIP_OWNER_MODULE_BASIC_INFO --- sdk/include/psdk/iptypes.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/include/psdk/iptypes.h b/sdk/include/psdk/iptypes.h index 256c675217..c837af2e21 100644 --- a/sdk/include/psdk/iptypes.h +++ b/sdk/include/psdk/iptypes.h @@ -313,6 +313,11 @@ typedef IP_ADAPTER_ADDRESSES_XP IP_ADAPTER_ADDRESSES; typedef IP_ADAPTER_ADDRESSES_XP *PIP_ADAPTER_ADDRESSES; #endif +typedef struct _TCPIP_OWNER_MODULE_BASIC_INFO { + PWCHAR pModuleName; + PWCHAR pModulePath; +} TCPIP_OWNER_MODULE_BASIC_INFO, *PTCPIP_OWNER_MODULE_BASIC_INFO; + #define GAA_FLAG_SKIP_UNICAST 0x00000001 #define GAA_FLAG_SKIP_ANYCAST 0x00000002 #define GAA_FLAG_SKIP_MULTICAST 0x00000004

1 0

[reactos] 01/01: [MC] Add messages 4600-4699 to netmsg.dll.
by Eric Kohl 29 Nov '18

29 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2eb652c0f8ab2ff244f22… commit 2eb652c0f8ab2ff244f2217a7e2895c3e4affbff Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Nov 28 23:11:20 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Nov 28 23:13:00 2018 +0100 [MC] Add messages 4600-4699 to netmsg.dll. --- sdk/include/reactos/mc/netmsgmsg.mc | 750 ++++++++++++++++++++++++++++++++++++ 1 file changed, 750 insertions(+) diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index bd913cc7a6..9146554bc0 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -9950,6 +9950,756 @@ Language=Russian Lockout observation window (minutes):%0 . +MessageId=4600 +Severity=Success +Facility=System +SymbolicName=APPERR2_4600 +Language=English +Statistics since%0 +. +Language=Russian +Statistics since%0 +. + +MessageId=4601 +Severity=Success +Facility=System +SymbolicName=APPERR2_4601 +Language=English +Sessions accepted%0 +. +Language=Russian +Sessions accepted%0 +. + +MessageId=4602 +Severity=Success +Facility=System +SymbolicName=APPERR2_4602 +Language=English +Sessions timed-out%0 +. +Language=Russian +Sessions timed-out%0 +. + +MessageId=4603 +Severity=Success +Facility=System +SymbolicName=APPERR2_4603 +Language=English +Sessions errored-out%0 +. +Language=Russian +Sessions errored-out%0 +. + +MessageId=4604 +Severity=Success +Facility=System +SymbolicName=APPERR2_4604 +Language=English +Kilobytes sent%0 +. +Language=Russian +Kilobytes sent%0 +. + +MessageId=4605 +Severity=Success +Facility=System +SymbolicName=APPERR2_4605 +Language=English +Kilobytes received%0 +. +Language=Russian +Kilobytes received%0 +. + +MessageId=4606 +Severity=Success +Facility=System +SymbolicName=APPERR2_4606 +Language=English +Mean response time (msec)%0 +. +Language=Russian +Mean response time (msec)%0 +. + +MessageId=4607 +Severity=Success +Facility=System +SymbolicName=APPERR2_4607 +Language=English +Network errors%0 +. +Language=Russian +Network errors%0 +. + +MessageId=4608 +Severity=Success +Facility=System +SymbolicName=APPERR2_4608 +Language=English +Files accessed%0 +. +Language=Russian +Files accessed%0 +. + +MessageId=4609 +Severity=Success +Facility=System +SymbolicName=APPERR2_4609 +Language=English +Print jobs spooled%0 +. +Language=Russian +Print jobs spooled%0 +. + +MessageId=4610 +Severity=Success +Facility=System +SymbolicName=APPERR2_4610 +Language=English +System errors%0 +. +Language=Russian +System errors%0 +. + +MessageId=4611 +Severity=Success +Facility=System +SymbolicName=APPERR2_4611 +Language=English +Password violations%0 +. +Language=Russian +Password violations%0 +. + +MessageId=4612 +Severity=Success +Facility=System +SymbolicName=APPERR2_4612 +Language=English +Permission violations%0 +. +Language=Russian +Permission violations%0 +. + +MessageId=4613 +Severity=Success +Facility=System +SymbolicName=APPERR2_4613 +Language=English +Communication devices accessed%0 +. +Language=Russian +Communication devices accessed%0 +. + +MessageId=4614 +Severity=Success +Facility=System +SymbolicName=APPERR2_4614 +Language=English +Sessions started%0 +. +Language=Russian +Sessions started%0 +. + +MessageId=4615 +Severity=Success +Facility=System +SymbolicName=APPERR2_4615 +Language=English +Sessions reconnected%0 +. +Language=Russian +Sessions reconnected%0 +. + +MessageId=4616 +Severity=Success +Facility=System +SymbolicName=APPERR2_4616 +Language=English +Sessions starts failed%0 +. +Language=Russian +Sessions starts failed%0 +. + +MessageId=4617 +Severity=Success +Facility=System +SymbolicName=APPERR2_4617 +Language=English +Sessions disconnected%0 +. +Language=Russian +Sessions disconnected%0 +. + +MessageId=4618 +Severity=Success +Facility=System +SymbolicName=APPERR2_4618 +Language=English +Network I/O's performed%0 +. +Language=Russian +Network I/O's performed%0 +. + +MessageId=4619 +Severity=Success +Facility=System +SymbolicName=APPERR2_4619 +Language=English +Files and pipes accessed%0 +. +Language=Russian +Files and pipes accessed%0 +. + +MessageId=4620 +Severity=Success +Facility=System +SymbolicName=APPERR2_4620 +Language=English +Times buffers exhausted +. +Language=Russian +Times buffers exhausted +. + +MessageId=4621 +Severity=Success +Facility=System +SymbolicName=APPERR2_4621 +Language=English +Big buffers%0 +. +Language=Russian +Big buffers%0 +. + +MessageId=4622 +Severity=Success +Facility=System +SymbolicName=APPERR2_4622 +Language=English +Request buffers%0 +. +Language=Russian +Request buffers%0 +. + +MessageId=4623 +Severity=Success +Facility=System +SymbolicName=APPERR2_4623 +Language=English +Workstation Statistics for \\\\%1 +. +Language=Russian +Workstation Statistics for \\\\%1 +. + +MessageId=4624 +Severity=Success +Facility=System +SymbolicName=APPERR2_4624 +Language=English +Server Statistics for \\\\%1 +. +Language=Russian +Server Statistics for \\\\%1 +. + +MessageId=4625 +Severity=Success +Facility=System +SymbolicName=APPERR2_4625 +Language=English +Statistics since %1 +. +Language=Russian +Statistics since %1 +. + +MessageId=4626 +Severity=Success +Facility=System +SymbolicName=APPERR2_4626 +Language=English +Connections made%0 +. +Language=Russian +Connections made%0 +. + +MessageId=4627 +Severity=Success +Facility=System +SymbolicName=APPERR2_4627 +Language=English +Connections failed%0 +. +Language=Russian +Connections failed%0 +. + +MessageId=4630 +Severity=Success +Facility=System +SymbolicName=APPERR2_4630 +Language=English +Bytes received%0 +. +Language=Russian +Bytes received%0 +. + +MessageId=4631 +Severity=Success +Facility=System +SymbolicName=APPERR2_4631 +Language=English +Server Message Blocks (SMBs) received%0 +. +Language=Russian +Server Message Blocks (SMBs) received%0 +. + +MessageId=4632 +Severity=Success +Facility=System +SymbolicName=APPERR2_4632 +Language=English +Bytes transmitted%0 +. +Language=Russian +Bytes transmitted%0 +. + +MessageId=4633 +Severity=Success +Facility=System +SymbolicName=APPERR2_4633 +Language=English +Server Message Blocks (SMBs) transmitted%0 +. +Language=Russian +Server Message Blocks (SMBs) transmitted%0 +. + +MessageId=4634 +Severity=Success +Facility=System +SymbolicName=APPERR2_4634 +Language=English +Read operations%0 +. +Language=Russian +Read operations%0 +. + +MessageId=4635 +Severity=Success +Facility=System +SymbolicName=APPERR2_4635 +Language=English +Write operations%0 +. +Language=Russian +Write operations%0 +. + +MessageId=4636 +Severity=Success +Facility=System +SymbolicName=APPERR2_4636 +Language=English +Raw reads denied%0 +. +Language=Russian +Raw reads denied%0 +. + +MessageId=4637 +Severity=Success +Facility=System +SymbolicName=APPERR2_4637 +Language=English +Raw writes denied%0 +. +Language=Russian +Raw writes denied%0 +. + +MessageId=4638 +Severity=Success +Facility=System +SymbolicName=APPERR2_4638 +Language=English +Network errors%0 +. +Language=Russian +Network errors%0 +. + +MessageId=4639 +Severity=Success +Facility=System +SymbolicName=APPERR2_4639 +Language=English +Connections made%0 +. +Language=Russian +Connections made%0 +. + +MessageId=4640 +Severity=Success +Facility=System +SymbolicName=APPERR2_4640 +Language=English +Reconnections made%0 +. +Language=Russian +Reconnections made%0 +. + +MessageId=4641 +Severity=Success +Facility=System +SymbolicName=APPERR2_4641 +Language=English +Server disconnects%0 +. +Language=Russian +Server disconnects%0 +. + +MessageId=4642 +Severity=Success +Facility=System +SymbolicName=APPERR2_4642 +Language=English +Sessions started%0 +. +Language=Russian +Sessions started%0 +. + +MessageId=4643 +Severity=Success +Facility=System +SymbolicName=APPERR2_4643 +Language=English +Hung sessions%0 +. +Language=Russian +Hung sessions%0 +. + +MessageId=4644 +Severity=Success +Facility=System +SymbolicName=APPERR2_4644 +Language=English +Failed sessions%0 +. +Language=Russian +Failed sessions%0 +. + +MessageId=4645 +Severity=Success +Facility=System +SymbolicName=APPERR2_4645 +Language=English +Failed operations%0 +. +Language=Russian +Failed operations%0 +. + +MessageId=4646 +Severity=Success +Facility=System +SymbolicName=APPERR2_4646 +Language=English +Use count%0 +. +Language=Russian +Use count%0 +. + +MessageId=4647 +Severity=Success +Facility=System +SymbolicName=APPERR2_4647 +Language=English +Failed use count%0 +. +Language=Russian +Failed use count%0 +. + +MessageId=4650 +Severity=Success +Facility=System +SymbolicName=APPERR2_4650 +Language=English +%1 was deleted successfully. +. +Language=Russian +%1 was deleted successfully. +. + +MessageId=4651 +Severity=Success +Facility=System +SymbolicName=APPERR2_4651 +Language=English +%1 was used successfully. +. +Language=Russian +%1 was used successfully. +. + +MessageId=4652 +Severity=Success +Facility=System +SymbolicName=APPERR2_4652 +Language=English +The message was successfully sent to %1. +. +Language=Russian +The message was successfully sent to %1. +. + +MessageId=4653 +Severity=Success +Facility=System +SymbolicName=APPERR2_4653 +Language=English +The message name %1 was forwarded successfully. +. +Language=Russian +The message name %1 was forwarded successfully. +. + +MessageId=4654 +Severity=Success +Facility=System +SymbolicName=APPERR2_4654 +Language=English +The message name %1 was added successfully. +. +Language=Russian +The message name %1 was added successfully. +. + +MessageId=4655 +Severity=Success +Facility=System +SymbolicName=APPERR2_4655 +Language=English +The message name forwarding was successfully canceled. +. +Language=Russian +The message name forwarding was successfully canceled. +. + +MessageId=4656 +Severity=Success +Facility=System +SymbolicName=APPERR2_4656 +Language=English +%1 was shared successfully. +. +Language=Russian +%1 was shared successfully. +. + +MessageId=4657 +Severity=Success +Facility=System +SymbolicName=APPERR2_4657 +Language=English +The server %1 successfully logged you on as %2. +. +Language=Russian +The server %1 successfully logged you on as %2. +. + +MessageId=4658 +Severity=Success +Facility=System +SymbolicName=APPERR2_4658 +Language=English +%1 was logged off successfully. +. +Language=Russian +%1 was logged off successfully. +. + +MessageId=4659 +Severity=Success +Facility=System +SymbolicName=APPERR2_4659 +Language=English +%1 was successfully removed from the list of shares the Server creates\n +on startup. +. +Language=Russian +%1 was successfully removed from the list of shares the Server creates\n +on startup. +. + +MessageId=4661 +Severity=Success +Facility=System +SymbolicName=APPERR2_4661 +Language=English +The password was changed successfully. +. +Language=Russian +The password was changed successfully. +. + +MessageId=4662 +Severity=Success +Facility=System +SymbolicName=APPERR2_4662 +Language=English +%1 file(s) copied. +. +Language=Russian +%1 file(s) copied. +. + +MessageId=4663 +Severity=Success +Facility=System +SymbolicName=APPERR2_4663 +Language=English +%1 file(s) moved. +. +Language=Russian +%1 file(s) moved. +. + +MessageId=4664 +Severity=Success +Facility=System +SymbolicName=APPERR2_4664 +Language=English +The message was successfully sent to all users of the network. +. +Language=Russian +The message was successfully sent to all users of the network. +. + +MessageId=4665 +Severity=Success +Facility=System +SymbolicName=APPERR2_4665 +Language=English +The message was successfully sent to domain %1. +. +Language=Russian +The message was successfully sent to domain %1. +. + +MessageId=4666 +Severity=Success +Facility=System +SymbolicName=APPERR2_4666 +Language=English +The message was successfully sent to all users of this server. +. +Language=Russian +The message was successfully sent to all users of this server. +. + +MessageId=4667 +Severity=Success +Facility=System +SymbolicName=APPERR2_4667 +Language=English +The message was successfully sent to group *%1. +. +Language=Russian +The message was successfully sent to group *%1. +. + +MessageId=4695 +Severity=Success +Facility=System +SymbolicName=APPERR2_4695 +Language=English +Microsoft LAN Manager Version %1 +. +Language=Russian +Microsoft LAN Manager Version %1 +. + +MessageId=4696 +Severity=Success +Facility=System +SymbolicName=APPERR2_4696 +Language=English +ReactOS Server +. +Language=Russian +ReactOS Server +. + +MessageId=4697 +Severity=Success +Facility=System +SymbolicName=APPERR2_4697 +Language=English +ReactOS Workstation +. +Language=Russian +ReactOS Workstation +. + +MessageId=4698 +Severity=Success +Facility=System +SymbolicName=APPERR2_4698 +Language=English +MS-DOS Enhanced Workstation +. +Language=Russian +MS-DOS Enhanced Workstation +. + +MessageId=4699 +Severity=Success +Facility=System +SymbolicName=APPERR2_4699 +Language=English +Created at %1 +. +Language=Russian +Created at %1 +. + ;

1 0

[reactos] 01/01: [REGTEST.CMD] Start tests with the correct current dir
by Giannis Adamopoulos 28 Nov '18

28 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fae68532dce03d8770192… commit fae68532dce03d8770192a005753d65e54d540a4 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Nov 28 08:41:09 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Nov 28 11:41:18 2018 +0200 [REGTEST.CMD] Start tests with the correct current dir --- boot/bootdata/bootcdregtest/regtest.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/bootdata/bootcdregtest/regtest.cmd b/boot/bootdata/bootcdregtest/regtest.cmd index 049b00e299..29ea7becb2 100644 --- a/boot/bootdata/bootcdregtest/regtest.cmd +++ b/boot/bootdata/bootcdregtest/regtest.cmd @@ -11,4 +11,5 @@ if exist "C:\ReactOS\bin\AHKAppTests.cmd" ( ) dbgprint --process "ipconfig" +cd C:\ReactOS\bin start rosautotest /r /s /n

1 0

[reactos] 01/01: [IPHLPAPI_APITEST] CurrPorts seems to confirm that timestamp is really a timestamp
by Pierre Schweitzer 28 Nov '18

28 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73c06d09ff19cd8df6f1d… commit 73c06d09ff19cd8df6f1d7d5731622e89c169090 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Nov 28 08:26:55 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Nov 28 08:28:37 2018 +0100 [IPHLPAPI_APITEST] CurrPorts seems to confirm that timestamp is really a timestamp --- drivers/network/tcpip/tcpip/ninfo.c | 4 +-- .../iphlpapi/AllocateAndGetTcpExTable2FromStack.c | 29 +++++++--------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/drivers/network/tcpip/tcpip/ninfo.c b/drivers/network/tcpip/tcpip/ninfo.c index 3df5204d42..8ad01fb413 100644 --- a/drivers/network/tcpip/tcpip/ninfo.c +++ b/drivers/network/tcpip/tcpip/ninfo.c @@ -204,7 +204,7 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, } TcpRow.dwOwningPid = (DWORD)AddrFile->ProcessId; - TcpRow.liCreateTimestamp = AddrFile->CreationTime; /* FIXME: to check */ + TcpRow.liCreateTimestamp = AddrFile->CreationTime; if (AddrFile->Listener != NULL) { @@ -291,7 +291,7 @@ TDI_STATUS InfoTdiQueryGetConnectionUdpTable(PADDRESS_FILE AddrFile, UdpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address; UdpRow.dwLocalPort = AddrFile->Port; UdpRow.dwOwningPid = (DWORD)AddrFile->ProcessId; - UdpRow.liCreateTimestamp = AddrFile->CreationTime; /* FIXME: to check */ + UdpRow.liCreateTimestamp = AddrFile->CreationTime; UdpRow.dwFlags = 0; /* FIXME */ if (Class == TcpUdpClassOwner) { diff --git a/modules/rostests/apitests/iphlpapi/AllocateAndGetTcpExTable2FromStack.c b/modules/rostests/apitests/iphlpapi/AllocateAndGetTcpExTable2FromStack.c index 002d7d1909..1f49664fc1 100644 --- a/modules/rostests/apitests/iphlpapi/AllocateAndGetTcpExTable2FromStack.c +++ b/modules/rostests/apitests/iphlpapi/AllocateAndGetTcpExTable2FromStack.c @@ -24,7 +24,8 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) DWORD i; BOOLEAN Found; HINSTANCE hIpHlpApi; - SYSTEMTIME Creation; + FILETIME Creation; + LARGE_INTEGER CreationTime; DWORD Pid = GetCurrentProcessId(); hIpHlpApi = GetModuleHandleW(L"iphlpapi.dll"); @@ -47,7 +48,9 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) return; } - GetSystemTime(&Creation); + GetSystemTimeAsFileTime(&Creation); + CreationTime.LowPart = Creation.dwLowDateTime; + CreationTime.HighPart = Creation.dwHighDateTime; sock = socket(AF_INET, SOCK_STREAM, 0); if (sock == INVALID_SOCKET) @@ -258,17 +261,10 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) } else { - SYSTEMTIME SockTime; - ok(TcpTableOwnerMod->table[i].dwOwningPid == Pid, "Invalid owner\n"); - CopyMemory(&SockTime, &TcpTableOwnerMod->table[i].liCreateTimestamp, sizeof(SYSTEMTIME)); - ok(Creation.wYear == SockTime.wYear, "Invalid year\n"); - ok(Creation.wMonth == SockTime.wMonth, "Invalid month\n"); - ok(Creation.wDayOfWeek == SockTime.wDayOfWeek, "Invalid day of week\n"); - ok(Creation.wDay == SockTime.wDay, "Invalid day\n"); - ok(Creation.wHour == SockTime.wHour, "Invalid hour\n"); - ok(Creation.wMinute == SockTime.wMinute, "Invalid minute\n"); + ok(TcpTableOwnerMod->table[i].liCreateTimestamp.QuadPart >= CreationTime.QuadPart, "Invalid time\n"); + ok(TcpTableOwnerMod->table[i].liCreateTimestamp.QuadPart <= CreationTime.QuadPart + 60000000000LL, "Invalid time\n"); } HeapFree(GetProcessHeap(), 0, TcpTableOwnerMod); @@ -324,17 +320,10 @@ START_TEST(AllocateAndGetTcpExTable2FromStack) } else { - SYSTEMTIME SockTime; - ok(TcpTableOwnerMod->table[i].dwOwningPid == Pid, "Invalid owner\n"); - CopyMemory(&SockTime, &TcpTableOwnerMod->table[i].liCreateTimestamp, sizeof(SYSTEMTIME)); - ok(Creation.wYear == SockTime.wYear, "Invalid year\n"); - ok(Creation.wMonth == SockTime.wMonth, "Invalid month\n"); - ok(Creation.wDayOfWeek == SockTime.wDayOfWeek, "Invalid day of week\n"); - ok(Creation.wDay == SockTime.wDay, "Invalid day\n"); - ok(Creation.wHour == SockTime.wHour, "Invalid hour\n"); - ok(Creation.wMinute == SockTime.wMinute, "Invalid minute\n"); + ok(TcpTableOwnerMod->table[i].liCreateTimestamp.QuadPart >= CreationTime.QuadPart, "Invalid time\n"); + ok(TcpTableOwnerMod->table[i].liCreateTimestamp.QuadPart <= CreationTime.QuadPart + 60000000000LL, "Invalid time\n"); } HeapFree(GetProcessHeap(), 0, TcpTableOwnerMod);

1 0

[reactos] 04/04: [IPHLPAPI] Implement the *_TABLE_OWNER_MODULE_* in GetExtendedTcp/UdpTable() functions
by Pierre Schweitzer 27 Nov '18

27 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f87c88f6fe2376c3dfffd… commit f87c88f6fe2376c3dfffdb990d8e5a40eb303451 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 27 23:11:06 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> 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_ */

1 0

[reactos] 03/04: [IPHLPAPI] Fix broken size computation leading to buffer overrun
by Pierre Schweitzer 27 Nov '18

27 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=159f5b676ab749064dfaf… commit 159f5b676ab749064dfafe60d712e979537d9a1a Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 27 22:57:30 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Nov 27 23:12:57 2018 +0100 [IPHLPAPI] Fix broken size computation leading to buffer overrun --- dll/win32/iphlpapi/ipstats_reactos.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index f26c43a4fe..84351ea9a0 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -1015,7 +1015,7 @@ PMIB_TCPTABLE_OWNER_MODULE getOwnerModTcpTable(void) IpOwnerModTcpTable = HeapAlloc ( GetProcessHeap(), 0, - sizeof(DWORD) + (sizeof(PMIB_TCPROW_OWNER_MODULE) * totalNumber) ); + sizeof(DWORD) + (sizeof(MIB_TCPROW_OWNER_MODULE) * totalNumber) ); if (!IpOwnerModTcpTable) { closeTcpFile(tcpFile); return NULL; @@ -1034,7 +1034,7 @@ PMIB_TCPTABLE_OWNER_MODULE getOwnerModTcpTable(void) CO_TL_ENTITY, entitySet[i].tei_instance, 0, - sizeof(PMIB_TCPROW_OWNER_MODULE), + sizeof(MIB_TCPROW_OWNER_MODULE), (PVOID *)&AdapterOwnerModTcpTable, &returnSize );

1 0

[reactos] 02/04: [IPHLPAPI] Implement getOwnerModUdpTable() and getOwnerModTcpTable()
by Pierre Schweitzer 27 Nov '18

27 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=559297fe818147587aa00… commit 559297fe818147587aa00a6062ebf0bee2e091f2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 27 22:38:21 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Nov 27 23:12:56 2018 +0100 [IPHLPAPI] Implement getOwnerModUdpTable() and getOwnerModTcpTable() These allow to enumerate UDP and TCP connections with module information --- dll/win32/iphlpapi/ipstats_reactos.c | 122 +++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index 8c1c842c9c..f26c43a4fe 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -761,6 +761,67 @@ PMIB_UDPTABLE_OWNER_PID getOwnerUdpTable(void) return IpOwnerUdpTable; } +PMIB_UDPTABLE_OWNER_MODULE getOwnerModUdpTable(void) +{ + DWORD numEntities, returnSize; + TDIEntityID *entitySet; + HANDLE tcpFile; + int i, totalNumber, TmpIdx, CurrIdx = 0; + NTSTATUS status; + PMIB_UDPTABLE_OWNER_MODULE IpOwnerModUdpTable = NULL; + PMIB_UDPROW_OWNER_MODULE AdapterOwnerModUdpTable = NULL; + + TRACE("called.\n"); + + totalNumber = getNumUdpEntries(); + + status = openTcpFile( &tcpFile, FILE_READ_DATA ); + if( !NT_SUCCESS(status) ) { + ERR("openTcpFile returned 0x%08lx\n", status); + return 0; + } + + IpOwnerModUdpTable = HeapAlloc + ( GetProcessHeap(), 0, + sizeof(DWORD) + (sizeof(MIB_UDPROW_OWNER_MODULE) * totalNumber) ); + if (!IpOwnerModUdpTable) { + closeTcpFile(tcpFile); + return NULL; + } + + status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); + + for( i = 0; i < numEntities; i++ ) { + if( entitySet[i].tei_entity == CL_TL_ENTITY && + hasArp( tcpFile, &entitySet[i] ) ) { + + status = tdiGetSetOfThings( tcpFile, + INFO_CLASS_PROTOCOL, + INFO_TYPE_PROVIDER, + IP_SPECIFIC_MODULE_ENTRY_ID, + CL_TL_ENTITY, + entitySet[i].tei_instance, + 0, + sizeof(MIB_UDPROW_OWNER_MODULE), + (PVOID *)&AdapterOwnerModUdpTable, + &returnSize ); + + if( status == STATUS_SUCCESS ) { + for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ ) + IpOwnerModUdpTable->table[CurrIdx] = AdapterOwnerModUdpTable[TmpIdx]; + tdiFreeThingSet( AdapterOwnerModUdpTable ); + } + } + } + + closeTcpFile( tcpFile ); + + tdiFreeThingSet( entitySet ); + IpOwnerModUdpTable->dwNumEntries = CurrIdx; + + return IpOwnerModUdpTable; +} + DWORD getNumTcpEntries(void) { DWORD numEntities; @@ -931,3 +992,64 @@ PMIB_TCPTABLE_OWNER_PID getOwnerTcpTable(void) return IpOwnerTcpTable; } + +PMIB_TCPTABLE_OWNER_MODULE getOwnerModTcpTable(void) +{ + DWORD numEntities, returnSize; + TDIEntityID *entitySet; + HANDLE tcpFile; + int i, totalNumber, TmpIdx, CurrIdx = 0; + NTSTATUS status; + PMIB_TCPTABLE_OWNER_MODULE IpOwnerModTcpTable = NULL; + PMIB_TCPROW_OWNER_MODULE AdapterOwnerModTcpTable = NULL; + + TRACE("called.\n"); + + totalNumber = getNumTcpEntries(); + + status = openTcpFile( &tcpFile, FILE_READ_DATA ); + if( !NT_SUCCESS(status) ) { + ERR("openTcpFile returned 0x%08lx\n", status); + return 0; + } + + IpOwnerModTcpTable = HeapAlloc + ( GetProcessHeap(), 0, + sizeof(DWORD) + (sizeof(PMIB_TCPROW_OWNER_MODULE) * totalNumber) ); + if (!IpOwnerModTcpTable) { + closeTcpFile(tcpFile); + return NULL; + } + + status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); + + for( i = 0; i < numEntities; i++ ) { + if( entitySet[i].tei_entity == CO_TL_ENTITY && + hasArp( tcpFile, &entitySet[i] ) ) { + + status = tdiGetSetOfThings( tcpFile, + INFO_CLASS_PROTOCOL, + INFO_TYPE_PROVIDER, + IP_SPECIFIC_MODULE_ENTRY_ID, + CO_TL_ENTITY, + entitySet[i].tei_instance, + 0, + sizeof(PMIB_TCPROW_OWNER_MODULE), + (PVOID *)&AdapterOwnerModTcpTable, + &returnSize ); + + if( status == STATUS_SUCCESS ) { + for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ ) + IpOwnerModTcpTable->table[CurrIdx] = AdapterOwnerModTcpTable[TmpIdx]; + tdiFreeThingSet( AdapterOwnerModTcpTable ); + } + } + } + + closeTcpFile( tcpFile ); + + tdiFreeThingSet( entitySet ); + IpOwnerModTcpTable->dwNumEntries = CurrIdx; + + return IpOwnerModTcpTable; +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs