Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[gedmurphy] 18398: forgot the eol-style again.

by gedmurphy＠svn.reactos.com

forgot the eol-style again. Modified: trunk/reactos/apps/utils/net/netstat/netstat.h _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.h --- trunk/reactos/apps/utils/net/netstat/netstat.h 2005-10-10 17:49:19 UTC (rev 18397) +++ trunk/reactos/apps/utils/net/netstat/netstat.h 2005-10-10 17:51:30 UTC (rev 18398) @@ -1,61 +1,61 @@ - -// Maximum string lengths for ASCII ip address and port names -// -#define HOSTNAMELEN 256 -#define PORTNAMELEN 256 -#define ADDRESSLEN HOSTNAMELEN+PORTNAMELEN - -/* command line options */ -BOOL bNoOptions = FALSE; // print default -BOOL bDoShowAllCons = FALSE; // -a -BOOL bDoShowEthStats = FALSE; // -e -BOOL bDoShowNumbers = FALSE; // -n -BOOL bDoShowProtoCons = FALSE; // -p -BOOL bDoShowRouteTable = FALSE; // -r -BOOL bDoShowProtoStats = FALSE; // -s -BOOL bDoDispSeqComp = FALSE; // -v -BOOL bLoopOutput = FALSE; // interval - - -/* Undocumented extended information structures available only on XP and higher */ -typedef struct { - DWORD dwState; // state of the connection - DWORD dwLocalAddr; // address on local computer - DWORD dwLocalPort; // port number on local computer - DWORD dwRemoteAddr; // address on remote computer - DWORD dwRemotePort; // port number on remote computer - DWORD dwProcessId; -} MIB_TCPEXROW, *PMIB_TCPEXROW; - -typedef struct { - DWORD dwNumEntries; - MIB_TCPEXROW table; -} MIB_TCPEXTABLE, *PMIB_TCPEXTABLE; - -typedef struct { - DWORD dwLocalAddr; // address on local computer - DWORD dwLocalPort; // port number on local computer - DWORD dwProcessId; -} MIB_UDPEXROW, *PMIB_UDPEXROW; - -typedef struct { - DWORD dwNumEntries; - MIB_UDPEXROW table; -} MIB_UDPEXTABLE, *PMIB_UDPEXTABLE; - - -/* function declerations */ -BOOL ParseCmdline(int argc, char* argv[]); -BOOL DisplayOutput(VOID); -DWORD DoFormatMessage(DWORD ErrorCode); -VOID ShowIpStatistics(VOID); -VOID ShowIcmpStatistics(VOID); -VOID ShowTcpStatistics(VOID); -VOID ShowUdpStatistics(VOID); -VOID ShowEthernetStatistics(VOID); -VOID ShowTcpTable(VOID); -VOID ShowUdpTable(VOID); -PCHAR GetPortName(UINT port, PCHAR proto, PCHAR name, int namelen); -PCHAR GetIpHostName(BOOL local, UINT ipaddr, PCHAR name, int namelen); -VOID Usage(VOID); - + +// Maximum string lengths for ASCII ip address and port names +// +#define HOSTNAMELEN 256 +#define PORTNAMELEN 256 +#define ADDRESSLEN HOSTNAMELEN+PORTNAMELEN + +/* command line options */ +BOOL bNoOptions = FALSE; // print default +BOOL bDoShowAllCons = FALSE; // -a +BOOL bDoShowEthStats = FALSE; // -e +BOOL bDoShowNumbers = FALSE; // -n +BOOL bDoShowProtoCons = FALSE; // -p +BOOL bDoShowRouteTable = FALSE; // -r +BOOL bDoShowProtoStats = FALSE; // -s +BOOL bDoDispSeqComp = FALSE; // -v +BOOL bLoopOutput = FALSE; // interval + + +/* Undocumented extended information structures available only on XP and higher */ +typedef struct { + DWORD dwState; // state of the connection + DWORD dwLocalAddr; // address on local computer + DWORD dwLocalPort; // port number on local computer + DWORD dwRemoteAddr; // address on remote computer + DWORD dwRemotePort; // port number on remote computer + DWORD dwProcessId; +} MIB_TCPEXROW, *PMIB_TCPEXROW; + +typedef struct { + DWORD dwNumEntries; + MIB_TCPEXROW table; +} MIB_TCPEXTABLE, *PMIB_TCPEXTABLE; + +typedef struct { + DWORD dwLocalAddr; // address on local computer + DWORD dwLocalPort; // port number on local computer + DWORD dwProcessId; +} MIB_UDPEXROW, *PMIB_UDPEXROW; + +typedef struct { + DWORD dwNumEntries; + MIB_UDPEXROW table; +} MIB_UDPEXTABLE, *PMIB_UDPEXTABLE; + + +/* function declerations */ +BOOL ParseCmdline(int argc, char* argv[]); +BOOL DisplayOutput(VOID); +DWORD DoFormatMessage(DWORD ErrorCode); +VOID ShowIpStatistics(VOID); +VOID ShowIcmpStatistics(VOID); +VOID ShowTcpStatistics(VOID); +VOID ShowUdpStatistics(VOID); +VOID ShowEthernetStatistics(VOID); +VOID ShowTcpTable(VOID); +VOID ShowUdpTable(VOID); +PCHAR GetPortName(UINT port, PCHAR proto, PCHAR name, int namelen); +PCHAR GetIpHostName(BOOL local, UINT ipaddr, PCHAR name, int namelen); +VOID Usage(VOID); + Property changes on: trunk/reactos/apps/utils/net/netstat/netstat.h ___________________________________________________________________ Name: svn:eol-style + native

19 years, 2 months

[gedmurphy] 18397: Start of a rewrite for netstat.exe

by gedmurphy＠svn.reactos.com

