Ros-diffs November 2018

ros-diffs@reactos.org

29 participants
250 discussions

[reactos] 08/14: [NETSTAT] Add support for displaying TCP connections owning process
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b5507336017cdea726f1… commit 2b5507336017cdea726f146a225823a932df54c2 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 21:04:20 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:10 2018 +0100 [NETSTAT] Add support for displaying TCP connections owning process --- base/applications/network/netstat/netstat.c | 47 +++++++++++++++++++++++------ base/applications/network/netstat/netstat.h | 1 + 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/base/applications/network/netstat/netstat.c b/base/applications/network/netstat/netstat.c index 296e6dfe3f..6695777d62 100644 --- a/base/applications/network/netstat/netstat.c +++ b/base/applications/network/netstat/netstat.c @@ -134,6 +134,9 @@ BOOL ParseCmdline(int argc, char* argv[]) case 's' : bDoShowProtoStats = TRUE; break; + case 'o' : + bDoShowProcessId = TRUE; + break; case 'v' : _tprintf(_T("got v\n")); bDoDispSeqComp = TRUE; @@ -161,6 +164,19 @@ BOOL ParseCmdline(int argc, char* argv[]) return EXIT_SUCCESS; } +/* + * Display table header + */ +VOID DisplayTableHeader() +{ + _tprintf(_T("\n Proto Local Address Foreign Address State")); + if (bDoShowProcessId) + _tprintf(_T(" Process\n")); + else + _tprintf(_T("\n")); +} + + /* * Simulate Microsofts netstat utility output */ @@ -168,7 +184,7 @@ BOOL DisplayOutput() { if (bNoOptions) { - _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + DisplayTableHeader(); ShowTcpTable(); return EXIT_SUCCESS; } @@ -212,14 +228,14 @@ BOOL DisplayOutput() if (bDoShowProtoStats) ShowTcpStatistics(); _tprintf(_T("\nActive Connections\n")); - _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + DisplayTableHeader(); ShowTcpTable(); break; case UDP : if (bDoShowProtoStats) ShowUdpStatistics(); _tprintf(_T("\nActive Connections\n")); - _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + DisplayTableHeader(); ShowUdpTable(); break; default : @@ -237,7 +253,7 @@ BOOL DisplayOutput() else { _tprintf(_T("\nActive Connections\n")); - _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + DisplayTableHeader(); ShowTcpTable(); if (bDoShowAllCons) ShowUdpTable(); @@ -408,22 +424,23 @@ VOID ShowEthernetStatistics() VOID ShowTcpTable() { - PMIB_TCPTABLE tcpTable; + PMIB_TCPTABLE_OWNER_PID tcpTable; DWORD error, dwSize; DWORD i; CHAR HostIp[HOSTNAMELEN], HostPort[PORTNAMELEN]; CHAR RemoteIp[HOSTNAMELEN], RemotePort[PORTNAMELEN]; CHAR Host[ADDRESSLEN]; CHAR Remote[ADDRESSLEN]; + CHAR PID[64]; /* Get the table of TCP endpoints */ - dwSize = sizeof (MIB_TCPTABLE); + dwSize = sizeof (MIB_TCPTABLE_OWNER_PID); /* Should also work when we get new connections between 2 GetTcpTable() * calls: */ do { - tcpTable = (PMIB_TCPTABLE) HeapAlloc(GetProcessHeap(), 0, dwSize); - error = GetTcpTable(tcpTable, &dwSize, TRUE); + tcpTable = (PMIB_TCPTABLE_OWNER_PID) HeapAlloc(GetProcessHeap(), 0, dwSize); + error = GetExtendedTcpTable(tcpTable, &dwSize, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0); if ( error != NO_ERROR ) HeapFree(GetProcessHeap(), 0, tcpTable); } @@ -461,8 +478,17 @@ VOID ShowTcpTable() sprintf(Remote, "%s:%s", RemoteIp, RemotePort); } - _tprintf(_T(" %-6s %-22s %-22s %s\n"), _T("TCP"), - Host, Remote, TcpState[tcpTable->table[i].dwState]); + if (bDoShowProcessId) + { + sprintf(PID, "%ld", tcpTable->table[i].dwOwningPid); + } + else + { + PID[0] = 0; + } + + _tprintf(_T(" %-6s %-22s %-22s %-11s %s\n"), _T("TCP"), + Host, Remote, TcpState[tcpTable->table[i].dwState], PID); } } HeapFree(GetProcessHeap(), 0, tcpTable); @@ -600,6 +626,7 @@ VOID Usage() " -s Displays per-protocol statistics. By default, Statistics are\n" " shown for IP, ICMP, TCP and UDP;\n" " the -p option may be used to specify a subset of the default.\n" + " -o Displays the process ID for each connection.\n" " interval Redisplays selected statistics every 'interval' seconds.\n" " Press CTRL+C to stop redisplaying. By default netstat will\n" " print the current information only once.\n")); diff --git a/base/applications/network/netstat/netstat.h b/base/applications/network/netstat/netstat.h index e57b89d184..0f3a94d0e7 100644 --- a/base/applications/network/netstat/netstat.h +++ b/base/applications/network/netstat/netstat.h @@ -13,6 +13,7 @@ BOOL bDoShowNumbers = FALSE; // -n BOOL bDoShowProtoCons = FALSE; // -p BOOL bDoShowRouteTable = FALSE; // -r BOOL bDoShowProtoStats = FALSE; // -s +BOOL bDoShowProcessId = FALSE; // -o BOOL bDoDispSeqComp = FALSE; // -v BOOL bLoopOutput = FALSE; // interval

1 0