Start of a rewrite for netstat.exe - Simulate the output of the MS netstat tool - implemented -a, -e, -n, -p, -r, -s and interval Modified: trunk/reactos/apps/utils/net/netstat/netstat.c Added: trunk/reactos/apps/utils/net/netstat/netstat.h Modified: trunk/reactos/apps/utils/net/netstat/netstat.xml Deleted: trunk/reactos/apps/utils/net/netstat/resource.h Deleted: trunk/reactos/apps/utils/net/netstat/trace.c Deleted: trunk/reactos/apps/utils/net/netstat/trace.h _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.c --- trunk/reactos/apps/utils/net/netstat/netstat.c 2005-10-10 15:42:08 UTC (rev 18396) +++ trunk/reactos/apps/utils/net/netstat/netstat.c 2005-10-10 17:49:19 UTC (rev 18397) @@ -1,254 +1,590 @@ /* - * netstat - display IP stack statistics. + * ReactOS Win32 Applications + * Copyright (C) 2005 ReactOS Team * - * This source code is in the PUBLIC DOMAIN and has NO WARRANTY. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * Robert Dickenson <robd(a)reactos.org>, August 15, 2002. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -// Extensive reference made and use of source to netstatp by: -// Copyright (C) 1998-2002 Mark Russinovich -// www.sysinternals.com +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS netstat utility + * FILE: apps/utils/net/netstat/netstat.c + * PURPOSE: display IP stack statistics + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 19/09/05 Created + * Some ideas/code taken from Rob Dickinson's original app + * + */ -#define ANY_SIZE 1 +/* + * TODO: + * rewrite DisplayOutput + * sort function return values. BOOL is crap + * implement -b, -o and -v + * clean up GetPortName and GetIpHostName + * command line parser needs more work + */ #include <windows.h> #include <winsock.h> #include <tchar.h> #include <stdio.h> -#include <ctype.h> -#include <time.h> - -#include <iptypes.h> -#include <ipexport.h> -#include <tlhelp32.h> #include <iphlpapi.h> -#include <snmp.h> +#include "netstat.h" -#include "trace.h" -#include "resource.h" +CHAR localname[HOSTNAMELEN], remotename[HOSTNAMELEN]; +CHAR remoteport[PORTNAMELEN], localport[PORTNAMELEN]; +CHAR localaddr[ADDRESSLEN], remoteaddr[ADDRESSLEN]; +enum ProtoType {IP, TCP, UDP, ICMP} Protocol; +DWORD Interval; /* time to pause between printing output */ -#define MAX_RESLEN 4000 - -// -// Possible TCP endpoint states -// -static char TcpState[][32] = { - "???", - "CLOSED", - "LISTENING", - "SYN_SENT", - "SYN_RCVD", - "ESTABLISHED", - "FIN_WAIT1", - "FIN_WAIT2", - "CLOSE_WAIT", - "CLOSING", - "LAST_ACK", - "TIME_WAIT", - "DELETE_TCB" +/* TCP endpoint states */ +TCHAR TcpState[][32] = { + _T("???"), + _T("CLOSED"), + _T("LISTENING"), + _T("SYN_SENT"), + _T("SYN_RCVD"), + _T("ESTABLISHED"), + _T("FIN_WAIT1"), + _T("FIN_WAIT2"), + _T("CLOSE_WAIT"), + _T("CLOSING"), + _T("LAST_ACK"), + _T("TIME_WAIT"), + _T("DELETE_TCB") }; -static VOID PrintError(DWORD ErrorCode) + +/* + * + * Parse command line parameters and set any options + * + */ +BOOL ParseCmdline(int argc, char* argv[]) { - LPVOID lpMsgBuf; + INT i; - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsgBuf, 0, NULL); - printf("%s\n", (TCHAR*)lpMsgBuf); - LocalFree(lpMsgBuf); + TCHAR Proto[5]; + + if ((argc == 1) || (isdigit(*argv[1]))) + bNoOptions = TRUE; + + /* Parse command line for options we have been given. */ + for (i = 1; i < argc; i++) + { + if ( (argc > 1)&&(argv[i][0] == '-') ) + { + TCHAR c; + + while ((c = *++argv[i]) != '\0') + { + switch (tolower(c)) + { + case 'a' : + //_tprintf(_T("got a\n")); + bDoShowAllCons = TRUE; + break; + case 'e' : + //_tprintf(_T("got e\n")); + bDoShowEthStats = TRUE; + break; + case 'n' : + //_tprintf(_T("got n\n")); + bDoShowNumbers = TRUE; + break; + case 's' : + //_tprintf(_T("got s\n")); + bDoShowProtoStats = TRUE; + break; + case 'p' : + //_tprintf(_T("got p\n")); + bDoShowProtoCons = TRUE; + + strncpy(Proto, (++argv)[i], sizeof(Proto)); + if (!_tcsicmp( "IP", Proto )) + Protocol = IP; + else if (!_tcsicmp( "ICMP", Proto )) + Protocol = ICMP; + else if (!_tcsicmp( "TCP", Proto )) + Protocol = TCP; + else if (!_tcsicmp( "UDP", Proto )) + Protocol = UDP; + else + { + Usage(); + return EXIT_FAILURE; + } + (--argv)[i]; /* move pointer back down to previous argv */ + break; + case 'r' : + bDoShowRouteTable = FALSE; + break; + case 'v' : + _tprintf(_T("got v\n")); + bDoDispSeqComp = TRUE; + break; + default : + Usage(); + return EXIT_FAILURE; + } + } + } + else if (isdigit(*argv[i])) + { + _stscanf(argv[i], "%lu", &Interval); + bLoopOutput = TRUE; + } +// else +// { +// Usage(); +// EXIT_FAILURE; +// } + } + + return EXIT_SUCCESS; } -#if 0 -static void ShowTcpStatistics() +/* Simulate Microsofts netstat utility output. It's a bit + * ugly and over nested, but it is a fairly acurate simulation + * It was easier for testing, I'll rewrite it later with flags + * For now, it works*/ +BOOL DisplayOutput() +// FIXME: This whole function needs rewriting { - MIB_TCPSTATS TcpStatsMIB; - GetTcpStatistics(&TcpStatsMIB); + if (bNoOptions) + { + _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + ShowTcpTable(); + return EXIT_SUCCESS; + } - _tprintf(_T("TCP/IP Statistics\t\n")); - _tprintf(_T(" time-out algorithm:\t\t%lu\n"), TcpStatsMIB.dwRtoAlgorithm); - _tprintf(_T(" minimum time-out:\t\t%lu\n"), TcpStatsMIB.dwRtoMin); - _tprintf(_T(" maximum time-out:\t\t%lu\n"), TcpStatsMIB.dwRtoMax); - _tprintf(_T(" maximum connections:\t\t%lu\n"), TcpStatsMIB.dwMaxConn); - _tprintf(_T(" active opens:\t\t\t%lu\n"), TcpStatsMIB.dwActiveOpens); - _tprintf(_T(" passive opens:\t\t\t%lu\n"), TcpStatsMIB.dwPassiveOpens); - _tprintf(_T(" failed attempts:\t\t%lu\n"), TcpStatsMIB.dwAttemptFails); - _tprintf(_T(" established connections reset:\t%lu\n"), TcpStatsMIB.dwEstabResets); - _tprintf(_T(" established connections:\t%lu\n"), TcpStatsMIB.dwCurrEstab); - _tprintf(_T(" segments received:\t\t%lu\n"), TcpStatsMIB.dwInSegs); - _tprintf(_T(" segment sent:\t\t\t%lu\n"), TcpStatsMIB.dwOutSegs); - _tprintf(_T(" segments retransmitted:\t\t%lu\n"), TcpStatsMIB.dwRetransSegs); - _tprintf(_T(" incoming errors:\t\t%lu\n"), TcpStatsMIB.dwInErrs); - _tprintf(_T(" outgoing resets:\t\t%lu\n"), TcpStatsMIB.dwOutRsts); - _tprintf(_T(" cumulative connections:\t\t%lu\n"), TcpStatsMIB.dwNumConns); + if (bDoShowEthStats) + { + ShowEthernetStatistics(); + return EXIT_SUCCESS; + } + + if (bDoShowRouteTable) + { + if (system("route print") == -1) + { + //mingw doesn't have lib for _tsystem + _tprintf(_T("cannot find 'route.exe'\n")); + return EXIT_FAILURE; + } + } + + /* output connections: -a */ + if (bDoShowAllCons) + { + /* filter out certain protocols: -p */ + if (bDoShowProtoCons) + { + /* do we want to list the stats: -s */ + if (bDoShowProtoStats) + { + switch (Protocol) + { + case IP : + ShowIpStatistics(); + break; + case ICMP : + ShowIcmpStatistics(); + break; + case TCP : + ShowTcpStatistics(); + _tprintf(_T("\nActive Connections\n")); + _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + ShowTcpTable(); + break; + case UDP : + ShowUdpStatistics(); + _tprintf(_T("\nActive Connections\n")); + _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + ShowUdpTable(); + break; + default : + break; + } + return EXIT_SUCCESS; + } + else + { + switch (Protocol) + { + case IP : + break; + case ICMP : + ShowIcmpStatistics(); + break; + case TCP : + _tprintf(_T("\nActive Connections\n")); + _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + ShowTcpTable(); + break; + case UDP : + _tprintf(_T("\nActive Connections\n")); + _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + ShowUdpTable(); + break; + default : + break; + } + return EXIT_SUCCESS; + } + + } + else + { + _tprintf(_T("\nActive Connections\n")); + _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + ShowTcpTable(); + ShowUdpTable(); + return EXIT_SUCCESS; + } + } + + /* do we want to list the stats: -s */ + if (bDoShowProtoStats) + { + if (bDoShowProtoCons) // -p + { + /* show individual protocols only */ + switch (Protocol) + { + case IP : + ShowIpStatistics(); + break; + case ICMP : + ShowIcmpStatistics(); + break; + case TCP : + ShowTcpStatistics(); + _tprintf(_T("\nActive Connections\n")); + _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + ShowTcpTable(); + break; + case UDP : + ShowUdpStatistics(); + _tprintf(_T("\nActive Connections\n")); + _tprintf(_T("\n Proto Local Address Foreign Address State\n")); + ShowUdpTable(); + break; + default : + break; + } + return EXIT_SUCCESS; + } + else + { + /* list the lot */ + ShowIpStatistics(); + ShowIcmpStatistics(); + ShowTcpStatistics(); + ShowUdpStatistics(); + return EXIT_SUCCESS; + } + } + return EXIT_SUCCESS; } -static void ShowUdpStatistics() + +/* format message string and display output */ +DWORD DoFormatMessage(DWORD ErrorCode) { - MIB_UDPSTATS UDPStatsMIB; - GetUdpStatistics(&UDPStatsMIB); + LPVOID lpMsgBuf; + DWORD RetVal; - _tprintf(_T("UDP Statistics\t\n")); - _tprintf(_T(" received datagrams:\t\t\t%lu\n"), UDPStatsMIB.dwInDatagrams); - _tprintf(_T(" datagrams for which no port exists:\t%lu\n"), UDPStatsMIB.dwNoPorts); - _tprintf(_T(" errors on received datagrams:\t\t%lu\n"), UDPStatsMIB.dwInErrors); - _tprintf(_T(" sent datagrams:\t\t\t\t%lu\n"), UDPStatsMIB.dwOutDatagrams); - _tprintf(_T(" number of entries in listener table:\t%lu\n"), UDPStatsMIB.dwNumAddrs); + if ((RetVal = FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ + (LPTSTR) &lpMsgBuf, + 0, + NULL ))) + { + _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); + + LocalFree(lpMsgBuf); + /* return number of TCHAR's stored in output buffer + * excluding '\0' - as FormatMessage does*/ + return RetVal; + } + else + return 0; } -static void ShowIpStatistics() + +VOID ShowIpStatistics() { - MIB_IPSTATS IPStatsMIB; - GetIpStatistics(&IPStatsMIB); + PMIB_IPSTATS pIpStats; + DWORD dwRetVal; - _tprintf(_T("IP Statistics\t\n")); - _tprintf(_T(" IP forwarding enabled or disabled:\t%lu\n"), IPStatsMIB.dwForwarding); - _tprintf(_T(" default time-to-live:\t\t\t%lu\n"), IPStatsMIB.dwDefaultTTL); - _tprintf(_T(" datagrams received:\t\t\t%lu\n"), IPStatsMIB.dwInReceives); - _tprintf(_T(" received header errors:\t\t\t%lu\n"), IPStatsMIB.dwInHdrErrors); - _tprintf(_T(" received address errors:\t\t%lu\n"), IPStatsMIB.dwInAddrErrors); - _tprintf(_T(" datagrams forwarded:\t\t\t%lu\n"), IPStatsMIB.dwForwDatagrams); - _tprintf(_T(" datagrams with unknown protocol:\t%lu\n"), IPStatsMIB.dwInUnknownProtos); - _tprintf(_T(" received datagrams discarded:\t\t%lu\n"), IPStatsMIB.dwInDiscards); - _tprintf(_T(" received datagrams delivered:\t\t%lu\n"), IPStatsMIB.dwInDelivers); - _tprintf(_T(" sent datagrams discarded:\t\t%lu\n"), IPStatsMIB.dwOutDiscards); - _tprintf(_T(" datagrams for which no route exists:\t%lu\n"), IPStatsMIB.dwOutNoRoutes); - _tprintf(_T(" datagrams for which frags didn't arrive:%lu\n"), IPStatsMIB.dwReasmTimeout); - _tprintf(_T(" datagrams requiring reassembly:\t\t%lu\n"), IPStatsMIB.dwReasmReqds); - _tprintf(_T(" successful reassemblies:\t\t%lu\n"), IPStatsMIB.dwReasmOks); - _tprintf(_T(" failed reassemblies:\t\t\t%lu\n"), IPStatsMIB.dwReasmFails); - _tprintf(_T(" successful fragmentations:\t\t%lu\n"), IPStatsMIB.dwFragOks); - _tprintf(_T(" failed fragmentations:\t\t\t%lu\n"), IPStatsMIB.dwFragFails); - _tprintf(_T(" datagrams fragmented:\t\t\t%lu\n"), IPStatsMIB.dwFragCreates); - _tprintf(_T(" number of interfaces on computer:\t%lu\n"), IPStatsMIB.dwNumIf); - _tprintf(_T(" number of IP address on computer:\t%lu\n"), IPStatsMIB.dwNumAddr); - _tprintf(_T(" number of routes in routing table:\t%lu\n"), IPStatsMIB.dwNumRoutes); + pIpStats = (MIB_IPSTATS*) malloc(sizeof(MIB_IPSTATS)); + + if ((dwRetVal = GetIpStatistics(pIpStats)) == NO_ERROR) + { + _tprintf(_T("\nIPv4 Statistics\n\n")); + _tprintf(_T(" %-34s = %lu\n"), _T("Packets Recieved"), pIpStats->dwInReceives); + _tprintf(_T(" %-34s = %lu\n"), _T("Received Header Errors"), pIpStats->dwInHdrErrors); + _tprintf(_T(" %-34s = %lu\n"), _T("Received Address Errors"), pIpStats->dwInAddrErrors); + _tprintf(_T(" %-34s = %lu\n"), _T("Datagrams Forwarded"), pIpStats->dwForwDatagrams); + _tprintf(_T(" %-34s = %lu\n"), _T("Unknown Protocols Recieved"), pIpStats->dwInUnknownProtos); + _tprintf(_T(" %-34s = %lu\n"), _T("Received Packets Discarded"), pIpStats->dwInDiscards); + _tprintf(_T(" %-34s = %lu\n"), _T("Recieved Packets Delivered"), pIpStats->dwInDelivers); + _tprintf(_T(" %-34s = %lu\n"), _T("Output Requests"), pIpStats->dwOutRequests); + _tprintf(_T(" %-34s = %lu\n"), _T("Routing Discards"), pIpStats->dwRoutingDiscards); + _tprintf(_T(" %-34s = %lu\n"), _T("Discarded Output Packets"), pIpStats->dwOutDiscards); + _tprintf(_T(" %-34s = %lu\n"), _T("Output Packets No Route"), pIpStats->dwOutNoRoutes); + _tprintf(_T(" %-34s = %lu\n"), _T("Reassembly Required"), pIpStats->dwReasmReqds); + _tprintf(_T(" %-34s = %lu\n"), _T("Reassembly Succesful"), pIpStats->dwReasmOks); + _tprintf(_T(" %-34s = %lu\n"), _T("Reassembly Failures"), pIpStats->dwReasmFails); + // _tprintf(_T(" %-34s = %lu\n"), _T("Datagrams succesfully fragmented"), NULL); /* FIXME: what is this one? */ + _tprintf(_T(" %-34s = %lu\n"), _T("Datagrams Failing Fragmentation"), pIpStats->dwFragFails); + _tprintf(_T(" %-34s = %lu\n"), _T("Fragments Created"), pIpStats->dwFragCreates); + } + else + DoFormatMessage(dwRetVal); } -static void ShowNetworkParams() +VOID ShowIcmpStatistics() { - FIXED_INFO* FixedInfo; - IP_ADDR_STRING* pIPAddr; - ULONG ulOutBufLen; + PMIB_ICMP pIcmpStats; DWORD dwRetVal; - _tprintf(_T("Network Parameters\t\n")); + pIcmpStats = (MIB_ICMP*) malloc(sizeof(MIB_ICMP)); - FixedInfo = (FIXED_INFO*)GlobalAlloc(GPTR, sizeof(FIXED_INFO)); - ulOutBufLen = sizeof(FIXED_INFO); - if (ERROR_BUFFER_OVERFLOW == GetNetworkParams(FixedInfo, &ulOutBufLen)) { - GlobalFree(FixedInfo); - FixedInfo =(FIXED_INFO*)GlobalAlloc(GPTR, ulOutBufLen); + if ((dwRetVal = GetIcmpStatistics(pIcmpStats)) == NO_ERROR) + { + _tprintf(_T("\nICMPv4 Statistics\n\n")); + _tprintf(_T(" Received Sent\n")); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Messages"), + pIcmpStats->stats.icmpInStats.dwMsgs, pIcmpStats->stats.icmpOutStats.dwMsgs); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Errors"), + pIcmpStats->stats.icmpInStats.dwErrors, pIcmpStats->stats.icmpOutStats.dwErrors); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Destination Unreachable"), + pIcmpStats->stats.icmpInStats.dwDestUnreachs, pIcmpStats->stats.icmpOutStats.dwDestUnreachs); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Time Exceeded"), + pIcmpStats->stats.icmpInStats.dwTimeExcds, pIcmpStats->stats.icmpOutStats.dwTimeExcds); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Parameter Problems"), + pIcmpStats->stats.icmpInStats.dwParmProbs, pIcmpStats->stats.icmpOutStats.dwParmProbs); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Source Quenches"), + pIcmpStats->stats.icmpInStats.dwSrcQuenchs, pIcmpStats->stats.icmpOutStats.dwSrcQuenchs); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Redirects"), + pIcmpStats->stats.icmpInStats.dwRedirects, pIcmpStats->stats.icmpOutStats.dwRedirects); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Echos"), + pIcmpStats->stats.icmpInStats.dwEchos, pIcmpStats->stats.icmpOutStats.dwEchos); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Echo Replies"), + pIcmpStats->stats.icmpInStats.dwEchoReps, pIcmpStats->stats.icmpOutStats.dwEchoReps); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Timestamps"), + pIcmpStats->stats.icmpInStats.dwTimestamps, pIcmpStats->stats.icmpOutStats.dwTimestamps); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Timestamp Replies"), + pIcmpStats->stats.icmpInStats.dwTimestampReps, pIcmpStats->stats.icmpOutStats.dwTimestampReps); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Address Masks"), + pIcmpStats->stats.icmpInStats.dwAddrMasks, pIcmpStats->stats.icmpOutStats.dwAddrMasks); + _tprintf(_T(" %-25s %-11lu %lu\n"), _T("Address Mask Replies"), + pIcmpStats->stats.icmpInStats.dwAddrMaskReps, pIcmpStats->stats.icmpOutStats.dwAddrMaskReps); } - if ((dwRetVal = GetNetworkParams(FixedInfo, &ulOutBufLen))) { - _tprintf(_T("Call to GetNetworkParams failed. Return Value: 0x%08lx\n"), dwRetVal); - } else { - printf(" Host Name: %s", FixedInfo->HostName); - printf("\n Domain Name: %s", FixedInfo->DomainName); - printf("\n DNS Servers:\t%s\n", FixedInfo->DnsServerList.IpAddress.String); - pIPAddr = FixedInfo->DnsServerList.Next; - while (pIPAddr) { - printf("\t\t\t%s\n", pIPAddr->IpAddress.String); - pIPAddr = pIPAddr->Next; - } + else + DoFormatMessage(dwRetVal); + +} + +VOID ShowTcpStatistics() +{ + PMIB_TCPSTATS pTcpStats; + DWORD dwRetVal; + + pTcpStats = (MIB_TCPSTATS*) malloc(sizeof(MIB_TCPSTATS)); + + if ((dwRetVal = GetTcpStatistics(pTcpStats)) == NO_ERROR) + { + _tprintf(_T("\nTCP Statistics for IPv4\n\n")); + _tprintf(_T(" %-35s = %lu\n"), _T("Active Opens"), pTcpStats->dwActiveOpens); + _tprintf(_T(" %-35s = %lu\n"), _T("Passive Opens"), pTcpStats->dwPassiveOpens); + _tprintf(_T(" %-35s = %lu\n"), _T("Failed Connection Attempts"), pTcpStats->dwAttemptFails); + _tprintf(_T(" %-35s = %lu\n"), _T("Reset Connections"), pTcpStats->dwEstabResets); + _tprintf(_T(" %-35s = %lu\n"), _T("Current Connections"), pTcpStats->dwCurrEstab); + _tprintf(_T(" %-35s = %lu\n"), _T("Segments Recieved"), pTcpStats->dwInSegs); + _tprintf(_T(" %-35s = %lu\n"), _T("Segments Sent"), pTcpStats->dwOutSegs); + _tprintf(_T(" %-35s = %lu\n"), _T("Segments Retransmitted"), pTcpStats->dwRetransSegs); } + else + DoFormatMessage(dwRetVal); } -static void ShowAdapterInfo() +VOID ShowUdpStatistics() { - IP_ADAPTER_INFO* pAdaptorInfo; - ULONG ulOutBufLen; + PMIB_UDPSTATS pUdpStats; DWORD dwRetVal; - _tprintf(_T("\nAdaptor Information\t\n")); - pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, sizeof(IP_ADAPTER_INFO)); - ulOutBufLen = sizeof(IP_ADAPTER_INFO); + pUdpStats = (MIB_UDPSTATS*) malloc(sizeof(MIB_UDPSTATS)); - if (ERROR_BUFFER_OVERFLOW == GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen)) { - GlobalFree(pAdaptorInfo); - pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, ulOutBufLen); + if ((dwRetVal = GetUdpStatistics(pUdpStats)) == NO_ERROR) + { + _tprintf(_T("\nUDP Statistics for IPv4\n\n")); + _tprintf(_T(" %-21s = %lu\n"), _T("Datagrams Recieved"), pUdpStats->dwInDatagrams); + _tprintf(_T(" %-21s = %lu\n"), _T("No Ports"), pUdpStats->dwNoPorts); + _tprintf(_T(" %-21s = %lu\n"), _T("Recieve Errors"), pUdpStats->dwInErrors); + _tprintf(_T(" %-21s = %lu\n"), _T("Datagrams Sent"), pUdpStats->dwOutDatagrams); } - if ((dwRetVal = GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen))) { - _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: 0x%08lx\n"), dwRetVal); - } else { - while (pAdaptorInfo) { - printf(" AdapterName: %s\n", pAdaptorInfo->AdapterName); - printf(" Description: %s\n", pAdaptorInfo->Description); - pAdaptorInfo = pAdaptorInfo->Next; + else + DoFormatMessage(dwRetVal); +} + +VOID ShowEthernetStatistics() +{ + PMIB_IFTABLE pIfTable; + DWORD dwSize = 0; + DWORD dwRetVal = 0; + + pIfTable = (MIB_IFTABLE*) malloc(sizeof(MIB_IFTABLE)); + + if (GetIfTable(pIfTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) + { + GlobalFree(pIfTable); + pIfTable = (MIB_IFTABLE*) malloc(dwSize); + + if ((dwRetVal = GetIfTable(pIfTable, &dwSize, 0)) == NO_ERROR) + { + _tprintf(_T("Interface Statistics\n\n")); + _tprintf(_T(" Received Sent\n\n")); + _tprintf(_T("%-20s %14lu %15lu\n"), _T("Bytes"), + pIfTable->table[0].dwInOctets, pIfTable->table[0].dwOutOctets); + _tprintf(_T("%-20s %14lu %15lu\n"), _T("Unicast packets"), + pIfTable->table[0].dwInUcastPkts, pIfTable->table[0].dwOutUcastPkts); + _tprintf(_T("%-20s %14lu %15lu\n"), _T("Non-unicast packets"), + pIfTable->table[0].dwInNUcastPkts, pIfTable->table[0].dwOutNUcastPkts); + _tprintf(_T("%-20s %14lu %15lu\n"), _T("Discards"), + pIfTable->table[0].dwInDiscards, pIfTable->table[0].dwOutDiscards); + _tprintf(_T("%-20s %14lu %15lu\n"), _T("Errors"), + pIfTable->table[0].dwInErrors, pIfTable->table[0].dwOutErrors); + _tprintf(_T("%-20s %14lu\n"), _T("Unknown Protocols"), + pIfTable->table[0].dwInUnknownProtos); } + else + DoFormatMessage(dwRetVal); } } -#endif -// Maximum string lengths for ASCII ip address and port names -// -#define HOSTNAMELEN 256 -#define PORTNAMELEN 256 -#define ADDRESSLEN HOSTNAMELEN+PORTNAMELEN +VOID ShowTcpTable() +{ + PMIB_TCPTABLE tcpTable; + DWORD error, dwSize; + DWORD i; -// -// Our option flags -// -#define FLAG_SHOW_ALL_ENDPOINTS 1 -#define FLAG_SHOW_ETH_STATS 2 -#define FLAG_SHOW_NUMBERS 3 -#define FLAG_SHOW_PROT_CONNECTIONS 4 -#define FLAG_SHOW_ROUTE_TABLE 5 -#define FLAG_SHOW_PROT_STATS 6 -#define FLAG_SHOW_INTERVAL 7 + // Get the table of TCP endpoints + dwSize = 0; + error = GetTcpTable(NULL, &dwSize, TRUE); + if (error != ERROR_INSUFFICIENT_BUFFER) + { + printf("Failed to snapshot TCP endpoints.\n"); + DoFormatMessage(error); + exit(EXIT_FAILURE); + } + tcpTable = (PMIB_TCPTABLE)malloc(dwSize); + error = GetTcpTable(tcpTable, &dwSize, TRUE ); + if (error) + { + printf("Failed to snapshot TCP endpoints table.\n"); + DoFormatMessage(error); + exit(EXIT_FAILURE); + } + // Dump the TCP table + for (i = 0; i < tcpTable->dwNumEntries; i++) + { + if (bDoShowAllCons || (tcpTable->table[i].dwState == + MIB_TCP_STATE_ESTAB)) + { + sprintf(localaddr, "%s:%s", + GetIpHostName(TRUE, tcpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), + GetPortName(tcpTable->table[i].dwLocalPort, "tcp", localport, PORTNAMELEN)); + sprintf(remoteaddr, "%s:%s", + GetIpHostName(FALSE, tcpTable->table[i].dwRemoteAddr, remotename, HOSTNAMELEN), + tcpTable->table[i].dwRemoteAddr ? + GetPortName(tcpTable->table[i].dwRemotePort, "tcp", remoteport, PORTNAMELEN): + "0"); + _tprintf(_T(" %-6s %-22s %-22s %s\n"), _T("TCP"), localaddr, remoteaddr, TcpState[tcpTable->table[i].dwState]); + } + } +} -// Undocumented extended information structures available only on XP and higher -typedef struct { - DWORD dwState; // state of the connection - DWORD dwLocalAddr; // address on local computer - DWORD dwLocalPort; // port number on local computer - DWORD dwRemoteAddr; // address on remote computer - DWORD dwRemotePort; // port number on remote computer - DWORD dwProcessId; -} MIB_TCPEXROW, *PMIB_TCPEXROW; +VOID ShowUdpTable() +{ + PMIB_UDPTABLE udpTable; + DWORD error, dwSize; + DWORD i; -typedef struct { - DWORD dwNumEntries; - MIB_TCPEXROW table[ANY_SIZE]; -} MIB_TCPEXTABLE, *PMIB_TCPEXTABLE; + // Get the table of UDP endpoints + dwSize = 0; + error = GetUdpTable(NULL, &dwSize, TRUE); + if (error != ERROR_INSUFFICIENT_BUFFER) + { + printf("Failed to snapshot UDP endpoints.\n"); + DoFormatMessage(error); + exit(EXIT_FAILURE); + } + udpTable = (PMIB_UDPTABLE)malloc(dwSize); + error = GetUdpTable(udpTable, &dwSize, TRUE); + if (error) + { + printf("Failed to snapshot UDP endpoints table.\n"); + DoFormatMessage(error); + exit(EXIT_FAILURE); + } -typedef struct { - DWORD dwLocalAddr; // address on local computer - DWORD dwLocalPort; // port number on local computer - DWORD dwProcessId; -} MIB_UDPEXROW, *PMIB_UDPEXROW; + // Dump the UDP table + for (i = 0; i < udpTable->dwNumEntries; i++) + { + sprintf(localaddr, "%s:%s", + GetIpHostName(TRUE, udpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), + GetPortName(udpTable->table[i].dwLocalPort, "tcp", localport, PORTNAMELEN)); + _tprintf(_T(" %-6s %-22s %-22s\n"), _T("UDP"), localaddr, _T(":*:")); + } +} -typedef struct { - DWORD dwNumEntries; - MIB_UDPEXROW table[ANY_SIZE]; -} MIB_UDPEXTABLE, *PMIB_UDPEXTABLE; - // // GetPortName // // Translate port numbers into their text equivalent if there is one // -static PCHAR -GetPortName(DWORD Flags, UINT port, PCHAR proto, PCHAR name, int namelen) +PCHAR +GetPortName(UINT port, PCHAR proto, PCHAR name, int namelen) { - struct servent *psrvent; + struct servent *psrvent; - if (Flags & FLAG_SHOW_NUMBERS) { - sprintf(name, "%d", htons((WORD)port)); - return name; - } - // Try to translate to a name - if ((psrvent = getservbyport(port, proto))) { - strcpy(name, psrvent->s_name ); - } else { - sprintf(name, "%d", htons((WORD)port)); - } - return name; + if (bDoShowNumbers) { + sprintf(name, "%d", htons((WORD)port)); + return name; + } + // Try to translate to a name + if ((psrvent = getservbyport(port, proto))) { + strcpy(name, psrvent->s_name ); + } else { + sprintf(name, "%d", htons((WORD)port)); + } + return name; } @@ -257,265 +593,100 @@ // // Translate IP addresses into their name-resolved form if possible. // -static PCHAR -GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen) +PCHAR +GetIpHostName(BOOL local, UINT ipaddr, PCHAR name, int namelen) { -// struct hostent *phostent; - UINT nipaddr; +// struct hostent *phostent; + UINT nipaddr; - // Does the user want raw numbers? - nipaddr = htonl(ipaddr); - if (Flags & FLAG_SHOW_NUMBERS ) { - sprintf(name, "%d.%d.%d.%d", - (nipaddr >> 24) & 0xFF, - (nipaddr >> 16) & 0xFF, - (nipaddr >> 8) & 0xFF, - (nipaddr) & 0xFF); - return name; - } + // Does the user want raw numbers? + nipaddr = htonl(ipaddr); + if (bDoShowNumbers) { + sprintf(name, "%d.%d.%d.%d", + (nipaddr >> 24) & 0xFF, + (nipaddr >> 16) & 0xFF, + (nipaddr >> 8) & 0xFF, + (nipaddr) & 0xFF); + return name; + } - name[0] = _T('\0'); + name[0] = _T('\0'); - // Try to translate to a name - if (!ipaddr) { - if (!local) { - sprintf(name, "%d.%d.%d.%d", - (nipaddr >> 24) & 0xFF, - (nipaddr >> 16) & 0xFF, - (nipaddr >> 8) & 0xFF, - (nipaddr) & 0xFF); - } else { - //gethostname(name, namelen); - } - } else if (ipaddr == 0x0100007f) { - if (local) { - //gethostname(name, namelen); - } else { - strcpy(name, "localhost"); - } -// } else if (phostent = gethostbyaddr((char*)&ipaddr, sizeof(nipaddr), PF_INET)) { -// strcpy(name, phostent->h_name); - } else { -#if 0 - int i1, i2, i3, i4; - - i1 = (nipaddr >> 24) & 0x000000FF; - i2 = (nipaddr >> 16) & 0x000000FF; - i3 = (nipaddr >> 8) & 0x000000FF; - i4 = (nipaddr) & 0x000000FF; - - i1 = 10; - i2 = 20; - i3 = 30; - i4 = 40; - - sprintf(name, "%d.%d.%d.%d", i1,i2,i3,i4); -#else - sprintf(name, "%d.%d.%d.%d", - ((nipaddr >> 24) & 0x000000FF), - ((nipaddr >> 16) & 0x000000FF), - ((nipaddr >> 8) & 0x000000FF), - ((nipaddr) & 0x000000FF)); -#endif - } - return name; + // Try to translate to a name + if (!ipaddr) { + if (!local) { + sprintf(name, "%d.%d.%d.%d", + (nipaddr >> 24) & 0xFF, + (nipaddr >> 16) & 0xFF, + (nipaddr >> 8) & 0xFF, + (nipaddr) & 0xFF); + } else { + //gethostname(name, namelen); + } + } else if (ipaddr == 0x0100007f) { + if (local) { + //gethostname(name, namelen); + } else { + strcpy(name, "localhost"); + } +// } else if (phostent = gethostbyaddr((char*)&ipaddr, sizeof(nipaddr), PF_INET)) { +// strcpy(name, phostent->h_name); + } else { + sprintf(name, "%d.%d.%d.%d", + ((nipaddr >> 24) & 0x000000FF), + ((nipaddr >> 16) & 0x000000FF), + ((nipaddr >> 8) & 0x000000FF), + ((nipaddr) & 0x000000FF)); + } + return name; } -static BOOLEAN usage(void) +VOID Usage() { - TCHAR buffer[MAX_RESLEN]; - - LoadString(GetModuleHandle(NULL), IDS_APP_USAGE, buffer, sizeof(buffer)/sizeof(buffer[0])); - _fputts(buffer, stderr); - return FALSE; + _tprintf(_T("Displays current TCP/IP protocol statistics and network connections.\n\n" + "NETSTAT [-a] [-e] [-n] [-s] [-p proto] [-r] [interval]\n\n" + " -a Displays all connections and listening ports.\n" + " -e Displays Ethernet statistics. May be combined with -s\n" + " option\n" + " -n Displays address and port numbers in numeric form.\n" + " -p proto Shows connections for protocol 'proto' TCP or UDP.\n" + " If used with the -s option to display\n" + " per-protocol statistics, 'proto' may be TCP, UDP, or IP.\n" + " -r Displays the current routing table.\n" + " -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" + " 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")); } -// -// GetOptions -// -// Parses the command line arguments. -// -static BOOLEAN -GetOptions(int argc, char *argv[], PDWORD pFlags) -{ - int i, j; - BOOLEAN skipArgument; - *pFlags = 0; - for (i = 1; i < argc; i++) { - skipArgument = FALSE; - switch (argv[i][0]) { - case '-': - case '/': - j = 1; - while (argv[i][j]) { - switch (toupper(argv[i][j])) { - case 'A': - *pFlags |= FLAG_SHOW_ALL_ENDPOINTS; - break; - case 'E': - *pFlags |= FLAG_SHOW_ETH_STATS; - break; - case 'N': - *pFlags |= FLAG_SHOW_NUMBERS; - break; - case 'P': - *pFlags |= FLAG_SHOW_PROT_CONNECTIONS; - break; - case 'R': - *pFlags |= FLAG_SHOW_ROUTE_TABLE; - break; - case 'S': - *pFlags |= FLAG_SHOW_PROT_STATS; - break; - default: - return usage(); - } - if (skipArgument) break; - j++; - } - break; - case 'i': - *pFlags |= FLAG_SHOW_INTERVAL; - break; - default: - return usage(); - } - } - return TRUE; -} -#if 1 - CHAR localname[HOSTNAMELEN], remotename[HOSTNAMELEN]; - CHAR remoteport[PORTNAMELEN], localport[PORTNAMELEN]; - CHAR localaddr[ADDRESSLEN], remoteaddr[ADDRESSLEN]; - -int main(int argc, char *argv[]) -{ - PMIB_TCPTABLE tcpTable; - PMIB_UDPTABLE udpTable; - DWORD error, dwSize; - DWORD i, flags; - - // Get options - if (!GetOptions(argc, argv, &flags)) { - return -1; - } else { - // Get the table of TCP endpoints - dwSize = 0; - error = GetTcpTable(NULL, &dwSize, TRUE); - if (error != ERROR_INSUFFICIENT_BUFFER) { - printf("Failed to snapshot TCP endpoints.\n"); - PrintError(error); - return -1; - } - tcpTable = (PMIB_TCPTABLE)malloc(dwSize); - error = GetTcpTable(tcpTable, &dwSize, TRUE ); - if (error) { [truncated at 1000 lines; 356 more skipped]

19 years, 2 months

[weiden] 18396: fixed a typo in the NtAccessCheck declaration

by weiden＠svn.reactos.com

fixed a typo in the NtAccessCheck declaration Modified: trunk/reactos/include/ndk/zwfuncs.h _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-10-10 14:29:15 UTC (rev 18395) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-10-10 15:42:08 UTC (rev 18396) @@ -45,7 +45,7 @@ NtAccessCheck( IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN HANDLE ClientToken, - IN ACCESS_MASK DesiredAcces, + IN ACCESS_MASK DesiredAccess, IN PGENERIC_MAPPING GenericMapping, OUT PPRIVILEGE_SET PrivilegeSet, OUT PULONG ReturnLength, @@ -59,7 +59,7 @@ ZwAccessCheck( IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN HANDLE ClientToken, - IN ACCESS_MASK DesiredAcces, + IN ACCESS_MASK DesiredAccess, IN PGENERIC_MAPPING GenericMapping, OUT PPRIVILEGE_SET PrivilegeSet, OUT PULONG ReturnLength,

19 years, 2 months

[amunger] 18395: MiTestCard is only used in DBG=1, surround with ifdef so DBG=0 builds.

by amunger＠svn.reactos.com

MiTestCard is only used in DBG=1, surround with ifdef so DBG=0 builds. Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.c _____ Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.c --- trunk/reactos/drivers/net/dd/pcnet/pcnet.c 2005-10-10 13:03:55 UTC (rev 18394) +++ trunk/reactos/drivers/net/dd/pcnet/pcnet.c 2005-10-10 14:29:15 UTC (rev 18395) @@ -719,6 +719,7 @@ Adapter->Flags &= ~RESET_IN_PROGRESS; } +#if DBG static BOOLEAN MiTestCard( PADAPTER Adapter) @@ -775,6 +776,7 @@ return TRUE; } +#endif static NDIS_STATUS STDCALL

19 years, 2 months

[weiden] 18394: convert DefaultSetInfoBufferCheck and DefaultQueryInfoBufferCheck to inlined functions

by weiden＠svn.reactos.com

convert DefaultSetInfoBufferCheck and DefaultQueryInfoBufferCheck to inlined functions Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/se/token.c _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-10-10 13:03:09 UTC (rev 18393) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-10-10 13:03:55 UTC (rev 18394) @@ -311,13 +311,13 @@ DPRINT("NtQueryEvent(0x%p, 0x%x)\n", EventHandle, EventInformationClass); /* Check buffers and class validity */ - DefaultQueryInfoBufferCheck(EventInformationClass, - ExEventInfoClass, - EventInformation, - EventInformationLength, - ReturnLength, - PreviousMode, - &Status); + Status = DefaultQueryInfoBufferCheck(EventInformationClass, + ExEventInfoClass, + sizeof(ExEventInfoClass) / sizeof(ExEventInfoClass[0]), + EventInformation, + EventInformationLength, + ReturnLength, + PreviousMode); if(!NT_SUCCESS(Status)) { /* Invalid buffers */ _____ Modified: trunk/reactos/ntoskrnl/ex/mutant.c --- trunk/reactos/ntoskrnl/ex/mutant.c 2005-10-10 13:03:09 UTC (rev 18393) +++ trunk/reactos/ntoskrnl/ex/mutant.c 2005-10-10 13:03:55 UTC (rev 18394) @@ -227,13 +227,13 @@ PAGED_CODE(); /* Check buffers and parameters */ - DefaultQueryInfoBufferCheck(MutantInformationClass, - ExMutantInfoClass, - MutantInformation, - MutantInformationLength, - ResultLength, - PreviousMode, - &Status); + Status = DefaultQueryInfoBufferCheck(MutantInformationClass, + ExMutantInfoClass, + sizeof(ExMutantInfoClass) / sizeof(ExMutantInfoClass[0]), + MutantInformation, + MutantInformationLength, + ResultLength, + PreviousMode); if(!NT_SUCCESS(Status)) { DPRINT("NtQueryMutant() failed, Status: 0x%x\n", Status); _____ Modified: trunk/reactos/ntoskrnl/ex/sem.c --- trunk/reactos/ntoskrnl/ex/sem.c 2005-10-10 13:03:09 UTC (rev 18393) +++ trunk/reactos/ntoskrnl/ex/sem.c 2005-10-10 13:03:55 UTC (rev 18394) @@ -215,13 +215,13 @@ PAGED_CODE(); /* Check buffers and class validity */ - DefaultQueryInfoBufferCheck(SemaphoreInformationClass, - ExSemaphoreInfoClass, - SemaphoreInformation, - SemaphoreInformationLength, - ReturnLength, - PreviousMode, - &Status); + Status = DefaultQueryInfoBufferCheck(SemaphoreInformationClass, + ExSemaphoreInfoClass, + sizeof(ExSemaphoreInfoClass) / sizeof(ExSemaphoreInfoClass[0]), + SemaphoreInformation, + SemaphoreInformationLength, + ReturnLength, + PreviousMode); if(!NT_SUCCESS(Status)) { /* Invalid buffers */ _____ Modified: trunk/reactos/ntoskrnl/ex/timer.c --- trunk/reactos/ntoskrnl/ex/timer.c 2005-10-10 13:03:09 UTC (rev 18393) +++ trunk/reactos/ntoskrnl/ex/timer.c 2005-10-10 13:03:55 UTC (rev 18394) @@ -545,13 +545,13 @@ DPRINT("NtQueryTimer(TimerHandle: 0x%p, Class: %d)\n", TimerHandle, TimerInformationClass); /* Check Validity */ - DefaultQueryInfoBufferCheck(TimerInformationClass, - ExTimerInfoClass, - TimerInformation, - TimerInformationLength, - ReturnLength, - PreviousMode, - &Status); + Status = DefaultQueryInfoBufferCheck(TimerInformationClass, + ExTimerInfoClass, + sizeof(ExTimerInfoClass) / sizeof(ExTimerInfoClass[0]), + TimerInformation, + TimerInformationLength, + ReturnLength, + PreviousMode); if(!NT_SUCCESS(Status)) { DPRINT1("NtQueryTimer() failed, Status: 0x%x\n", Status); _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-10-10 13:03:09 UTC (rev 18393) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-10-10 13:03:55 UTC (rev 18394) @@ -208,6 +208,138 @@ #define ProbeForReadUlargeInteger(Ptr) ((ULARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, ULONGLONG, 0)) /* + * generic information class probing code + */ + +#define ICIF_QUERY 0x1 +#define ICIF_SET 0x2 +#define ICIF_QUERY_SIZE_VARIABLE 0x4 +#define ICIF_SET_SIZE_VARIABLE 0x8 +#define ICIF_SIZE_VARIABLE (ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE) + +typedef struct _INFORMATION_CLASS_INFO +{ + ULONG RequiredSizeQUERY; + ULONG RequiredSizeSET; + ULONG AlignmentSET; + ULONG AlignmentQUERY; + ULONG Flags; +} INFORMATION_CLASS_INFO, *PINFORMATION_CLASS_INFO; + +#define ICI_SQ_SAME(Size, Alignment, Flags) \ + { Size, Size, Alignment, Alignment, Flags } + +#define ICI_SQ(SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags) \ + { SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags } + +static inline NTSTATUS +DefaultSetInfoBufferCheck(UINT Class, + const INFORMATION_CLASS_INFO *ClassList, + UINT ClassListEntries, + PVOID Buffer, + ULONG BufferLength, + KPROCESSOR_MODE PreviousMode) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (Class >= 0 && Class < ClassListEntries) + { + if (!(ClassList[Class].Flags & ICIF_SET)) + { + Status = STATUS_INVALID_INFO_CLASS; + } + else if (ClassList[Class].RequiredSizeSET > 0 && + BufferLength != ClassList[Class].RequiredSizeSET) + { + if (!(ClassList[Class].Flags & ICIF_SET_SIZE_VARIABLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + } + + if (NT_SUCCESS(Status)) + { + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForRead(Buffer, + BufferLength, + ClassList[Class].AlignmentSET); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } + } + else + Status = STATUS_INVALID_INFO_CLASS; + + return Status; +} + +static inline NTSTATUS +DefaultQueryInfoBufferCheck(UINT Class, + const INFORMATION_CLASS_INFO *ClassList, + UINT ClassListEntries, + PVOID Buffer, + ULONG BufferLength, + PULONG ReturnLength, + KPROCESSOR_MODE PreviousMode) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (Class >= 0 && Class < ClassListEntries) + { + if (!(ClassList[Class].Flags & ICIF_QUERY)) + { + Status = STATUS_INVALID_INFO_CLASS; + } + else if (ClassList[Class].RequiredSizeQUERY > 0 && + BufferLength != ClassList[Class].RequiredSizeQUERY) + { + if (!(ClassList[Class].Flags & ICIF_QUERY_SIZE_VARIABLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + } + + if (NT_SUCCESS(Status)) + { + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + if (Buffer != NULL) + { + ProbeForWrite(Buffer, + BufferLength, + ClassList[Class].AlignmentQUERY); + } + + if (ReturnLength != NULL) + { + ProbeForWriteUlong(ReturnLength); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } + } + else + Status = STATUS_INVALID_INFO_CLASS; + + return Status; +} + +/* * Use IsPointerOffset to test whether a pointer should be interpreted as an offset * or as a pointer */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-10-10 13:03:09 UTC (rev 18393) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-10-10 13:03:55 UTC (rev 18394) @@ -11,12 +11,6 @@ struct _EPROCESS; -#define ICIF_QUERY 0x1 -#define ICIF_SET 0x2 -#define ICIF_QUERY_SIZE_VARIABLE 0x4 -#define ICIF_SET_SIZE_VARIABLE 0x8 -#define ICIF_SIZE_VARIABLE (ICIF_QUERY_SIZE_VARIABLE | ICIF_SET_SIZE_VARIABLE) - typedef struct _DIRECTORY_OBJECT { CSHORT Type; @@ -37,15 +31,6 @@ LARGE_INTEGER CreateTime; } SYMLINK_OBJECT, *PSYMLINK_OBJECT; -typedef struct _INFORMATION_CLASS_INFO -{ - ULONG RequiredSizeQUERY; - ULONG RequiredSizeSET; - ULONG AlignmentSET; - ULONG AlignmentQUERY; - ULONG Flags; -} INFORMATION_CLASS_INFO, *PINFORMATION_CLASS_INFO; - #define BODY_TO_HEADER(objbdy) \ CONTAINING_RECORD((objbdy), OBJECT_HEADER, Body) @@ -251,152 +236,6 @@ /* object information classes */ -#define ICI_SQ_SAME(Size, Alignment, Flags) \ - { Size, Size, Alignment, Alignment, Flags } -#define ICI_SQ(SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags) \ - { SizeQuery, SizeSet, AlignmentQuery, AlignmentSet, Flags } -#define CheckInfoClass(Class, BufferLen, ClassList, StatusVar, Mode) \ - do { \ - if((Class) >= 0 && (Class) < sizeof(ClassList) / sizeof(ClassList[0])) \ - { \ - if(!(ClassList[Class].Flags & ICIF_##Mode)) \ - { \ - *(StatusVar) = STATUS_INVALID_INFO_CLASS; \ - } \ - else if(ClassList[Class].RequiredSize##Mode > 0 && \ - (BufferLen) != ClassList[Class].RequiredSize##Mode) \ - { \ - if(!(ClassList[Class].Flags & ICIF_##Mode##_SIZE_VARIABLE) && \ - (BufferLen) != ClassList[Class].RequiredSize##Mode) \ - { \ - *(StatusVar) = STATUS_INFO_LENGTH_MISMATCH; \ - } \ - } \ - } \ - else \ - { \ - *(StatusVar) = STATUS_INVALID_INFO_CLASS; \ - } \ - } while(0) - - -#define GetInfoClassAlignment(Class, ClassList, AlignmentVar, Mode) \ - do { \ - if((Class) >= 0 && (Class) < sizeof(ClassList) / sizeof(ClassList[0])) \ - { \ - *(AlignmentVar) = ClassList[Class].Alignment##Mode; \ - } \ - else \ - { \ - *(AlignmentVar) = sizeof(ULONG); \ - } \ - } while(0) - -#define ProbeQueryInfoBuffer(Buffer, BufferLen, Alignment, RetLen, PrevMode, StatusVar) \ - do { \ - if(PrevMode != KernelMode) \ - { \ - _SEH_TRY \ - { \ - ProbeForWrite(Buffer, \ - BufferLen, \ - Alignment); \ - if(RetLen != NULL) \ - { \ - ProbeForWrite(RetLen, \ - sizeof(ULONG), \ - 1); \ - } \ - } \ - _SEH_HANDLE \ - { \ - *(StatusVar) = _SEH_GetExceptionCode(); \ - } \ - _SEH_END; \ - \ - if(!NT_SUCCESS(*(StatusVar))) \ - { \ - DPRINT1("ProbeQueryInfoBuffer failed: 0x%x\n", *(StatusVar)); \ - return *(StatusVar); \ - } \ - } \ - } while(0) - -#define ProbeSetInfoBuffer(Buffer, BufferLen, Alignment, PrevMode, StatusVar) \ - do { \ - if(PrevMode != KernelMode) \ - { \ - _SEH_TRY \ - { \ - ProbeForRead(Buffer, \ - BufferLen, \ - Alignment); \ - } \ - _SEH_HANDLE \ - { \ - *(StatusVar) = _SEH_GetExceptionCode(); \ - } \ - _SEH_END; \ - \ - if(!NT_SUCCESS(*(StatusVar))) \ - { \ - DPRINT1("ProbeAllInfoBuffer failed: 0x%x\n", *(StatusVar)); \ - return *(StatusVar); \ - } \ - } \ - } while(0) - -#define DefaultSetInfoBufferCheck(Class, ClassList, Buffer, BufferLen, PrevMode, StatusVar) \ - do { \ - ULONG _Alignment; \ - /* get the preferred alignment for the information class or return */ \ - /* default alignment in case the class doesn't exist */ \ - GetInfoClassAlignment(Class, \ - ClassList, \ - &_Alignment, \ - SET); \ - \ - /* probe the ENTIRE buffers and return on failure */ \ - ProbeSetInfoBuffer(Buffer, \ - BufferLen, \ - _Alignment, \ - PrevMode, \ - StatusVar); \ - \ - /* validate information class index and check buffer size */ \ - CheckInfoClass(Class, \ - BufferLen, \ - ClassList, \ - StatusVar, \ - SET); \ - } while(0) - -#define DefaultQueryInfoBufferCheck(Class, ClassList, Buffer, BufferLen, RetLen, PrevMode, StatusVar) \ - do { \ - ULONG _Alignment; \ - /* get the preferred alignment for the information class or return */ \ - /* alignment in case the class doesn't exist */ \ - GetInfoClassAlignment(Class, \ - ClassList, \ - &_Alignment, \ - QUERY); \ - \ - /* probe the ENTIRE buffers and return on failure */ \ - ProbeQueryInfoBuffer(Buffer, \ - BufferLen, \ - _Alignment, \ - RetLen, \ - PrevMode, \ - StatusVar); \ - \ - /* validate information class index and check buffer size */ \ - CheckInfoClass(Class, \ - BufferLen, \ - ClassList, \ - StatusVar, \ - QUERY); \ - } while(0) - #endif /* __INCLUDE_INTERNAL_OBJMGR_H */ _____ Modified: trunk/reactos/ntoskrnl/io/iocomp.c --- trunk/reactos/ntoskrnl/io/iocomp.c 2005-10-10 13:03:09 UTC (rev 18393) +++ trunk/reactos/ntoskrnl/io/iocomp.c 2005-10-10 13:03:55 UTC (rev 18394) @@ -359,13 +359,13 @@ PAGED_CODE(); /* Check buffers and parameters */ - DefaultQueryInfoBufferCheck(IoCompletionInformationClass, - IoCompletionInfoClass, - IoCompletionInformation, - IoCompletionInformationLength, - ResultLength, - PreviousMode, - &Status); + Status = DefaultQueryInfoBufferCheck(IoCompletionInformationClass, + IoCompletionInfoClass, + sizeof(IoCompletionInfoClass) / sizeof(IoCompletionInfoClass[0]), + IoCompletionInformation, + IoCompletionInformationLength, + ResultLength, + PreviousMode); if(!NT_SUCCESS(Status)) { DPRINT1("NtQueryMutant() failed, Status: 0x%x\n", Status); _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-10-10 13:03:09 UTC (rev 18393) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-10-10 13:03:55 UTC (rev 18394) @@ -4012,13 +4012,13 @@ PreviousMode = ExGetPreviousMode(); - DefaultQueryInfoBufferCheck(SectionInformationClass, - ExSectionInfoClass, - SectionInformation, - SectionInformationLength, - ResultLength, - PreviousMode, - &Status); + Status = DefaultQueryInfoBufferCheck(SectionInformationClass, + ExSectionInfoClass, + sizeof(ExSectionInfoClass) / sizeof(ExSectionInfoClass[0]), + SectionInformation, + SectionInformationLength, + ResultLength, + PreviousMode); if(!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/ntoskrnl/ps/query.c --- trunk/reactos/ntoskrnl/ps/query.c 2005-10-10 13:03:09 UTC (rev 18393) +++ trunk/reactos/ntoskrnl/ps/query.c 2005-10-10 13:03:55 UTC (rev 18394) @@ -143,13 +143,13 @@ PreviousMode = ExGetPreviousMode(); - DefaultQueryInfoBufferCheck(ProcessInformationClass, - PsProcessInfoClass, - ProcessInformation, - ProcessInformationLength, - ReturnLength, - PreviousMode, - &Status); + Status = DefaultQueryInfoBufferCheck(ProcessInformationClass, + PsProcessInfoClass, + sizeof(PsProcessInfoClass) / sizeof(PsProcessInfoClass[0]), + ProcessInformation, + ProcessInformationLength, + ReturnLength, + PreviousMode); if(!NT_SUCCESS(Status)) { DPRINT1("NtQueryInformationProcess() failed, Status: 0x%x\n", Status); @@ -654,12 +654,12 @@ PreviousMode = ExGetPreviousMode(); - DefaultSetInfoBufferCheck(ProcessInformationClass, - PsProcessInfoClass, - ProcessInformation, - ProcessInformationLength, - PreviousMode, - &Status); + Status = DefaultSetInfoBufferCheck(ProcessInformationClass, + PsProcessInfoClass, + sizeof(PsProcessInfoClass) / sizeof(PsProcessInfoClass[0]), + ProcessInformation, + ProcessInformationLength, + PreviousMode); if(!NT_SUCCESS(Status)) { DPRINT1("NtSetInformationProcess() %d %x %x called\n", ProcessInformationClass, ProcessInformation, ProcessInformationLength); _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-10-10 13:03:09 UTC (rev 18393) +++ trunk/reactos/ntoskrnl/se/token.c 2005-10-10 13:03:55 UTC (rev 18394) @@ -615,13 +615,13 @@ PreviousMode = ExGetPreviousMode(); /* Check buffers and class validity */ - DefaultQueryInfoBufferCheck(TokenInformationClass, - SeTokenInformationClass, - TokenInformation, - TokenInformationLength, - ReturnLength, - PreviousMode, - &Status); + Status = DefaultQueryInfoBufferCheck(TokenInformationClass, + SeTokenInformationClass, + sizeof(SeTokenInformationClass) / sizeof(SeTokenInformationClass[0]), + TokenInformation, + TokenInformationLength, + ReturnLength, + PreviousMode); if(!NT_SUCCESS(Status)) { @@ -1198,12 +1198,12 @@ PreviousMode = ExGetPreviousMode(); - DefaultSetInfoBufferCheck(TokenInformationClass, - SeTokenInformationClass, - TokenInformation, - TokenInformationLength, - PreviousMode, - &Status); + Status = DefaultSetInfoBufferCheck(TokenInformationClass, + SeTokenInformationClass, + sizeof(SeTokenInformationClass) / sizeof(SeTokenInformationClass[0]), + TokenInformation, + TokenInformationLength, + PreviousMode); if(!NT_SUCCESS(Status)) {

19 years, 2 months

[weiden] 18393: don't jump outside _SEH_TRY with goto in ObpCaptureObjectAttributes()

by weiden＠svn.reactos.com

don't jump outside _SEH_TRY with goto in ObpCaptureObjectAttributes() Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-10-10 11:44:37 UTC (rev 18392) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-10-10 13:03:09 UTC (rev 18393) @@ -155,7 +155,7 @@ Status = STATUS_INVALID_PARAMETER; DPRINT1("Invalid Size: %lx or Attributes: %lx\n", ObjectAttributes->Length, ObjectAttributes->Attributes); - goto Quickie; + _SEH_LEAVE; } /* Set some Create Info */ @@ -179,7 +179,7 @@ { DPRINT1("Unable to capture the security descriptor!!!\n"); ObjectCreateInfo->SecurityDescriptor = NULL; - goto Quickie; + _SEH_LEAVE; } DPRINT("Probe done\n"); @@ -212,33 +212,33 @@ { Status = _SEH_GetExceptionCode(); DPRINT1("Failed\n"); - goto Quickie; } _SEH_END; - /* Now check if the Object Attributes had an Object Name */ - if (LocalObjectName) + if (NT_SUCCESS(Status)) { - DPRINT("Name Buffer: %wZ\n", LocalObjectName); - Status = ObpCaptureObjectName(ObjectName, - LocalObjectName, - AccessMode); - } - else - { - /* Clear the string */ - RtlInitUnicodeString(ObjectName, NULL); - - /* He can't have specified a Root Directory */ - if (ObjectCreateInfo->RootDirectory) + /* Now check if the Object Attributes had an Object Name */ + if (LocalObjectName) { - DPRINT1("Invalid name\n"); - Status = STATUS_OBJECT_NAME_INVALID; + DPRINT("Name Buffer: %wZ\n", LocalObjectName); + Status = ObpCaptureObjectName(ObjectName, + LocalObjectName, + AccessMode); } + else + { + /* Clear the string */ + RtlInitUnicodeString(ObjectName, NULL); + + /* He can't have specified a Root Directory */ + if (ObjectCreateInfo->RootDirectory) + { + DPRINT1("Invalid name\n"); + Status = STATUS_OBJECT_NAME_INVALID; + } + } } - -Quickie: - if (!NT_SUCCESS(Status)) + else { DPRINT1("Failed to capture, cleaning up\n"); ObpReleaseCapturedAttributes(ObjectCreateInfo);

19 years, 2 months

[weiden] 18392: some fixes for CheckTokenMembership:

by weiden＠svn.reactos.com

some fixes for CheckTokenMembership: - properly create an impersonation token from the primary token in case the thread is not impersonating - use NtAccessCheck to perform the access check Modified: trunk/reactos/lib/advapi32/token/token.c _____ Modified: trunk/reactos/lib/advapi32/token/token.c --- trunk/reactos/lib/advapi32/token/token.c 2005-10-09 22:35:54 UTC (rev 18391) +++ trunk/reactos/lib/advapi32/token/token.c 2005-10-10 11:44:37 UTC (rev 18392) @@ -323,79 +323,186 @@ * @implemented */ BOOL STDCALL -CheckTokenMembership (HANDLE ExistingTokenHandle, - PSID SidToCheck, - PBOOL IsMember) +CheckTokenMembership(IN HANDLE ExistingTokenHandle, + IN PSID SidToCheck, + OUT PBOOL IsMember) { - HANDLE AccessToken = NULL; - BOOL Result = FALSE; - DWORD dwSize; - DWORD i; - PTOKEN_GROUPS lpGroups = NULL; - TOKEN_TYPE TokenInformation; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + ACCESS_MASK GrantedAccess; + struct + { + PRIVILEGE_SET PrivilegeSet; + LUID_AND_ATTRIBUTES Privileges[4]; + } PrivBuffer; + ULONG PrivBufferSize = sizeof(PrivBuffer); + GENERIC_MAPPING GenericMapping = + { + STANDARD_RIGHTS_READ, + STANDARD_RIGHTS_WRITE, + STANDARD_RIGHTS_EXECUTE, + STANDARD_RIGHTS_ALL + }; + PACL Dacl; + ULONG SidLen; + HANDLE hToken; + NTSTATUS Status, AccessStatus; - if (IsMember == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + /* doesn't return gracefully if IsMember is NULL! */ + *IsMember = FALSE; - if (ExistingTokenHandle == NULL) - { - /* Get impersonation token of the calling thread */ - if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &ExistingTokenHandle)) - return FALSE; + SidLen = RtlLengthSid(SidToCheck); - if (!DuplicateToken(ExistingTokenHandle, SecurityAnonymous, &AccessToken)) + if (ExistingTokenHandle == NULL) { - CloseHandle(ExistingTokenHandle); - goto ByeBye; + Status = NtOpenThreadToken(NtCurrentThread(), + TOKEN_QUERY, + FALSE, + &hToken); + + if (Status == STATUS_NO_TOKEN) + { + /* we're not impersonating, open the primary token */ + Status = NtOpenProcessToken(NtCurrentProcess(), + TOKEN_QUERY | TOKEN_DUPLICATE, + &hToken); + if (NT_SUCCESS(Status)) + { + HANDLE hNewToken = FALSE; + BOOL DupRet; + + /* duplicate the primary token to create an impersonation token */ + DupRet = DuplicateTokenEx(hToken, + TOKEN_QUERY | TOKEN_IMPERSONATE, + NULL, + SecurityImpersonation, + TokenImpersonation, + &hNewToken); + + NtClose(hToken); + + if (!DupRet) + { + DPRINT1("Failed to duplicate the primary token!\n"); + return FALSE; + } + + hToken = hNewToken; + } + } + + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } } - CloseHandle(ExistingTokenHandle); - } - else - { - if (!GetTokenInformation(ExistingTokenHandle, TokenType, &TokenInformation, sizeof(TokenInformation), &dwSize)) - goto ByeBye; - if (TokenInformation != TokenImpersonation) + else { - /* Duplicate token to have a impersonation token */ - if (!DuplicateToken(ExistingTokenHandle, SecurityAnonymous, &AccessToken)) - return FALSE; + hToken = ExistingTokenHandle; } - else - AccessToken = ExistingTokenHandle; - } - *IsMember = FALSE; - /* Search in groups of the token */ - if (!GetTokenInformation(AccessToken, TokenGroups, NULL, 0, &dwSize)) - goto ByeBye; - lpGroups = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(), 0, dwSize); - if (!lpGroups) - goto ByeBye; - if (!GetTokenInformation(AccessToken, TokenGroups, lpGroups, dwSize, &dwSize)) - goto ByeBye; - for (i = 0; i < lpGroups->GroupCount; i++) - { - if (EqualSid(SidToCheck, &lpGroups->Groups[i].Sid)) + /* create a security descriptor */ + SecurityDescriptor = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(SECURITY_DESCRIPTOR) + + sizeof(ACL) + SidLen + + sizeof(ACCESS_ALLOWED_ACE)); + if (SecurityDescriptor == NULL) { - Result = TRUE; - *IsMember = TRUE; - goto ByeBye; + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; } - } - /* FIXME: Search in users of the token? */ - DPRINT1("CheckTokenMembership() partially implemented!\n"); - Result = TRUE; -ByeBye: - if (lpGroups != NULL) - HeapFree(GetProcessHeap(), 0, lpGroups); - if (AccessToken != NULL && AccessToken != ExistingTokenHandle) - CloseHandle(AccessToken); + Status = RtlCreateSecurityDescriptor(SecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } - return Result; + /* set the owner and group */ + Status = RtlSetOwnerSecurityDescriptor(SecurityDescriptor, + SidToCheck, + FALSE); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + Status = RtlSetGroupSecurityDescriptor(SecurityDescriptor, + SidToCheck, + FALSE); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* create the DACL */ + Dacl = (PACL)(SecurityDescriptor + 1); + Status = RtlCreateAcl(Dacl, + sizeof(ACL) + SidLen + sizeof(ACCESS_ALLOWED_ACE), + ACL_REVISION); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + 0x1, + SidToCheck); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* assign the DACL to the security descriptor */ + Status = RtlSetDaclSecurityDescriptor(SecurityDescriptor, + TRUE, + Dacl, + FALSE); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* it's time to perform the access check. Just use _some_ desired access right + (same as for the ACE) and see if we're getting it granted. This indicates + our SID is a member of the token. We however can't use a generic access + right as those aren't mapped and return an error (STATUS_GENERIC_NOT_MAPPED). */ + Status = NtAccessCheck(SecurityDescriptor, + hToken, + 0x1, + &GenericMapping, + &PrivBuffer.PrivilegeSet, + &PrivBufferSize, + &GrantedAccess, + &AccessStatus); + + if (NT_SUCCESS(Status) && NT_SUCCESS(AccessStatus) && (GrantedAccess == 0x1)) + { + *IsMember = TRUE; + } + +Cleanup: + if (hToken != ExistingTokenHandle) + { + NtClose(hToken); + } + + if (SecurityDescriptor != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + SecurityDescriptor); + } + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; }