[reactos] 07/14: [IPHLPAPI] Reimplement GetTcpTable() using GetExtendedTcpTable()
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73c87d5c1431d09b42ad6… commit 73c87d5c1431d09b42ad60094dee1ce9eb4107b8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 20:41:16 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:09 2018 +0100 [IPHLPAPI] Reimplement GetTcpTable() using GetExtendedTcpTable() --- dll/win32/iphlpapi/iphlpapi_main.c | 127 +++++++++++++++---------------------- 1 file changed, 50 insertions(+), 77 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index 404c1b7851..a0e83aee4d 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -794,7 +794,27 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO return ret; } -static int TcpTableSorter(const void *a, const void *b); +static int TcpTableSorter(const void *a, const void *b) +{ + int ret; + + if (a && b) { + PMIB_TCPROW rowA = (PMIB_TCPROW)a, rowB = (PMIB_TCPROW)b; + + ret = rowA->dwLocalAddr - rowB->dwLocalAddr; + if (ret == 0) { + ret = rowA->dwLocalPort - rowB->dwLocalPort; + if (ret == 0) { + ret = rowA->dwRemoteAddr - rowB->dwRemoteAddr; + if (ret == 0) + ret = rowA->dwRemotePort - rowB->dwRemotePort; + } + } + } + else + ret = 0; + return ret; +} /****************************************************************** * GetExtendedTcpTable (IPHLPAPI.@) @@ -835,8 +855,30 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U switch (TableClass) { case TCP_TABLE_BASIC_ALL: - ret = GetTcpTable(pTcpTable, pdwSize, bOrder); - break; + { + PMIB_TCPTABLE pOurTcpTable = getTcpTable(); + PMIB_TCPTABLE pTheirTcpTable = pTcpTable; + + if (pOurTcpTable) + { + if (sizeof(DWORD) + pOurTcpTable->dwNumEntries * sizeof(MIB_TCPROW) > *pdwSize || !pTheirTcpTable) + { + *pdwSize = sizeof(DWORD) + pOurTcpTable->dwNumEntries * sizeof(MIB_TCPROW); + ret = ERROR_INSUFFICIENT_BUFFER; + } + else + { + memcpy(pTheirTcpTable, pOurTcpTable, sizeof(DWORD) + pOurTcpTable->dwNumEntries * sizeof(MIB_TCPROW)); + + if (bOrder) + qsort(pTheirTcpTable->table, pTheirTcpTable->dwNumEntries, + sizeof(MIB_TCPROW), TcpTableSorter); + } + + free(pOurTcpTable); + } + } + break; case TCP_TABLE_BASIC_CONNECTIONS: { @@ -853,9 +895,9 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U } } - if (sizeof(MIB_TCPTABLE) + count * sizeof(MIB_TCPROW) > *pdwSize || !pTheirTcpTable) + if (sizeof(DWORD) + count * sizeof(MIB_TCPROW) > *pdwSize || !pTheirTcpTable) { - *pdwSize = sizeof(MIB_TCPTABLE) + count * sizeof(MIB_TCPROW); + *pdwSize = sizeof(DWORD) + count * sizeof(MIB_TCPROW); ret = ERROR_INSUFFICIENT_BUFFER; } else @@ -897,9 +939,9 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U } } - if (sizeof(MIB_TCPTABLE) + count * sizeof(MIB_TCPROW) > *pdwSize || !pTheirTcpTable) + if (sizeof(DWORD) + count * sizeof(MIB_TCPROW) > *pdwSize || !pTheirTcpTable) { - *pdwSize = sizeof(MIB_TCPTABLE) + count * sizeof(MIB_TCPROW); + *pdwSize = sizeof(DWORD) + count * sizeof(MIB_TCPROW); ret = ERROR_INSUFFICIENT_BUFFER; } else @@ -1989,29 +2031,6 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats) } -static int TcpTableSorter(const void *a, const void *b) -{ - int ret; - - if (a && b) { - PMIB_TCPROW rowA = (PMIB_TCPROW)a, rowB = (PMIB_TCPROW)b; - - ret = rowA->dwLocalAddr - rowB->dwLocalAddr; - if (ret == 0) { - ret = rowA->dwLocalPort - rowB->dwLocalPort; - if (ret == 0) { - ret = rowA->dwRemoteAddr - rowB->dwRemoteAddr; - if (ret == 0) - ret = rowA->dwRemotePort - rowB->dwRemotePort; - } - } - } - else - ret = 0; - return ret; -} - - /****************************************************************** * GetTcpTable (IPHLPAPI.@) * @@ -2036,53 +2055,7 @@ static int TcpTableSorter(const void *a, const void *b) */ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) { - DWORD ret = ERROR_NO_DATA; - - TRACE("pTcpTable %p, pdwSize %p, bOrder %d\n", pTcpTable, pdwSize, - (DWORD)bOrder); - if (!pdwSize) - ret = ERROR_INVALID_PARAMETER; - else { - DWORD numEntries = getNumTcpEntries(); - DWORD size = sizeof(MIB_TCPTABLE); - - if (numEntries > 1) - size += (numEntries - 1) * sizeof(MIB_TCPROW); - if (!pTcpTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - PMIB_TCPTABLE pOurTcpTable = getTcpTable(); - if (pOurTcpTable) - { - size = sizeof(MIB_TCPTABLE); - if (pOurTcpTable->dwNumEntries > 1) - size += (pOurTcpTable->dwNumEntries - 1) * sizeof(MIB_TCPROW); - - if (*pdwSize < size) - { - *pdwSize = size; - - ret = ERROR_INSUFFICIENT_BUFFER; - } - else - { - memcpy(pTcpTable, pOurTcpTable, size); - - if (bOrder) - qsort(pTcpTable->table, pTcpTable->dwNumEntries, - sizeof(MIB_TCPROW), TcpTableSorter); - - ret = NO_ERROR; - } - - free(pOurTcpTable); - } - } - } - TRACE("returning %d\n", ret); - return ret; + return GetExtendedTcpTable(pTcpTable, pdwSize, bOrder, AF_INET, TCP_TABLE_BASIC_ALL, 0); }

1 0

[reactos] 06/14: [IPHLPAPI] Don't leak memory
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d76ac645e8ca4d6deb0c6… commit d76ac645e8ca4d6deb0c673400da74069505ce7b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 20:34:20 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:09 2018 +0100 [IPHLPAPI] Don't leak memory --- dll/win32/iphlpapi/iphlpapi_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index 2792be25a0..404c1b7851 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -876,6 +876,8 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U qsort(pTheirTcpTable->table, pTheirTcpTable->dwNumEntries, sizeof(MIB_TCPROW), TcpTableSorter); } + + free(pOurTcpTable); } } break; @@ -918,6 +920,8 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U qsort(pTheirTcpTable->table, pTheirTcpTable->dwNumEntries, sizeof(MIB_TCPROW), TcpTableSorter); } + + free(pOurTcpTable); } } break; @@ -943,6 +947,8 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U qsort(pTheirTcpTable->table, pTheirTcpTable->dwNumEntries, sizeof(MIB_TCPROW_OWNER_PID), TcpTableSorter); } + + free(pOurTcpTable); } } break; @@ -986,6 +992,8 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U qsort(pTheirTcpTable->table, pTheirTcpTable->dwNumEntries, sizeof(MIB_TCPROW_OWNER_PID), TcpTableSorter); } + + free(pOurTcpTable); } } break; @@ -1029,6 +1037,8 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U qsort(pTheirTcpTable->table, pTheirTcpTable->dwNumEntries, sizeof(MIB_TCPROW_OWNER_PID), TcpTableSorter); } + + free(pOurTcpTable); } } break;

1 0