19 years, 2 months

[greatlrd] 18391: Comment out a fixme, it make a user mode crash (ntoskrnl\ke\exception.c:94 KiRaiseException ), after this viso installer start working, thx Christoph_vW to found it.

by greatlrd＠svn.reactos.com

Comment out a fixme, it make a user mode crash (ntoskrnl\ke\exception.c:94 KiRaiseException ), after this viso installer start working, thx Christoph_vW to found it. Modified: trunk/reactos/lib/msi/msi.c _____ Modified: trunk/reactos/lib/msi/msi.c --- trunk/reactos/lib/msi/msi.c 2005-10-09 22:35:41 UTC (rev 18390) +++ trunk/reactos/lib/msi/msi.c 2005-10-09 22:35:54 UTC (rev 18391) @@ -821,7 +821,9 @@ INSTALLSTATE WINAPI MsiLocateComponentA(LPCSTR szComponent, LPSTR lpPathBuf, DWORD *pcchBuf) { - FIXME("%s %p %p\n", debugstr_a(szComponent), lpPathBuf, pcchBuf); + /* This FIXME will crash some installer + * FIXME("%s %p %p\n", debugstr_a(szComponent), lpPathBuf, pcchBuf); + */ return INSTALLSTATE_UNKNOWN; }

19 years, 2 months