[reactos] 05/14: [IPHLPAPI] Implement the IPv4 TCP_TABLE_OWNER_PID_* cases in GetExtendedTcpTable()
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c949a12506046b0aa9bc7… commit c949a12506046b0aa9bc74e6a8fa1dabefcecba7 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 20:32:55 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:09 2018 +0100 [IPHLPAPI] Implement the IPv4 TCP_TABLE_OWNER_PID_* cases in GetExtendedTcpTable() --- dll/win32/iphlpapi/iphlpapi_main.c | 111 +++++++++++++++++++++++++++++++++++++ dll/win32/iphlpapi/ipstats.h | 5 ++ 2 files changed, 116 insertions(+) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index bff2ea7088..2792be25a0 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -922,6 +922,117 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U } break; + case TCP_TABLE_OWNER_PID_ALL: + { + PMIB_TCPTABLE_OWNER_PID pOurTcpTable = getOwnerTcpTable(); + PMIB_TCPTABLE_OWNER_PID pTheirTcpTable = pTcpTable; + + if (pOurTcpTable) + { + if (sizeof(DWORD) + pOurTcpTable->dwNumEntries * sizeof(MIB_TCPROW_OWNER_PID) > *pdwSize || !pTheirTcpTable) + { + *pdwSize = sizeof(DWORD) + pOurTcpTable->dwNumEntries * sizeof(MIB_TCPROW_OWNER_PID); + ret = ERROR_INSUFFICIENT_BUFFER; + } + else + { + memcpy(pTheirTcpTable, pOurTcpTable, sizeof(DWORD) + pOurTcpTable->dwNumEntries * sizeof(MIB_TCPROW_OWNER_PID)); + + /* Don't sort on PID, so use basic helper */ + if (bOrder) + qsort(pTheirTcpTable->table, pTheirTcpTable->dwNumEntries, + sizeof(MIB_TCPROW_OWNER_PID), TcpTableSorter); + } + } + } + break; + + case TCP_TABLE_OWNER_PID_CONNECTIONS: + { + PMIB_TCPTABLE_OWNER_PID pOurTcpTable = getOwnerTcpTable(); + PMIB_TCPTABLE_OWNER_PID 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_PID) > *pdwSize || !pTheirTcpTable) + { + *pdwSize = sizeof(DWORD) + count * sizeof(MIB_TCPROW_OWNER_PID); + 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_PID)); + ++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_PID), TcpTableSorter); + } + } + } + break; + + case TCP_TABLE_OWNER_PID_LISTENER: + { + PMIB_TCPTABLE_OWNER_PID pOurTcpTable = getOwnerTcpTable(); + PMIB_TCPTABLE_OWNER_PID 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_PID) > *pdwSize || !pTheirTcpTable) + { + *pdwSize = sizeof(DWORD) + count * sizeof(MIB_TCPROW_OWNER_PID); + 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_PID)); + ++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_PID), TcpTableSorter); + } + } + } + break; + default: UNIMPLEMENTED; ret = ERROR_INVALID_PARAMETER; diff --git a/dll/win32/iphlpapi/ipstats.h b/dll/win32/iphlpapi/ipstats.h index 428bafc3a2..1fd51574c3 100644 --- a/dll/win32/iphlpapi/ipstats.h +++ b/dll/win32/iphlpapi/ipstats.h @@ -105,4 +105,9 @@ DWORD getNumTcpEntries(void); */ PMIB_TCPTABLE getTcpTable(void); +/* Allocates and returns to you the TCP state table with owner PID, + * or NULL if it can't allocate enough memory. free() the returned table. + */ +PMIB_TCPTABLE_OWNER_PID getOwnerTcpTable(void); + #endif /* ndef WINE_IPSTATS_H_ */

1 0

[reactos] 04/14: [IPHLPAPI] Implement getOwnerTcpTable(), to get TCP connections with owner PID
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dca7e5689ff1f885a67bf… commit dca7e5689ff1f885a67bf98058136c1d3c15d7b9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 20:23:29 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:09 2018 +0100 [IPHLPAPI] Implement getOwnerTcpTable(), to get TCP connections with owner PID --- dll/win32/iphlpapi/ipstats_reactos.c | 61 ++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index d8ec38f32b..d117a5f4ce 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -809,3 +809,64 @@ PMIB_TCPTABLE getTcpTable(void) return IpTcpTable; } + +PMIB_TCPTABLE_OWNER_PID getOwnerTcpTable(void) +{ + DWORD numEntities, returnSize; + TDIEntityID *entitySet; + HANDLE tcpFile; + int i, totalNumber, TmpIdx, CurrIdx = 0; + NTSTATUS status; + PMIB_TCPTABLE_OWNER_PID IpOwnerTcpTable = NULL; + PMIB_TCPROW_OWNER_PID AdapterOwnerTcpTable = 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; + } + + IpOwnerTcpTable = HeapAlloc + ( GetProcessHeap(), 0, + sizeof(DWORD) + (sizeof(MIB_TCPROW_OWNER_PID) * totalNumber) ); + if (!IpOwnerTcpTable) { + 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_MIB_ADDRTABLE_ENTRY_ID, + CO_TL_ENTITY, + entitySet[i].tei_instance, + 0, + sizeof(MIB_TCPROW_OWNER_PID), + (PVOID *)&AdapterOwnerTcpTable, + &returnSize ); + + if( status == STATUS_SUCCESS ) { + for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ ) + IpOwnerTcpTable->table[CurrIdx] = AdapterOwnerTcpTable[TmpIdx]; + tdiFreeThingSet( AdapterOwnerTcpTable ); + } + } + } + + closeTcpFile( tcpFile ); + + tdiFreeThingSet( entitySet ); + IpOwnerTcpTable->dwNumEntries = CurrIdx; + + return IpOwnerTcpTable; +}

1 0