[weiden] 18390: don't try to free the ansi strings passed by the caller

by weiden＠svn.reactos.com

don't try to free the ansi strings passed by the caller Modified: trunk/reactos/lib/advapi32/misc/shutdown.c _____ Modified: trunk/reactos/lib/advapi32/misc/shutdown.c --- trunk/reactos/lib/advapi32/misc/shutdown.c 2005-10-09 22:33:26 UTC (rev 18389) +++ trunk/reactos/lib/advapi32/misc/shutdown.c 2005-10-09 22:35:41 UTC (rev 18390) @@ -48,7 +48,6 @@ return FALSE; } rv = AbortSystemShutdownW(MachineNameW.Buffer); - RtlFreeAnsiString(&MachineNameA); RtlFreeUnicodeString(&MachineNameW); SetLastError(ERROR_SUCCESS); return rv; @@ -110,7 +109,6 @@ RtlInitAnsiString(&MachineNameA, lpMachineName); Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); if (STATUS_SUCCESS != Status) { - RtlFreeAnsiString(&MachineNameA); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -120,10 +118,8 @@ Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE); if (STATUS_SUCCESS != Status) { if (MachineNameW.Length) { - RtlFreeAnsiString(&MachineNameA); RtlFreeUnicodeString(&MachineNameW); } - RtlFreeAnsiString(&MessageA); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -136,11 +132,9 @@ bRebootAfterShutdown); LastError = GetLastError(); if (lpMachineName) { - RtlFreeAnsiString(&MachineNameA); RtlFreeUnicodeString(&MachineNameW); } if (lpMessage) { - RtlFreeAnsiString(&MessageA); RtlFreeUnicodeString(&MessageW); } SetLastError(LastError);