[reactos] 03/14: [TCPIP] Implement enumerating TCP connections with owner PID
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=411504b5f4a56443233c8… commit 411504b5f4a56443233c8acc9247851448dcf544 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 20:22:00 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:09 2018 +0100 [TCPIP] Implement enumerating TCP connections with owner PID --- drivers/network/tcpip/include/info.h | 3 ++- drivers/network/tcpip/tcpip/info.c | 17 +++++++++++------ drivers/network/tcpip/tcpip/ninfo.c | 23 +++++++++++++++++------ 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/drivers/network/tcpip/include/info.h b/drivers/network/tcpip/include/info.h index 8c1625d5af..c0998db479 100644 --- a/drivers/network/tcpip/include/info.h +++ b/drivers/network/tcpip/include/info.h @@ -116,7 +116,8 @@ TDI_STATUS InfoTdiQueryGetRouteTable( PIP_INTERFACE IF, TDI_STATUS InfoTdiQueryGetConnectionTcpTable( PADDRESS_FILE AddrFile, PNDIS_BUFFER Buffer, - PUINT BufferSize); + PUINT BufferSize, + BOOLEAN Extended); TDI_STATUS InfoTdiQueryGetConnectionUdpTable( PADDRESS_FILE AddrFile, PNDIS_BUFFER Buffer, diff --git a/drivers/network/tcpip/tcpip/info.c b/drivers/network/tcpip/tcpip/info.c index e642bf1dc1..e29d415a7a 100644 --- a/drivers/network/tcpip/tcpip/info.c +++ b/drivers/network/tcpip/tcpip/info.c @@ -260,14 +260,19 @@ TDI_STATUS InfoTdiQueryInformationEx( return TDI_INVALID_PARAMETER; case IP_MIB_ADDRTABLE_ENTRY_ID: - if (ID->toi_entity.tei_entity != CL_NL_ENTITY && - ID->toi_entity.tei_entity != CO_NL_ENTITY) - return TDI_INVALID_PARAMETER; - if (ID->toi_type != INFO_TYPE_PROVIDER) return TDI_INVALID_PARAMETER; - return InfoTdiQueryGetAddrTable(ID->toi_entity, Buffer, BufferSize); + if (ID->toi_entity.tei_entity == CL_NL_ENTITY || + ID->toi_entity.tei_entity == CO_NL_ENTITY) + return InfoTdiQueryGetAddrTable(ID->toi_entity, Buffer, BufferSize); + else if (ID->toi_entity.tei_entity == CO_TL_ENTITY) + if ((EntityListContext = GetContext(ID->toi_entity))) + return InfoTdiQueryGetConnectionTcpTable(EntityListContext, Buffer, BufferSize, TRUE); + else + return TDI_INVALID_PARAMETER; + else + return TDI_INVALID_PARAMETER; case IP_MIB_ARPTABLE_ENTRY_ID: if (ID->toi_type != INFO_TYPE_PROVIDER) @@ -287,7 +292,7 @@ TDI_STATUS InfoTdiQueryInformationEx( return TDI_INVALID_PARAMETER; else if (ID->toi_entity.tei_entity == CO_TL_ENTITY) if ((EntityListContext = GetContext(ID->toi_entity))) - return InfoTdiQueryGetConnectionTcpTable(EntityListContext, Buffer, BufferSize); + return InfoTdiQueryGetConnectionTcpTable(EntityListContext, Buffer, BufferSize, FALSE); else return TDI_INVALID_PARAMETER; else if (ID->toi_entity.tei_entity == CL_TL_ENTITY) diff --git a/drivers/network/tcpip/tcpip/ninfo.c b/drivers/network/tcpip/tcpip/ninfo.c index d45b4bb1e5..63d1d124c4 100644 --- a/drivers/network/tcpip/tcpip/ninfo.c +++ b/drivers/network/tcpip/tcpip/ninfo.c @@ -181,15 +181,26 @@ TDI_STATUS InfoTdiQueryGetIPSnmpInfo( TDIEntityID ID, TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, PNDIS_BUFFER Buffer, - PUINT BufferSize) + PUINT BufferSize, + BOOLEAN Extended) { - MIB_TCPROW TcpRow; + SIZE_T Size; + MIB_TCPROW_OWNER_PID TcpRow; TDI_STATUS Status = TDI_SUCCESS; TI_DbgPrint(DEBUG_INFO, ("Called.\n")); TcpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address; TcpRow.dwLocalPort = AddrFile->Port; + TcpRow.dwOwningPid = (DWORD)AddrFile->ProcessId; + if (Extended) + { + Size = sizeof(MIB_TCPROW_OWNER_PID); + } + else + { + Size = sizeof(MIB_TCPROW); + } if (AddrFile->Listener != NULL) { @@ -197,7 +208,7 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, EndPoint = AddrFile->Listener->AddressFile; - TcpRow.State = MIB_TCP_STATE_LISTEN; + TcpRow.dwState = MIB_TCP_STATE_LISTEN; TcpRow.dwRemoteAddr = EndPoint->Address.Address.IPv4Address; TcpRow.dwRemotePort = EndPoint->Port; } @@ -215,19 +226,19 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, TcpRow.dwRemotePort = ntohs(EndPoint.Address[0].Address[0].sin_port); } - Status = TCPGetSocketStatus(AddrFile->Connection, (PULONG)&TcpRow.State); + Status = TCPGetSocketStatus(AddrFile->Connection, &TcpRow.dwState); ASSERT(NT_SUCCESS(Status)); } else { - TcpRow.State = 0; + TcpRow.dwState = 0; TcpRow.dwRemoteAddr = 0; TcpRow.dwRemotePort = 0; } if (NT_SUCCESS(Status)) { - Status = InfoCopyOut( (PCHAR)&TcpRow, sizeof(TcpRow), + Status = InfoCopyOut( (PCHAR)&TcpRow, Size, Buffer, BufferSize ); }

1 0

[reactos] 02/14: [TCPIP] Store creator PID in ADDRESS_FILE
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=935978ee57da95bcfcc6a… commit 935978ee57da95bcfcc6aadaaf248a7176083897 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 20:21:19 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:09 2018 +0100 [TCPIP] Store creator PID in ADDRESS_FILE --- drivers/network/tcpip/include/titypes.h | 1 + drivers/network/tcpip/tcpip/fileobjs.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/network/tcpip/include/titypes.h b/drivers/network/tcpip/include/titypes.h index 8d0f428260..5ca137bf89 100644 --- a/drivers/network/tcpip/include/titypes.h +++ b/drivers/network/tcpip/include/titypes.h @@ -154,6 +154,7 @@ typedef struct _ADDRESS_FILE { /* Associated listener (see transport/tcp/accept.c) */ IP_ADDRESS AddrCache; /* One entry address cache (destination address of last packet transmitted) */ + HANDLE ProcessId; /* Creator process ID */ /* The following members are used to control event notification */ diff --git a/drivers/network/tcpip/tcpip/fileobjs.c b/drivers/network/tcpip/tcpip/fileobjs.c index 313e9d1ee6..c637150158 100644 --- a/drivers/network/tcpip/tcpip/fileobjs.c +++ b/drivers/network/tcpip/tcpip/fileobjs.c @@ -424,6 +424,7 @@ NTSTATUS FileOpenAddress( AddrFile->DF = 0; AddrFile->BCast = 1; AddrFile->HeaderIncl = 1; + AddrFile->ProcessId = PsGetCurrentProcessId(); /* Make sure address is a local unicast address or 0 */ /* FIXME: IPv4 only */

1 0

[reactos] 01/14: [IPHLPAPI] Implement the IPv4 TCP_TABLE_BASIC_* cases in GetExtendedTcpTable()
by Pierre Schweitzer 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=702d44c683c1289a0e023… commit 702d44c683c1289a0e023022c8f63aaafb939c1b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Nov 24 19:04:04 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Nov 24 21:41:08 2018 +0100 [IPHLPAPI] Implement the IPv4 TCP_TABLE_BASIC_* cases in GetExtendedTcpTable() --- dll/win32/iphlpapi/iphlpapi_main.c | 116 ++++++++++++++++++++++++++++++++++--- 1 file changed, 107 insertions(+), 9 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index c06796f6d8..bff2ea7088 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -794,6 +794,8 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO return ret; } +static int TcpTableSorter(const void *a, const void *b); + /****************************************************************** * GetExtendedTcpTable (IPHLPAPI.@) * @@ -816,20 +818,116 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, ULONG ulAf, TCP_TABLE_CLASS TableClass, ULONG Reserved) { + DWORD i, count; DWORD ret = NO_ERROR; - if (TableClass == TCP_TABLE_OWNER_PID_ALL) { - if (*pdwSize == 0) { - *pdwSize = sizeof(MIB_TCPTABLE_OWNER_PID); - return ERROR_INSUFFICIENT_BUFFER; - } else { - ZeroMemory(pTcpTable, sizeof(MIB_TCPTABLE_OWNER_PID)); - return NO_ERROR; + if (!pdwSize) + { + return ERROR_INVALID_PARAMETER; } - } + if (ulAf != AF_INET) + { + UNIMPLEMENTED; + return ERROR_INVALID_PARAMETER; + } + + switch (TableClass) + { + case TCP_TABLE_BASIC_ALL: + ret = GetTcpTable(pTcpTable, pdwSize, bOrder); + break; + + case TCP_TABLE_BASIC_CONNECTIONS: + { + PMIB_TCPTABLE pOurTcpTable = getTcpTable(); + PMIB_TCPTABLE pTheirTcpTable = pTcpTable; + + if (pOurTcpTable) + { + for (i = 0, count = 0; i < pOurTcpTable->dwNumEntries; ++i) + { + if (pOurTcpTable->table[i].State != MIB_TCP_STATE_LISTEN) + { + ++count; + } + } + + if (sizeof(MIB_TCPTABLE) + count * sizeof(MIB_TCPROW) > *pdwSize || !pTheirTcpTable) + { + *pdwSize = sizeof(MIB_TCPTABLE) + count * sizeof(MIB_TCPROW); + ret = ERROR_INSUFFICIENT_BUFFER; + } + else + { + pTheirTcpTable->dwNumEntries = count; + + for (i = 0, count = 0; i < pOurTcpTable->dwNumEntries; ++i) + { + if (pOurTcpTable->table[i].State != MIB_TCP_STATE_LISTEN) + { + memcpy(&pTheirTcpTable->table[count], &pOurTcpTable->table[i], sizeof(MIB_TCPROW)); + ++count; + } + } + ASSERT(count == pTheirTcpTable->dwNumEntries); + + if (bOrder) + qsort(pTheirTcpTable->table, pTheirTcpTable->dwNumEntries, + sizeof(MIB_TCPROW), TcpTableSorter); + } + } + } + break; + + case TCP_TABLE_BASIC_LISTENER: + { + PMIB_TCPTABLE pOurTcpTable = getTcpTable(); + PMIB_TCPTABLE pTheirTcpTable = pTcpTable; + + if (pOurTcpTable) + { + for (i = 0, count = 0; i < pOurTcpTable->dwNumEntries; ++i) + { + if (pOurTcpTable->table[i].State == MIB_TCP_STATE_LISTEN) + { + ++count; + } + } + + if (sizeof(MIB_TCPTABLE) + count * sizeof(MIB_TCPROW) > *pdwSize || !pTheirTcpTable) + { + *pdwSize = sizeof(MIB_TCPTABLE) + count * sizeof(MIB_TCPROW); + ret = ERROR_INSUFFICIENT_BUFFER; + } + else + { + pTheirTcpTable->dwNumEntries = count; + + for (i = 0, count = 0; i < pOurTcpTable->dwNumEntries; ++i) + { + if (pOurTcpTable->table[i].State == MIB_TCP_STATE_LISTEN) + { + memcpy(&pTheirTcpTable->table[count], &pOurTcpTable->table[i], sizeof(MIB_TCPROW)); + ++count; + } + } + ASSERT(count == pTheirTcpTable->dwNumEntries); + + if (bOrder) + qsort(pTheirTcpTable->table, pTheirTcpTable->dwNumEntries, + sizeof(MIB_TCPROW), TcpTableSorter); + } + } + } + break; + + default: + UNIMPLEMENTED; + ret = ERROR_INVALID_PARAMETER; + break; + } - UNIMPLEMENTED; return ret; }

1 0

[reactos] 01/01: [MC] Add messages 3802-3969 and 5700-5729 to netmsg.dll.
by Eric Kohl 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ded2783906b6ed457d28c… commit ded2783906b6ed457d28cc102c0b691f7b31c411 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 24 13:51:50 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 24 13:51:50 2018 +0100 [MC] Add messages 3802-3969 and 5700-5729 to netmsg.dll. --- sdk/include/reactos/mc/netmsgmsg.mc | 1004 ++++++++++++++++++++++++++++++++++- 1 file changed, 1003 insertions(+), 1 deletion(-) diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc index 0ed78ade9e..e6f73fbd93 100644 --- a/sdk/include/reactos/mc/netmsgmsg.mc +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -7274,6 +7274,570 @@ Language=Russian The system could not find message: %1. . +MessageId=3802 +Severity=Success +Facility=System +SymbolicName=APPERR_3802 +Language=English +This schedule date is invalid. +. +Language=Russian +This schedule date is invalid. +. + +MessageId=3803 +Severity=Success +Facility=System +SymbolicName=APPERR_3803 +Language=English +The LANMAN root directory is unavailable. +. +Language=Russian +The LANMAN root directory is unavailable. +. + +MessageId=3804 +Severity=Success +Facility=System +SymbolicName=APPERR_3804 +Language=English +The SCHED.LOG file could not be opened. +. +Language=Russian +The SCHED.LOG file could not be opened. +. + +MessageId=3805 +Severity=Success +Facility=System +SymbolicName=APPERR_3805 +Language=English +The Server service has not been started. +. +Language=Russian +The Server service has not been started. +. + +MessageId=3806 +Severity=Success +Facility=System +SymbolicName=APPERR_3806 +Language=English +The AT job ID does not exist. +. +Language=Russian +The AT job ID does not exist. +. + +MessageId=3807 +Severity=Success +Facility=System +SymbolicName=APPERR_3807 +Language=English +The AT schedule file is corrupted. +. +Language=Russian +The AT schedule file is corrupted. +. + +MessageId=3808 +Severity=Success +Facility=System +SymbolicName=APPERR_3808 +Language=English +The delete failed due to a problem with the AT schedule file. +. +Language=Russian +The delete failed due to a problem with the AT schedule file. +. + +MessageId=3809 +Severity=Success +Facility=System +SymbolicName=APPERR_3809 +Language=English +The command line cannot exceed 259 characters. +. +Language=Russian +The command line cannot exceed 259 characters. +. + +MessageId=3810 +Severity=Success +Facility=System +SymbolicName=APPERR_3810 +Language=English +The AT schedule file could not be updated because the disk is full. +. +Language=Russian +The AT schedule file could not be updated because the disk is full. +. + +MessageId=3812 +Severity=Success +Facility=System +SymbolicName=APPERR_3812 +Language=English +The AT schedule file is invalid. Please delete the file and create a new one. +. +Language=Russian +The AT schedule file is invalid. Please delete the file and create a new one. +. + +MessageId=3813 +Severity=Success +Facility=System +SymbolicName=APPERR_3813 +Language=English +The AT schedule file was deleted. +. +Language=Russian +The AT schedule file was deleted. +. + +MessageId=3814 +Severity=Success +Facility=System +SymbolicName=APPERR_3814 +Language=English +The syntax of this command is:\n\n +AT [id] [/DELETE]\n +AT time [/EVERY:date | /NEXT:date] command\n\n +The AT command schedules a program command to run at a\n +later date and time on a server. It also displays the\n +list of programs and commands scheduled to be run.\n\n +You can specify the date as M,T,W,Th,F,Sa,Su or 1-31\n +for the day of the month.\n\n +You can specify the time in the 24 hour HH:MM format. +. +Language=Russian +The syntax of this command is:\n\n +AT [id] [/DELETE]\n +AT time [/EVERY:date | /NEXT:date] command\n\n +The AT command schedules a program command to run at a\n +later date and time on a server. It also displays the\n +list of programs and commands scheduled to be run.\n\n +You can specify the date as M,T,W,Th,F,Sa,Su or 1-31\n +for the day of the month.\n\n +You can specify the time in the 24 hour HH:MM format. +. + +MessageId=3815 +Severity=Success +Facility=System +SymbolicName=APPERR_3815 +Language=English +The AT command has timed-out.\n +Please try again later. +. +Language=Russian +The AT command has timed-out.\n +Please try again later. +. + +MessageId=3816 +Severity=Success +Facility=System +SymbolicName=APPERR_3816 +Language=English +The minimum password age for user accounts cannot be greater\n +than the maximum password age. +. +Language=Russian +The minimum password age for user accounts cannot be greater\n +than the maximum password age. +. + +MessageId=3817 +Severity=Success +Facility=System +SymbolicName=APPERR_3817 +Language=English +You have specified a value that is incompatible\n +with servers with down-level software. Please specify a lower value. +. +Language=Russian +You have specified a value that is incompatible\n +with servers with down-level software. Please specify a lower value. +. + +MessageId=3870 +Severity=Success +Facility=System +SymbolicName=APPERR_3870 +Language=English +%1 is not a valid computer name. +. +Language=Russian +%1 is not a valid computer name. +. + +MessageId=3871 +Severity=Success +Facility=System +SymbolicName=APPERR_3871 +Language=English +%1 is not a valid Windows network message number. +. +Language=Russian +%1 is not a valid Windows network message number. +. + +MessageId=3900 +Severity=Success +Facility=System +SymbolicName=APPERR_3900 +Language=English +Message from %1 to %2 on %3 +. +Language=Russian +Message from %1 to %2 on %3 +. + +MessageId=3901 +Severity=Success +Facility=System +SymbolicName=APPERR_3901 +Language=English +**** +. +Language=Russian +**** +. + +MessageId=3902 +Severity=Success +Facility=System +SymbolicName=APPERR_3902 +Language=English +**** unexpected end of message **** +. +Language=Russian +**** unexpected end of message **** +. + +MessageId=3905 +Severity=Success +Facility=System +SymbolicName=APPERR_3905 +Language=English +Press ESC to exit +. +Language=Russian +Press ESC to exit +. + +MessageId=3906 +Severity=Success +Facility=System +SymbolicName=APPERR_3906 +Language=English +... +. +Language=Russian +... +. + +MessageId=3910 +Severity=Success +Facility=System +SymbolicName=APPERR_3910 +Language=English +Current time at %1 is %2 +. +Language=Russian +Current time at %1 is %2 +. + +MessageId=3911 +Severity=Success +Facility=System +SymbolicName=APPERR_3911 +Language=English +The current local clock is %1\n +Do you want to set the local computer's time to match the\n +time at %2? %3: %0 +. +Language=Russian +Do you want to set the local computer's time to match the\n +time at %2? %3: %0 +. + +MessageId=3912 +Severity=Success +Facility=System +SymbolicName=APPERR_3912 +Language=English +Could not locate a time-server. +. +Language=Russian +Could not locate a time-server. +. + +MessageId=3913 +Severity=Success +Facility=System +SymbolicName=APPERR_3913 +Language=English +Could not find the domain controller for domain %1. +. +Language=Russian +Could not find the domain controller for domain %1. +. + +MessageId=3914 +Severity=Success +Facility=System +SymbolicName=APPERR_3914 +Language=English +Local time (GMT%3) at %1 is %2 +. +Language=Russian +Local time (GMT%3) at %1 is %2 +. + +MessageId=3915 +Severity=Success +Facility=System +SymbolicName=APPERR_3915 +Language=English +The user's home directory could not be determined. +. +Language=Russian +The user's home directory could not be determined. +. + +MessageId=3916 +Severity=Success +Facility=System +SymbolicName=APPERR_3916 +Language=English +The user's home directory has not been specified. +. +Language=Russian +The user's home directory has not been specified. +. + +MessageId=3917 +Severity=Success +Facility=System +SymbolicName=APPERR_3917 +Language=English +The name specified for the user's home directory (%1) is not a universal naming convention (UNC) name. +. +Language=Russian +The name specified for the user's home directory (%1) is not a universal naming convention (UNC) name. +. + +MessageId=3918 +Severity=Success +Facility=System +SymbolicName=APPERR_3918 +Language=English +Drive %1 is now connected to %2. Your home directory is %3\\%4. +. +Language=Russian +Drive %1 is now connected to %2. Your home directory is %3\\%4. +. + +MessageId=3919 +Severity=Success +Facility=System +SymbolicName=APPERR_3919 +Language=English +Drive %1 is now connected to %2. +. +Language=Russian +Drive %1 is now connected to %2. +. + +MessageId=3920 +Severity=Success +Facility=System +SymbolicName=APPERR_3920 +Language=English +There are no available drive letters left. +. +Language=Russian +There are no available drive letters left. +. + +MessageId=3932 +Severity=Success +Facility=System +SymbolicName=APPERR_3932 +Language=English +%1 is not a valid domain or workgroup name. +. +Language=Russian +%1 is not a valid domain or workgroup name. +. + +MessageId=3935 +Severity=Success +Facility=System +SymbolicName=APPERR_3935 +Language=English +The current SNTP value is: %1 +. +Language=Russian +The current SNTP value is: %1 +. + +MessageId=3936 +Severity=Success +Facility=System +SymbolicName=APPERR_3936 +Language=English +This computer is not currently configured to use a specific SNTP server. +. +Language=Russian +This computer is not currently configured to use a specific SNTP server. +. + +MessageId=3937 +Severity=Success +Facility=System +SymbolicName=APPERR_3937 +Language=English +This current autoconfigured SNTP value is: %1 +. +Language=Russian +This current autoconfigured SNTP value is: %1 +. + +MessageId=3951 +Severity=Success +Facility=System +SymbolicName=APPERR_3951 +Language=English +You specified too many values for the %1 option. +. +Language=Russian +You specified too many values for the %1 option. +. + +MessageId=3952 +Severity=Success +Facility=System +SymbolicName=APPERR_3952 +Language=English +You entered an invalid value for the %1 option. +. +Language=Russian +You entered an invalid value for the %1 option. +. + +MessageId=3953 +Severity=Success +Facility=System +SymbolicName=APPERR_3953 +Language=English +The syntax is incorrect. +. +Language=Russian +The syntax is incorrect. +. + +MessageId=3960 +Severity=Success +Facility=System +SymbolicName=APPERR_3960 +Language=English +You specified an invalid file number. +. +Language=Russian +You specified an invalid file number. +. + +MessageId=3961 +Severity=Success +Facility=System +SymbolicName=APPERR_3961 +Language=English +You specified an invalid print job number. +. +Language=Russian +You specified an invalid print job number. +. + +MessageId=3963 +Severity=Success +Facility=System +SymbolicName=APPERR_3963 +Language=English +The user or group account specified cannot be found. +. +Language=Russian +The user or group account specified cannot be found. +. + +MessageId=3965 +Severity=Success +Facility=System +SymbolicName=APPERR_3965 +Language=English +The user was added but could not be enabled for File and Print\n +Services for NetWare. +. +Language=Russian +The user was added but could not be enabled for File and Print\n +Services for NetWare. +. + +MessageId=3966 +Severity=Success +Facility=System +SymbolicName=APPERR_3966 +Language=English +File and Print Services for NetWare is not installed. +. +Language=Russian +File and Print Services for NetWare is not installed. +. + +MessageId=3967 +Severity=Success +Facility=System +SymbolicName=APPERR_3967 +Language=English +Cannot set user properties for File and Print Services for NetWare. +. +Language=Russian +Cannot set user properties for File and Print Services for NetWare. +. + +MessageId=3968 +Severity=Success +Facility=System +SymbolicName=APPERR_3968 +Language=English +Password for %1 is: %2 +. +Language=Russian +Password for %1 is: %2 +. + +MessageId=3969 +Severity=Success +Facility=System +SymbolicName=APPERR_3969 +Language=English +NetWare compatible logon +. +Language=Russian +NetWare compatible logon +. + +; +; apperr2.h (non-public) message difinitions (4300 - 5299 APPERR2_BASE) +; + + +; +; ncberr.h (non-public) nessage definitions (5300 - 5499 NRCERR_BASE) +; + ; ; alertmsg.h (non-public) message definitions (5500 - 5549 ALERT2_BASE) @@ -7578,4 +8142,442 @@ An internal error occurred while accessing the computer's\nlocal or network secu ; ; lmerrlog.h messages definitions (5700 - 5899 ERRLOG2_BASE) -; \ No newline at end of file +; + +MessageId=5700 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonSSIInitError +Language=English +The Netlogon service could not initialize the replication data\n +structures successfully. The service was terminated. The following\n +error occurred: %n%1 +. +Language=Russian +The Netlogon service could not initialize the replication data\n +structures successfully. The service was terminated. The following\n +error occurred: %n%1 +. + +MessageId=5701 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonFailedToUpdateTrustList +Language=English +The Netlogon service failed to update the domain trust list. The\n +following error occurred: %n%1 +. +Language=Russian +The Netlogon service failed to update the domain trust list. The\n +following error occurred: %n%1 +. + +MessageId=5702 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonFailedToAddRpcInterface +Language=English +The Netlogon service could not add the RPC interface. The\n +service was terminated. The following error occurred: %n%1 +. +Language=Russian +The Netlogon service could not add the RPC interface. The\n +service was terminated. The following error occurred: %n%1 +. + +MessageId=5703 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonFailedToReadMailslot +Language=English +The Netlogon service could not read a mailslot message from %1 due\n +to the following error: %n%2 +. +Language=Russian +The Netlogon service could not read a mailslot message from %1 due\n +to the following error: %n%2 +. + +MessageId=5704 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonFailedToRegisterSC +Language=English +The Netlogon service failed to register the service with the\n +service controller. The service was terminated. The following\n +error occurred: %n%1 +. +Language=Russian +The Netlogon service failed to register the service with the\n +service controller. The service was terminated. The following\n +error occurred: %n%1 +. + +MessageId=5705 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonChangeLogCorrupt +Language=English +The change log cache maintained by the Netlogon service for %1\n +database changes is inconsistent. The Netlogon service is resetting\n +the change log. +. +Language=Russian +The change log cache maintained by the Netlogon service for %1\n +database changes is inconsistent. The Netlogon service is resetting\n +the change log. +. + +MessageId=5706 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonFailedToCreateShare +Language=English +The Netlogon service could not create server share %1. The following\n +error occurred: %n%2 +. +Language=Russian +The Netlogon service could not create server share %1. The following\n +error occurred: %n%2 +. + +MessageId=5707 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonDownLevelLogonFailed +Language=English +The down-level logon request for the user %1 from %2 failed. +. +Language=Russian +The down-level logon request for the user %1 from %2 failed. +. + +MessageId=5708 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonDownLevelLogoffFailed +Language=English +The down-level logoff request for the user %1 from %2 failed. +. +Language=Russian +The down-level logoff request for the user %1 from %2 failed. +. + +MessageId=5709 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonNTLogonFailed +Language=English +The Windows NT or Windows 2000 %1 logon request for the user %2\\%3 from %4 (via %5)\n +failed. +. +Language=Russian +The Windows NT or Windows 2000 %1 logon request for the user %2\\%3 from %4 (via %5)\n +failed. +. + +MessageId=5710 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonNTLogoffFailed +Language=English +The Windows NT or Windows 2000 %1 logoff request for the user %2\\%3 from %4\n +failed. +. +Language=Russian +The Windows NT or Windows 2000 %1 logoff request for the user %2\\%3 from %4\n +failed. +. + +MessageId=5711 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonPartialSyncCallSuccess +Language=English +The partial synchronization request from the server %1 completed\n +successfully. %2 changes(s) has(have) been returned to the\n +caller. +. +Language=Russian +The partial synchronization request from the server %1 completed\n +successfully. %2 changes(s) has(have) been returned to the\n +caller. +. + +MessageId=5712 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonPartialSyncCallFailed +Language=English +The partial synchronization request from the server %1 failed with\n +the following error: %n%2 +. +Language=Russian +The partial synchronization request from the server %1 failed with\n +the following error: %n%2 +. + +MessageId=5713 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonFullSyncCallSuccess +Language=English +The full synchronization request from the server %1 completed\n +successfully. %2 object(s) has(have) been returned to\n +the caller. +. +Language=Russian +The full synchronization request from the server %1 completed\n +successfully. %2 object(s) has(have) been returned to\n +the caller. +. + +MessageId=5714 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonFullSyncCallFailed +Language=English +The full synchronization request from the server %1 failed with\n +the following error: %n%2 +. +Language=Russian +The full synchronization request from the server %1 failed with\n +the following error: %n%2 +. + +MessageId=5715 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonPartialSyncSuccess +Language=English +The partial synchronization replication of the %1 database from the\n +primary domain controller %2 completed successfully. %3 change(s) is(are)\n +applied to the database. +. +Language=Russian +The partial synchronization replication of the %1 database from the\n +primary domain controller %2 completed successfully. %3 change(s) is(are)\n +applied to the database. +. + +MessageId=5716 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonPartialSyncFailed +Language=English +The partial synchronization replication of the %1 database from the\n +primary domain controller %2 failed with the following error: %n%3 +. +Language=Russian +The partial synchronization replication of the %1 database from the\n +primary domain controller %2 failed with the following error: %n%3 +. + +MessageId=5717 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonFullSyncSuccess +Language=English +The full synchronization replication of the %1 database from the\n +primary domain controller %2 completed successfully. +. +Language=Russian +The full synchronization replication of the %1 database from the\n +primary domain controller %2 completed successfully. +. + +MessageId=5718 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonFullSyncFailed +Language=English +The full synchronization replication of the %1 database from the\n +primary domain controller %2 failed with the following error: %n%3 +. +Language=Russian +The full synchronization replication of the %1 database from the\n +primary domain controller %2 failed with the following error: %n%3 +. + +MessageId=5719 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonAuthNoDomainController +Language=English +This computer was not able to set up a secure session with a domain\n +controller in domain %1 due to the following: %n%2\n +%nThis may lead to authentication problems. Make sure that this\n +computer is connected to the network. If the problem persists,\n +please contact your domain administrator.\n\n +%n%nADDITIONAL INFO\n +%nIf this computer is a domain controller for the specified domain, it\n +sets up the secure session to the primary domain controller emulator in the specified\n +domain. Otherwise, this computer sets up the secure session to any domain controller\n +in the specified domain. +. +Language=Russian +This computer was not able to set up a secure session with a domain\n +controller in domain %1 due to the following: %n%2\n +%nThis may lead to authentication problems. Make sure that this\n +computer is connected to the network. If the problem persists,\n +please contact your domain administrator.\n\n +%n%nADDITIONAL INFO\n +%nIf this computer is a domain controller for the specified domain, it\n +sets up the secure session to the primary domain controller emulator in the specified\n +domain. Otherwise, this computer sets up the secure session to any domain controller\n +in the specified domain. +. + +MessageId=5720 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonAuthNoTrustLsaSecret +Language=English +The session setup to the Domain Controller %1 for the domain %2\n +failed because the computer %3 does not have a local security database account. +. +Language=Russian +The session setup to the Domain Controller %1 for the domain %2\n +failed because the computer %3 does not have a local security database account. +. + +MessageId=5721 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonAuthNoTrustSamAccount +Language=English +The session setup to the Domain Controller %1 for the domain %2\n +failed because the Domain Controller did not have an account %4\n +needed to set up the session by this computer %3.\n\n%n%nADDITIONAL DATA\n +%nIf this computer is a member of or a Domain Controller in the specified domain, the\n +aforementioned account is a computer account for this computer in the specified domain.\n +Otherwise, the account is an interdomain trust account with the specified domain. +. +Language=Russian +The session setup to the Domain Controller %1 for the domain %2\n +failed because the Domain Controller did not have an account %4\n +needed to set up the session by this computer %3.\n\n%n%nADDITIONAL DATA\n +%nIf this computer is a member of or a Domain Controller in the specified domain, the\n +aforementioned account is a computer account for this computer in the specified domain.\n +Otherwise, the account is an interdomain trust account with the specified domain. +. + +MessageId=5722 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonServerAuthFailed +Language=English +The session setup from the computer %1 failed to authenticate.\n +The name(s) of the account(s) referenced in the security database is\n +%2. The following error occurred: %n%3 +. +Language=Russian +The session setup from the computer %1 failed to authenticate.\n +The name(s) of the account(s) referenced in the security database is\n +%2. The following error occurred: %n%3 +. + +MessageId=5723 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonServerAuthNoTrustSamAccount +Language=English +The session setup from computer '%1' failed because the security database\n +does not contain a trust account '%2' referenced by the specified computer.\n\n +%n%nUSER ACTION\n\n +%nIf this is the first occurrence of this event for the specified computer\n +and account, this may be a transient issue that doesn't require any action\n +at this time. Otherwise, the following steps may be taken to resolve this problem:\n\n +%n%nIf '%2' is a legitimate machine account for the computer '%1', then '%1'\n +should be rejoined to the domain.\n\n +%n%nIf '%2' is a legitimate interdomain trust account, then the trust should\n +be recreated.\n\n +%n%nOtherwise, assuming that '%2' is not a legitimate account, the following\n +action should be taken on '%1':\n\n +%n%nIf '%1' is a Domain Controller, then the trust associated with '%2' should be deleted.\n\n +%n%nIf '%1' is not a Domain Controller, it should be disjoined from the domain. +. +Language=Russian +The session setup from computer '%1' failed because the security database\n +does not contain a trust account '%2' referenced by the specified computer.\n\n +%n%nUSER ACTION\n\n +%nIf this is the first occurrence of this event for the specified computer\n +and account, this may be a transient issue that doesn't require any action\n +at this time. Otherwise, the following steps may be taken to resolve this problem:\n\n +%n%nIf '%2' is a legitimate machine account for the computer '%1', then '%1'\n +should be rejoined to the domain.\n\n +%n%nIf '%2' is a legitimate interdomain trust account, then the trust should\n +be recreated.\n\n +%n%nOtherwise, assuming that '%2' is not a legitimate account, the following\n +action should be taken on '%1':\n\n +%n%nIf '%1' is a Domain Controller, then the trust associated with '%2' should be deleted.\n\n +%n%nIf '%1' is not a Domain Controller, it should be disjoined from the domain. +. + +MessageId=5724 +Severity=Success +Facility=System +SymbolicName=NELOG_FailedToRegisterSC +Language=English +Could not register control handler with service controller %1. +. +Language=Russian +Could not register control handler with service controller %1. +. + +MessageId=5725 +Severity=Success +Facility=System +SymbolicName=NELOG_FailedToSetServiceStatus +Language=English +Could not set service status with service controller %1. +. +Language=Russian +Could not set service status with service controller %1. +. + +MessageId=5726 +Severity=Success +Facility=System +SymbolicName=NELOG_FailedToGetComputerName +Language=English +Could not find the computer name %1. +. +Language=Russian +Could not find the computer name %1. +. + +MessageId=5727 +Severity=Success +Facility=System +SymbolicName=NELOG_DriverNotLoaded +Language=English +Could not load %1 device driver. +. +Language=Russian +Could not load %1 device driver. +. + +MessageId=5728 +Severity=Success +Facility=System +SymbolicName=NELOG_NoTranportLoaded +Language=English +Could not load any transport. +. +Language=Russian +Could not load any transport. +. + +MessageId=5729 +Severity=Success +Facility=System +SymbolicName=NELOG_NetlogonFailedDomainDelta +Language=English +Replication of the %1 Domain Object \"%2\" from primary domain controller\n +%3 failed with the following error: %n%4 +. +Language=Russian +Replication of the %1 Domain Object \"%2\" from primary domain controller\n +%3 failed with the following error: %n%4 +.

1 0

[reactos] 01/01: [SETUPLIB] Improve the Freeldr timeout INI setting hack-fix. Dedicated to Mark Jansen ; -) CORE-15193
by Hermès Bélusca-Maïto 24 Nov '18

24 Nov '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a31d2f820a15ab5274c4f… commit a31d2f820a15ab5274c4f33838b2862b890e765d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 24 02:39:58 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Nov 24 02:45:03 2018 +0100 [SETUPLIB] Improve the Freeldr timeout INI setting hack-fix. Dedicated to Mark Jansen ;-) CORE-15193 --- base/setup/lib/utils/bldrsup.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/base/setup/lib/utils/bldrsup.c b/base/setup/lib/utils/bldrsup.c index 09c59945b7..4848831068 100644 --- a/base/setup/lib/utils/bldrsup.c +++ b/base/setup/lib/utils/bldrsup.c @@ -230,8 +230,7 @@ CreateCommonFreeLdrSections( /* Timeout=0 */ IniCacheInsertKey(BootStore->OptionsIniSection, NULL, INSERT_LAST, - // L"TimeOut", L"0"); // FIXME!! There is a bug in the INI parser where a given key can be inserted twice in the same section... - L"TimeOut", L"10"); + L"TimeOut", L"0"); /* Create "Display" section */ IniSection = IniCacheAppendSection(BootStore->IniCache, L"Display"); @@ -1237,7 +1236,7 @@ SetBootStoreOptions( RtlStringCchPrintfW(TimeoutStr, ARRAYSIZE(TimeoutStr), L"%d", BootOptions->Timeout); IniCacheInsertKey(((PBOOT_STORE_INI_CONTEXT)BootStore)->OptionsIniSection, - NULL, INSERT_LAST, + NULL, INSERT_FIRST, // INSERT_LAST, // FIXME!! There is a bug in the INI parser where a given key can be inserted twice in the same section... L"TimeOut", TimeoutStr); return STATUS_SUCCESS;

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2018