19 years, 2 months

[turner] 18389: Updated more cmd documentation. This included changing from eric's email to ros-dev / bugzilla for suggested way of reporting bugs.

by turner＠svn.reactos.com

Updated more cmd documentation. This included changing from eric's email to ros-dev / bugzilla for suggested way of reporting bugs. Deleted: trunk/reactos/subsys/system/cmd/bugs.txt Modified: trunk/reactos/subsys/system/cmd/files.txt Modified: trunk/reactos/subsys/system/cmd/readme.txt Added: trunk/reactos/subsys/system/cmd/readme2.txt Modified: trunk/reactos/subsys/system/cmd/todo.txt Deleted: trunk/reactos/subsys/system/cmd/wishlist.txt _____ Deleted: trunk/reactos/subsys/system/cmd/bugs.txt --- trunk/reactos/subsys/system/cmd/bugs.txt 2005-10-09 22:30:27 UTC (rev 18388) +++ trunk/reactos/subsys/system/cmd/bugs.txt 2005-10-09 22:33:26 UTC (rev 18389) @@ -1,22 +0,0 @@ - **** Please report bugs to ekohl(a)rz-online.de! **** - -Known bugs in CMD version 0.1 -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -o let set work with or without the '=' sign. People like it that way. - (I don't know, if I should really fix this?) - -o command.com ignores control-c and control-break, which makes it difficult - to quit typing a long file, among other things - -o "alias v = dir" doesn't work because of the spaces. - -o Dymatic commandline buffer need to be implement, current set to 8192bytes - -o Batchfile read row size need to be implement as dymatic not set to 2000bytes - - - - - - **** Please report bugs to ekohl(a)rz-online.de! **** _____ Modified: trunk/reactos/subsys/system/cmd/files.txt --- trunk/reactos/subsys/system/cmd/files.txt 2005-10-09 22:30:27 UTC (rev 18388) +++ trunk/reactos/subsys/system/cmd/files.txt 2005-10-09 22:33:26 UTC (rev 18389) @@ -1,16 +1,12 @@ Archive Contents ~~~~~~~~~~~~~~~~ -bugs.txt Bug List files.txt This file list -history.txt History of the shell development +history.txt History of revsions. Not to date. see svn.reactos.com for more info. license.txt GNU license - applies to all files named here readme.txt General shell info -todo.txt What I have to do -wishlist.txt Wish List +readme2.txt Techincal shell info +todo.txt Things that need to be implmented or fixed(including bugs) -makefile experimental makefile -makefile.lcc makefile for lcc-win - alias.c Alias code alias.h Alias header file attrib.c Implements attrib command _____ Modified: trunk/reactos/subsys/system/cmd/readme.txt --- trunk/reactos/subsys/system/cmd/readme.txt 2005-10-09 22:30:27 UTC (rev 18388) +++ trunk/reactos/subsys/system/cmd/readme.txt 2005-10-09 22:33:26 UTC (rev 18389) @@ -1,28 +1,19 @@ -ReactOS command line interpreter CMD version 0.1.1 -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +ReactOS command line interpreter CMD +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The ReactOS command line interpreter CMD is derived from FreeCOM, the FreeDOS command line interpreter. -We are going for 4NT compatibility but try to stay compatible with -WinNT's CMD.EXE too. +We are shooting mainly to be just like 2000/XP cmd.exe. They are very close and only a small number(none that i can recall off the top of my head, so maybe 0) differences have been found between those two. It has been reported that ROS cmd.exe does not work on nt4 because of a missing api. I'm hoping to fix this at some point. Compiling ~~~~~~~~~ -Cmd can be built in two different versions. A full version for use under -Windows 9x or Windows NT and a reduced version for use under ReactOS. +ROS cmd used to depend on __REACTOS__ to provide two different ways to build cmd. There is still code left in it for this but... The __REACTOS__ = 0 has not been develped, maintained. And therefore it does not even compile anymore. __REACTOS__ = 1 works fine on both windows(nt). and someday i plan to remove all the __REACTOS__ = 0. -Note: The full version won't run on ReactOS and the reduced version is not -usable under Win 9x/NT. +Using rbuild you can compile cmd seperatly by "make cmd_install". Also you can compile cmd using MSVC 6 and soon 7/8 hopefully. -To build the full version, make sure the symbol '__REACTOS__' is NOT defined -in 'rosapps/cmd/config.h' line 13. -To build the reduced version, make sure the symbol '__REACTOS__' is defined -in 'rosapps/cmd/config.h' line 13. - - Current Features ~~~~~~~~~~~~~~~~ - environment handling with prompt and path support. @@ -31,8 +22,7 @@ - batch file processing. - input/output redirection and piping. - alias support. - - filename completion (use TAB) - (this is still incomplete) + - filename completion (use TAB), both unix and windows style. Credits @@ -57,14 +47,9 @@ Brandon Turner <turnerb7(a)msu.edu> + Bugs ~~~~ -Batch file handling is still untested or buggy. Please report -any bug you find. +There is still many bugs ;) +Please report bugs to ReactOS team <ros-dev(a)reactos.org> or to bugzilla at www.reactos.org -Please report bugs to Eric Kohl <ekohl(a)rz-online.de>. - - -Good luck - - Eric Kohl _____ Added: trunk/reactos/subsys/system/cmd/readme2.txt --- trunk/reactos/subsys/system/cmd/readme2.txt 2005-10-09 22:30:27 UTC (rev 18388) +++ trunk/reactos/subsys/system/cmd/readme2.txt 2005-10-09 22:33:26 UTC (rev 18389) @@ -0,0 +1 @@ +Nothing yet... \ No newline at end of file _____ Modified: trunk/reactos/subsys/system/cmd/todo.txt --- trunk/reactos/subsys/system/cmd/todo.txt 2005-10-09 22:30:27 UTC (rev 18388) +++ trunk/reactos/subsys/system/cmd/todo.txt 2005-10-09 22:33:26 UTC (rev 18389) @@ -30,4 +30,7 @@ A lot of commands on failure just spit out GetLastError instead of looking for the real cause. It should give a better output to give at least some kinda clue what is wrong. *Reg Testing -We need more batch files like the one Royce made for "set /a". What out for if bugs when doing this... could lead to in the wrong direction when looking for a regression. \ No newline at end of file +We need more batch files like the one Royce made for "set /a". What out for if bugs when doing this... could lead to in the wrong direction when looking for a regression. + +*Remove dependance on __REACTOS__ +__REACTOS__ = 0 doesnt compile and is useless. __REACTOS__ = 1 has been the default and works just fine on windows. \ No newline at end of file _____ Deleted: trunk/reactos/subsys/system/cmd/wishlist.txt --- trunk/reactos/subsys/system/cmd/wishlist.txt 2005-10-09 22:30:27 UTC (rev 18388) +++ trunk/reactos/subsys/system/cmd/wishlist.txt 2005-10-09 22:33:26 UTC (rev 18389) @@ -1,12 +0,0 @@ - -Wishlist for ReactOS CMD -~~~~~~~~~~~~~~~~~~~~~~~~ - - - Progress indikator on long file operations (copy/move). - Percentage at the right side of the filename. - - - [cd test directory] should change to the subdirectory "test directory". - -More ideas? - - Eric Kohl <ekohl(a)rz-online.de>

19 years, 2 months

← Newer
1
...
50
51
52
53
54
55
56
...
74
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005