Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-29 10:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IPHLPAPI] Formatting only, no functional change

Browse source 
- Strip inconsistent spaces from the spec file.
- iphlpapi_main: Harmonize inconsistent and line-wasting function-comments and fix mixed space-tab-indentation.
- ipstats_reactos.c: Compactify horizontally accordingly to the coding guidelines

I am interested in that code for a backport, so I want it to be well-formatted.
Ftr: IPHLPAPI was *forked* more than a decade ago from Wine.
Therefore no diff ever was guarded within those files whenever we implemented anything here.
This commit is contained in:
Joachim Henze 2023-07-03 00:38:41 +02:00
parent 5ae65ab7a7
commit a5360f542f
3 changed files with 272 additions and 470 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

187
dll/win32/iphlpapi/iphlpapi_main.c
View file

@ -54,9 +54,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
/****************************************************************** /******************************************************************
* AddIPAddress (IPHLPAPI.@) * AddIPAddress (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* Address [In] * Address [In]
* IpMask [In] * IpMask [In]
* IfIndex [In] * IfIndex [In]
@ -64,9 +62,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
* NTEInstance [In/Out] * NTEInstance [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI AddIPAddress(IPAddr Address, IPMask Netmask, DWORD IfIndex, PULONG NteContext, PULONG NteInstance) DWORD WINAPI AddIPAddress(IPAddr Address, IPMask Netmask, DWORD IfIndex, PULONG NteContext, PULONG NteInstance)
{ {
@ -91,9 +87,7 @@ DWORD getInterfaceGatewayByIndex(DWORD index)
/****************************************************************** /******************************************************************
* AllocateAndGetIfTableFromStack (IPHLPAPI.@) * AllocateAndGetIfTableFromStack (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* ppIfTable [Out] -- pointer into which the MIB_IFTABLE is * ppIfTable [Out] -- pointer into which the MIB_IFTABLE is
* allocated and returned. * allocated and returned.
* bOrder [In] -- passed to GetIfTable to order the table * bOrder [In] -- passed to GetIfTable to order the table
@ -102,7 +96,6 @@ DWORD getInterfaceGatewayByIndex(DWORD index)
* *
* RETURNS -- ERROR_INVALID_PARAMETER if ppIfTable is NULL, whatever * RETURNS -- ERROR_INVALID_PARAMETER if ppIfTable is NULL, whatever
* GetIfTable returns otherwise * GetIfTable returns otherwise
*
*/ */
DWORD WINAPI AllocateAndGetIfTableFromStack(PMIB_IFTABLE *ppIfTable, DWORD WINAPI AllocateAndGetIfTableFromStack(PMIB_IFTABLE *ppIfTable,
BOOL bOrder, HANDLE heap, DWORD flags) BOOL bOrder, HANDLE heap, DWORD flags)
@ -135,18 +128,14 @@ DWORD WINAPI AllocateAndGetIfTableFromStack(PMIB_IFTABLE *ppIfTable,
/****************************************************************** /******************************************************************
* AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@) * AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* ppIpAddrTable [Out] * ppIpAddrTable [Out]
* bOrder [In] -- passed to GetIpAddrTable to order the table * bOrder [In] -- passed to GetIpAddrTable to order the table
* heap [In] -- heap from which the table is allocated * heap [In] -- heap from which the table is allocated
* flags [In] -- flags to HeapAlloc * flags [In] -- flags to HeapAlloc
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable,
BOOL bOrder, HANDLE heap, DWORD flags) BOOL bOrder, HANDLE heap, DWORD flags)
@ -179,7 +168,6 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable,
/****************************************************************** /******************************************************************
* AllocateAndGetIpForwardTableFromStack (IPHLPAPI.@) * AllocateAndGetIpForwardTableFromStack (IPHLPAPI.@)
* *
*
* ppIpForwardTable [Out] -- pointer into which the MIB_IPFORWARDTABLE is * ppIpForwardTable [Out] -- pointer into which the MIB_IPFORWARDTABLE is
* allocated and returned. * allocated and returned.
* bOrder [In] -- passed to GetIfTable to order the table * bOrder [In] -- passed to GetIfTable to order the table
@ -188,7 +176,6 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable,
* *
* RETURNS -- ERROR_INVALID_PARAMETER if ppIfTable is NULL, whatever * RETURNS -- ERROR_INVALID_PARAMETER if ppIfTable is NULL, whatever
* GetIpForwardTable returns otherwise * GetIpForwardTable returns otherwise
*
*/ */
DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE * DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *
ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags) ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags)
@ -221,18 +208,14 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *
/****************************************************************** /******************************************************************
* AllocateAndGetIpNetTableFromStack (IPHLPAPI.@) * AllocateAndGetIpNetTableFromStack (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* ppIpNetTable [Out] * ppIpNetTable [Out]
* bOrder [In] -- passed to GetIpNetTable to order the table * bOrder [In] -- passed to GetIpNetTable to order the table
* heap [In] -- heap from which the table is allocated * heap [In] -- heap from which the table is allocated
* flags [In] -- flags to HeapAlloc * flags [In] -- flags to HeapAlloc
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable,
BOOL bOrder, HANDLE heap, DWORD flags) BOOL bOrder, HANDLE heap, DWORD flags)
@ -265,18 +248,14 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable,
/****************************************************************** /******************************************************************
* AllocateAndGetTcpTableFromStack (IPHLPAPI.@) * AllocateAndGetTcpTableFromStack (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* ppTcpTable [Out] * ppTcpTable [Out]
* bOrder [In] -- passed to GetTcpTable to order the table * bOrder [In] -- passed to GetTcpTable to order the table
* heap [In] -- heap from which the table is allocated * heap [In] -- heap from which the table is allocated
* flags [In] -- flags to HeapAlloc * flags [In] -- flags to HeapAlloc
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable,
BOOL bOrder, HANDLE heap, DWORD flags) BOOL bOrder, HANDLE heap, DWORD flags)
@ -309,9 +288,7 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable,
/****************************************************************** /******************************************************************
* AllocateAndGetTcpExTableFromStack (IPHLPAPI.@) * AllocateAndGetTcpExTableFromStack (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* ppTcpTable [Out] * ppTcpTable [Out]
* bOrder [In] -- passed to GetExtendedTcpTable to order the table * bOrder [In] -- passed to GetExtendedTcpTable to order the table
* heap [In] -- heap from which the table is allocated * heap [In] -- heap from which the table is allocated
@ -319,9 +296,7 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable,
* family [In] -- passed to GetExtendedTcpTable to select INET family * family [In] -- passed to GetExtendedTcpTable to select INET family
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID *ppTcpTable, DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID *ppTcpTable,
BOOL bOrder, HANDLE heap, DWORD flags, DWORD family) BOOL bOrder, HANDLE heap, DWORD flags, DWORD family)
@ -354,9 +329,7 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID *ppTcpTable,
/****************************************************************** /******************************************************************
* AllocateAndGetTcpExTable2FromStack (IPHLPAPI.@) * AllocateAndGetTcpExTable2FromStack (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* ppTcpTable [Out] * ppTcpTable [Out]
* bOrder [In] -- passed to GetExtendedTcpTable to order the table * bOrder [In] -- passed to GetExtendedTcpTable to order the table
* heap [In] -- heap from which the table is allocated * heap [In] -- heap from which the table is allocated
@ -365,9 +338,7 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID *ppTcpTable,
* class [In] -- passed to GetExtendedTcpTable to select information * class [In] -- passed to GetExtendedTcpTable to select information
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI AllocateAndGetTcpExTable2FromStack(PVOID *ppTcpTable, DWORD WINAPI AllocateAndGetTcpExTable2FromStack(PVOID *ppTcpTable,
BOOL bOrder, HANDLE heap, DWORD flags, DWORD family, TCP_TABLE_CLASS class) BOOL bOrder, HANDLE heap, DWORD flags, DWORD family, TCP_TABLE_CLASS class)
@ -400,18 +371,14 @@ DWORD WINAPI AllocateAndGetTcpExTable2FromStack(PVOID *ppTcpTable,
/****************************************************************** /******************************************************************
* AllocateAndGetUdpTableFromStack (IPHLPAPI.@) * AllocateAndGetUdpTableFromStack (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* ppUdpTable [Out] * ppUdpTable [Out]
* bOrder [In] -- passed to GetUdpTable to order the table * bOrder [In] -- passed to GetUdpTable to order the table
* heap [In] -- heap from which the table is allocated * heap [In] -- heap from which the table is allocated
* flags [In] -- flags to HeapAlloc * flags [In] -- flags to HeapAlloc
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable,
BOOL bOrder, HANDLE heap, DWORD flags) BOOL bOrder, HANDLE heap, DWORD flags)
@ -444,9 +411,7 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable,
/****************************************************************** /******************************************************************
* AllocateAndGetUdpExTableFromStack (IPHLPAPI.@) * AllocateAndGetUdpExTableFromStack (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* ppUdpTable [Out] * ppUdpTable [Out]
* bOrder [In] -- passed to GetExtendedUdpTable to order the table * bOrder [In] -- passed to GetExtendedUdpTable to order the table
* heap [In] -- heap from which the table is allocated * heap [In] -- heap from which the table is allocated
@ -454,9 +419,7 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable,
* family [In] -- passed to GetExtendedUdpTable to select INET family * family [In] -- passed to GetExtendedUdpTable to select INET family
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI AllocateAndGetUdpExTableFromStack(PVOID *ppUdpTable, DWORD WINAPI AllocateAndGetUdpExTableFromStack(PVOID *ppUdpTable,
BOOL bOrder, HANDLE heap, DWORD flags, DWORD family) BOOL bOrder, HANDLE heap, DWORD flags, DWORD family)
@ -489,9 +452,7 @@ DWORD WINAPI AllocateAndGetUdpExTableFromStack(PVOID *ppUdpTable,
/****************************************************************** /******************************************************************
* AllocateAndGetUdpExTable2FromStack (IPHLPAPI.@) * AllocateAndGetUdpExTable2FromStack (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* ppUdpTable [Out] * ppUdpTable [Out]
* bOrder [In] -- passed to GetExtendedUdpTable to order the table * bOrder [In] -- passed to GetExtendedUdpTable to order the table
* heap [In] -- heap from which the table is allocated * heap [In] -- heap from which the table is allocated
@ -500,9 +461,7 @@ DWORD WINAPI AllocateAndGetUdpExTableFromStack(PVOID *ppUdpTable,
* class [In] -- passed to GetExtendedUdpTable to select information * class [In] -- passed to GetExtendedUdpTable to select information
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI AllocateAndGetUdpExTable2FromStack(PVOID *ppUdpTable, DWORD WINAPI AllocateAndGetUdpExTable2FromStack(PVOID *ppUdpTable,
BOOL bOrder, HANDLE heap, DWORD flags, DWORD family, UDP_TABLE_CLASS class) BOOL bOrder, HANDLE heap, DWORD flags, DWORD family, UDP_TABLE_CLASS class)
@ -535,15 +494,11 @@ DWORD WINAPI AllocateAndGetUdpExTable2FromStack(PVOID *ppUdpTable,
/****************************************************************** /******************************************************************
* CreateIpForwardEntry (IPHLPAPI.@) * CreateIpForwardEntry (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pRoute [In/Out] * pRoute [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI CreateIpForwardEntry(PMIB_IPFORWARDROW pRoute) DWORD WINAPI CreateIpForwardEntry(PMIB_IPFORWARDROW pRoute)
{ {
@ -554,15 +509,11 @@ DWORD WINAPI CreateIpForwardEntry(PMIB_IPFORWARDROW pRoute)
/****************************************************************** /******************************************************************
* CreateIpNetEntry (IPHLPAPI.@) * CreateIpNetEntry (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pArpEntry [In/Out] * pArpEntry [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry) DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry)
{ {
@ -576,17 +527,13 @@ DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry)
/****************************************************************** /******************************************************************
* CreateProxyArpEntry (IPHLPAPI.@) * CreateProxyArpEntry (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* dwAddress [In] * dwAddress [In]
* dwMask [In] * dwMask [In]
* dwIfIndex [In] * dwIfIndex [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex) DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex)
{ {
@ -601,15 +548,11 @@ DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex)
/****************************************************************** /******************************************************************
* DeleteIPAddress (IPHLPAPI.@) * DeleteIPAddress (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* NTEContext [In] * NTEContext [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI DeleteIPAddress(ULONG NTEContext) DWORD WINAPI DeleteIPAddress(ULONG NTEContext)
{ {
@ -621,15 +564,11 @@ DWORD WINAPI DeleteIPAddress(ULONG NTEContext)
/****************************************************************** /******************************************************************
* DeleteIpForwardEntry (IPHLPAPI.@) * DeleteIpForwardEntry (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pRoute [In/Out] * pRoute [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW pRoute) DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW pRoute)
{ {
@ -640,15 +579,11 @@ DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW pRoute)
/****************************************************************** /******************************************************************
* DeleteIpNetEntry (IPHLPAPI.@) * DeleteIpNetEntry (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pArpEntry [In/Out] * pArpEntry [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI DeleteIpNetEntry(PMIB_IPNETROW pArpEntry) DWORD WINAPI DeleteIpNetEntry(PMIB_IPNETROW pArpEntry)
{ {
@ -662,17 +597,13 @@ DWORD WINAPI DeleteIpNetEntry(PMIB_IPNETROW pArpEntry)
/****************************************************************** /******************************************************************
* DeleteProxyArpEntry (IPHLPAPI.@) * DeleteProxyArpEntry (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* dwAddress [In] * dwAddress [In]
* dwMask [In] * dwMask [In]
* dwIfIndex [In] * dwIfIndex [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI DeleteProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex) DWORD WINAPI DeleteProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex)
{ {
@ -686,16 +617,12 @@ DWORD WINAPI DeleteProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex)
/****************************************************************** /******************************************************************
* EnableRouter (IPHLPAPI.@) * EnableRouter (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pHandle [In/Out] * pHandle [In/Out]
* pOverlapped [In/Out] * pOverlapped [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI EnableRouter(HANDLE * pHandle, OVERLAPPED * pOverlapped) DWORD WINAPI EnableRouter(HANDLE * pHandle, OVERLAPPED * pOverlapped)
{ {
@ -711,15 +638,11 @@ DWORD WINAPI EnableRouter(HANDLE * pHandle, OVERLAPPED * pOverlapped)
/****************************************************************** /******************************************************************
* FlushIpNetTable (IPHLPAPI.@) * FlushIpNetTable (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* dwIfIndex [In] * dwIfIndex [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex) DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex)
{ {
@ -734,16 +657,12 @@ DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex)
/****************************************************************** /******************************************************************
* GetAdapterIndex (IPHLPAPI.@) * GetAdapterIndex (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* AdapterName [In/Out] * AdapterName [In/Out]
* IfIndex [In/Out] * IfIndex [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetAdapterIndex(LPWSTR AdapterName, PULONG IfIndex) DWORD WINAPI GetAdapterIndex(LPWSTR AdapterName, PULONG IfIndex)
{ {
@ -757,16 +676,12 @@ DWORD WINAPI GetAdapterIndex(LPWSTR AdapterName, PULONG IfIndex)
/****************************************************************** /******************************************************************
* GetAdaptersInfo (IPHLPAPI.@) * GetAdaptersInfo (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pAdapterInfo [In/Out] * pAdapterInfo [In/Out]
* pOutBufLen [In/Out] * pOutBufLen [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen)
{ {
@ -893,16 +808,12 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen)
/****************************************************************** /******************************************************************
* GetBestInterface (IPHLPAPI.@) * GetBestInterface (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* dwDestAddr [In] * dwDestAddr [In]
* pdwBestIfIndex [In/Out] * pdwBestIfIndex [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex) DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex)
{ {
@ -926,17 +837,13 @@ DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex)
/****************************************************************** /******************************************************************
* GetBestRoute (IPHLPAPI.@) * GetBestRoute (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* dwDestAddr [In] * dwDestAddr [In]
* dwSourceAddr [In] * dwSourceAddr [In]
* OUT [In] * OUT [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDROW pBestRoute) DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDROW pBestRoute)
{ {
@ -1015,10 +922,7 @@ static int TcpTableSorter(const void *a, const void *b)
* RETURNS * RETURNS
* Success: NO_ERROR * Success: NO_ERROR
* Failure: either ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER * Failure: either ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER
*
* NOTES
*/ */
DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, ULONG ulAf, TCP_TABLE_CLASS TableClass, ULONG Reserved) DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, ULONG ulAf, TCP_TABLE_CLASS TableClass, ULONG Reserved)
{ {
DWORD i, count, size; DWORD i, count, size;
@ -1402,7 +1306,6 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U
return ret; return ret;
} }
static int UdpTableSorter(const void *a, const void *b) static int UdpTableSorter(const void *a, const void *b)
{ {
int ret; int ret;
@ -1435,10 +1338,7 @@ static int UdpTableSorter(const void *a, const void *b)
* RETURNS * RETURNS
* Success: NO_ERROR * Success: NO_ERROR
* Failure: either ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER * Failure: either ERROR_INSUFFICIENT_BUFFER or ERROR_INVALID_PARAMETER
*
* NOTES
*/ */
DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, ULONG ulAf, UDP_TABLE_CLASS TableClass, ULONG Reserved) DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, ULONG ulAf, UDP_TABLE_CLASS TableClass, ULONG Reserved)
{ {
DWORD size; DWORD size;
@ -1550,15 +1450,11 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, U
/****************************************************************** /******************************************************************
* GetFriendlyIfIndex (IPHLPAPI.@) * GetFriendlyIfIndex (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* IfIndex [In] * IfIndex [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex) DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex)
{ {
@ -1573,15 +1469,11 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex)
/****************************************************************** /******************************************************************
* GetIcmpStatistics (IPHLPAPI.@) * GetIcmpStatistics (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pStats [In/Out] * pStats [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetIcmpStatistics(PMIB_ICMP pStats) DWORD WINAPI GetIcmpStatistics(PMIB_ICMP pStats)
{ {
@ -1597,15 +1489,11 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP pStats)
/****************************************************************** /******************************************************************
* GetIfEntry (IPHLPAPI.@) * GetIfEntry (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pIfRow [In/Out] * pIfRow [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow) DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow)
{ {
@ -1645,17 +1533,13 @@ static int IfTableSorter(const void *a, const void *b)
/****************************************************************** /******************************************************************
* GetIfTable (IPHLPAPI.@) * GetIfTable (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pIfTable [In/Out] * pIfTable [In/Out]
* pdwSize [In/Out] * pdwSize [In/Out]
* bOrder [In] * bOrder [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder) DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder)
{ {
@ -1713,16 +1597,12 @@ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder)
/****************************************************************** /******************************************************************
* GetInterfaceInfo (IPHLPAPI.@) * GetInterfaceInfo (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pIfTable [In/Out] * pIfTable [In/Out]
* dwOutBufLen [In/Out] * dwOutBufLen [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO pIfTable, PULONG dwOutBufLen) DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO pIfTable, PULONG dwOutBufLen)
{ {
@ -1801,17 +1681,13 @@ static int IpAddrTableSorter(const void *a, const void *b)
/****************************************************************** /******************************************************************
* GetIpAddrTable (IPHLPAPI.@) * GetIpAddrTable (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pIpAddrTable [In/Out] * pIpAddrTable [In/Out]
* pdwSize [In/Out] * pdwSize [In/Out]
* bOrder [In] * bOrder [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL bOrder) DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL bOrder)
{ {
@ -1905,17 +1781,13 @@ static int IpForwardTableSorter(const void *a, const void *b)
/****************************************************************** /******************************************************************
* GetIpForwardTable (IPHLPAPI.@) * GetIpForwardTable (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pIpForwardTable [In/Out] * pIpForwardTable [In/Out]
* pdwSize [In/Out] * pdwSize [In/Out]
* bOrder [In] * bOrder [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetIpForwardTable(PMIB_IPFORWARDTABLE pIpForwardTable, PULONG pdwSize, BOOL bOrder) DWORD WINAPI GetIpForwardTable(PMIB_IPFORWARDTABLE pIpForwardTable, PULONG pdwSize, BOOL bOrder)
{ {
@ -2005,17 +1877,13 @@ static int IpNetTableSorter(const void *a, const void *b)
/****************************************************************** /******************************************************************
* GetIpNetTable (IPHLPAPI.@) * GetIpNetTable (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pIpNetTable [In/Out] * pIpNetTable [In/Out]
* pdwSize [In/Out] * pdwSize [In/Out]
* bOrder [In] * bOrder [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOrder) DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOrder)
{ {
@ -2065,15 +1933,11 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr
/****************************************************************** /******************************************************************
* GetIpStatistics (IPHLPAPI.@) * GetIpStatistics (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pStats [In/Out] * pStats [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats) DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats)
{ {
@ -2083,16 +1947,12 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats)
/****************************************************************** /******************************************************************
* GetIpStatisticsEx (IPHLPAPI.@) * GetIpStatisticsEx (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pStats [In/Out] * pStats [In/Out]
* dwFamily [In] * dwFamily [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily) DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily)
{ {
@ -2107,16 +1967,12 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily)
/****************************************************************** /******************************************************************
* GetNetworkParams (IPHLPAPI.@) * GetNetworkParams (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pFixedInfo [In/Out] * pFixedInfo [In/Out]
* pOutBufLen [In/Out] * pOutBufLen [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen)
{ {
@ -2260,15 +2116,11 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen)
/****************************************************************** /******************************************************************
* GetNumberOfInterfaces (IPHLPAPI.@) * GetNumberOfInterfaces (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pdwNumIf [In/Out] * pdwNumIf [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf) DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf)
{ {
@ -2544,17 +2396,13 @@ static void CreateNameServerListEnumNamesFunc( PWCHAR Interface, PWCHAR Server,
/****************************************************************** /******************************************************************
* GetPerAdapterInfo (IPHLPAPI.@) * GetPerAdapterInfo (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* IfIndex [In] * IfIndex [In]
* pPerAdapterInfo [In/Out] * pPerAdapterInfo [In/Out]
* pOutBufLen [In/Out] * pOutBufLen [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterInfo, PULONG pOutBufLen) DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterInfo, PULONG pOutBufLen)
{ {
@ -2618,18 +2466,14 @@ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterIn
/****************************************************************** /******************************************************************
* GetRTTAndHopCount (IPHLPAPI.@) * GetRTTAndHopCount (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* DestIpAddress [In] * DestIpAddress [In]
* HopCount [In/Out] * HopCount [In/Out]
* MaxHops [In] * MaxHops [In]
* RTT [In/Out] * RTT [In/Out]
* *
* RETURNS * RETURNS
*
* BOOL * BOOL
*
*/ */
BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHops, PULONG RTT) BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHops, PULONG RTT)
{ {
@ -2643,16 +2487,12 @@ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHo
/****************************************************************** /******************************************************************
* GetTcpStatisticsEx (IPHLPAPI.@) * GetTcpStatisticsEx (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pStats [In/Out] * pStats [In/Out]
* dwFamily [In] * dwFamily [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily) DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily)
{ {
@ -2667,15 +2507,11 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily)
/****************************************************************** /******************************************************************
* GetTcpStatistics (IPHLPAPI.@) * GetTcpStatistics (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pStats [In/Out] * pStats [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats) DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats)
{ {
@ -2714,16 +2550,12 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder)
/****************************************************************** /******************************************************************
* GetUdpStatisticsEx (IPHLPAPI.@) * GetUdpStatisticsEx (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pStats [In/Out] * pStats [In/Out]
* dwFamily [In] * dwFamily [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS pStats, DWORD dwFamily) DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS pStats, DWORD dwFamily)
{ {
@ -2738,15 +2570,11 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS pStats, DWORD dwFamily)
/****************************************************************** /******************************************************************
* GetUdpStatistics (IPHLPAPI.@) * GetUdpStatistics (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pStats [In/Out] * pStats [In/Out]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats) DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats)
{ {
@ -2757,17 +2585,13 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats)
/****************************************************************** /******************************************************************
* GetUdpTable (IPHLPAPI.@) * GetUdpTable (IPHLPAPI.@)
* *
*
* PARAMS * PARAMS
*
* pUdpTable [In/Out] * pUdpTable [In/Out]
* pdwSize [In/Out] * pdwSize [In/Out]
* bOrder [In] * bOrder [In]
* *
* RETURNS * RETURNS
*
* DWORD * DWORD
*
*/ */
DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder)
{ {
@ -2812,7 +2636,6 @@ DWORD WINAPI GetUniDirectionalAdapterInfo(PIP_UNIDIRECTIONAL_ADAPTER_ADDRESS pIP
* RETURNS * RETURNS
* Success: NO_ERROR * Success: NO_ERROR
* Failure: error code from winerror.h * Failure: error code from winerror.h
*
*/ */
DWORD WINAPI IpReleaseAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo) DWORD WINAPI IpReleaseAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo)
{ {
@ -2984,7 +2807,6 @@ DWORD WINAPI SetIfEntry(PMIB_IFROW pIfRow)
* RETURNS * RETURNS
* Success: NO_ERROR * Success: NO_ERROR
* Failure: error code from winerror.h * Failure: error code from winerror.h
*
*/ */
DWORD WINAPI SetIpForwardEntry(PMIB_IPFORWARDROW pRoute) DWORD WINAPI SetIpForwardEntry(PMIB_IPFORWARDROW pRoute)
{ {
@ -3163,9 +2985,6 @@ PIP_ADAPTER_ORDER_MAP WINAPI GetAdapterOrderMap(VOID)
return 0L; return 0L;
} }
/*
* @implemented
*/
#ifdef GetAdaptersAddressesV1 #ifdef GetAdaptersAddressesV1
DWORD WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG Family,ULONG Flags,PVOID Reserved,PIP_ADAPTER_ADDRESSES pAdapterAddresses,PULONG pOutBufLen) DWORD WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG Family,ULONG Flags,PVOID Reserved,PIP_ADAPTER_ADDRESSES pAdapterAddresses,PULONG pOutBufLen)
{ {
@ -3470,9 +3289,6 @@ DWORD GetInterfaceNameInternal(_In_ const GUID * pInterfaceGUID,
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
/*
* @implemented
*/
DWORD WINAPI DWORD WINAPI
NhGetInterfaceNameFromDeviceGuid(_In_ const GUID * pInterfaceGUID, NhGetInterfaceNameFromDeviceGuid(_In_ const GUID * pInterfaceGUID,
_Out_writes_bytes_to_(*pOutBufLen, *pOutBufLen) PWCHAR pInterfaceName, _Out_writes_bytes_to_(*pOutBufLen, *pOutBufLen) PWCHAR pInterfaceName,
@ -3488,9 +3304,6 @@ NhGetInterfaceNameFromDeviceGuid(_In_ const GUID * pInterfaceGUID,
return GetInterfaceNameInternal(pInterfaceGUID, pInterfaceName, pOutBufLen); return GetInterfaceNameInternal(pInterfaceGUID, pInterfaceName, pOutBufLen);
} }
/*
* @implemented
*/
DWORD WINAPI DWORD WINAPI
NhGetInterfaceNameFromGuid(_In_ const GUID * pInterfaceGUID, NhGetInterfaceNameFromGuid(_In_ const GUID * pInterfaceGUID,
_Out_writes_bytes_to_(*pOutBufLen, *pOutBufLen) PWCHAR pInterfaceName, _Out_writes_bytes_to_(*pOutBufLen, *pOutBufLen) PWCHAR pInterfaceName,

69
dll/win32/iphlpapi/ipstats_reactos.c
View file

@ -374,7 +374,8 @@ DWORD getNumRoutes(void)
TRACE("called.\n"); TRACE("called.\n");
status = openTcpFile(&tcpFile, FILE_READ_DATA); status = openTcpFile(&tcpFile, FILE_READ_DATA);
if( !NT_SUCCESS(status) ) { if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status); ERR("openTcpFile returned 0x%08lx\n", status);
return 0; return 0;
} }
@ -452,7 +453,6 @@ RouteTable *getRouteTable(void)
getNthIpEntity(tcpFile, i, &ent); getNthIpEntity(tcpFile, i, &ent);
tdiGetRoutesForIpEntity(tcpFile, &ent, &route_set, &numRoutes); tdiGetRoutesForIpEntity(tcpFile, &ent, &route_set, &numRoutes);
if (!route_set) { if (!route_set) {
closeTcpFile(tcpFile); closeTcpFile(tcpFile);
HeapFree(GetProcessHeap(), 0, out_route_table); HeapFree(GetProcessHeap(), 0, out_route_table);
@ -486,9 +486,7 @@ RouteTable *getRouteTable(void)
} }
closeTcpFile(tcpFile); closeTcpFile(tcpFile);
TRACE("status = 0x%08lx, out_route_table = 0x%p\n", status, out_route_table); TRACE("status = 0x%08lx, out_route_table = 0x%p\n", status, out_route_table);
return out_route_table; return out_route_table;
} }
@ -505,7 +503,8 @@ DWORD getNumArpEntries(void)
TRACE("called.\n"); TRACE("called.\n");
status = openTcpFile(&tcpFile, FILE_READ_DATA); status = openTcpFile(&tcpFile, FILE_READ_DATA);
if( !NT_SUCCESS(status) ) { if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status); ERR("openTcpFile returned 0x%08lx\n", status);
return 0; return 0;
} }
@ -513,9 +512,8 @@ DWORD getNumArpEntries(void)
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
for (i = 0; i < numEntities; i++) { for (i = 0; i < numEntities; i++) {
if( isInterface( &entitySet[i] ) && if (isInterface(&entitySet[i]) && hasArp(tcpFile, &entitySet[i]))
hasArp( tcpFile, &entitySet[i] ) ) { {
status = tdiGetSetOfThings(tcpFile, status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL, INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER, INFO_TYPE_PROVIDER,
@ -555,13 +553,13 @@ PMIB_IPNETTABLE getArpTable(void)
totalNumber = getNumArpEntries(); totalNumber = getNumArpEntries();
status = openTcpFile(&tcpFile, FILE_READ_DATA); status = openTcpFile(&tcpFile, FILE_READ_DATA);
if( !NT_SUCCESS(status) ) { if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status); ERR("openTcpFile returned 0x%08lx\n", status);
return 0; return 0;
} }
IpArpTable = HeapAlloc IpArpTable = HeapAlloc(GetProcessHeap(), 0,
( GetProcessHeap(), 0,
sizeof(DWORD) + (sizeof(MIB_IPNETROW) * totalNumber)); sizeof(DWORD) + (sizeof(MIB_IPNETROW) * totalNumber));
if (!IpArpTable) { if (!IpArpTable) {
closeTcpFile(tcpFile); closeTcpFile(tcpFile);
@ -571,9 +569,8 @@ PMIB_IPNETTABLE getArpTable(void)
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
for (i = 0; i < numEntities; i++) { for (i = 0; i < numEntities; i++) {
if( isInterface( &entitySet[i] ) && if (isInterface(&entitySet[i]) && hasArp(tcpFile, &entitySet[i]))
hasArp( tcpFile, &entitySet[i] ) ) { {
status = tdiGetSetOfThings(tcpFile, status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL, INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER, INFO_TYPE_PROVIDER,
@ -594,10 +591,8 @@ PMIB_IPNETTABLE getArpTable(void)
} }
closeTcpFile(tcpFile); closeTcpFile(tcpFile);
tdiFreeThingSet(entitySet); tdiFreeThingSet(entitySet);
IpArpTable->dwNumEntries = CurrIdx; IpArpTable->dwNumEntries = CurrIdx;
return IpArpTable; return IpArpTable;
} }
@ -629,7 +624,8 @@ DWORD getNumUdpEntries(void)
TRACE("called.\n"); TRACE("called.\n");
status = openTcpFile(&tcpFile, FILE_READ_DATA); status = openTcpFile(&tcpFile, FILE_READ_DATA);
if( !NT_SUCCESS(status) ) { if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status); ERR("openTcpFile returned 0x%08lx\n", status);
return 0; return 0;
} }
@ -637,9 +633,8 @@ DWORD getNumUdpEntries(void)
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
for (i = 0; i < numEntities; i++) { for (i = 0; i < numEntities; i++) {
if( entitySet[i].tei_entity == CL_TL_ENTITY && if (entitySet[i].tei_entity == CL_TL_ENTITY && hasArp(tcpFile, &entitySet[i]))
hasArp( tcpFile, &entitySet[i] ) ) { {
status = tdiGetSetOfThings(tcpFile, status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL, INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER, INFO_TYPE_PROVIDER,
@ -679,13 +674,13 @@ PVOID getUdpTable(CLASS_TABLE Class)
totalNumber = getNumUdpEntries(); totalNumber = getNumUdpEntries();
status = openTcpFile(&tcpFile, FILE_READ_DATA); status = openTcpFile(&tcpFile, FILE_READ_DATA);
if( !NT_SUCCESS(status) ) { if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status); ERR("openTcpFile returned 0x%08lx\n", status);
return 0; return 0;
} }
IpUdpTable = HeapAlloc IpUdpTable = HeapAlloc(GetProcessHeap(), 0,
( GetProcessHeap(), 0,
UdpTcpTableCall[Class].UdpOffset + (UdpTcpTableCall[Class].UdpSize * totalNumber)); UdpTcpTableCall[Class].UdpOffset + (UdpTcpTableCall[Class].UdpSize * totalNumber));
if (!IpUdpTable) { if (!IpUdpTable) {
closeTcpFile(tcpFile); closeTcpFile(tcpFile);
@ -695,9 +690,8 @@ PVOID getUdpTable(CLASS_TABLE Class)
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
for (i = 0; i < numEntities; i++) { for (i = 0; i < numEntities; i++) {
if( entitySet[i].tei_entity == CL_TL_ENTITY && if (entitySet[i].tei_entity == CL_TL_ENTITY && hasArp(tcpFile, &entitySet[i]))
hasArp( tcpFile, &entitySet[i] ) ) { {
status = tdiGetSetOfThings(tcpFile, status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL, INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER, INFO_TYPE_PROVIDER,
@ -720,10 +714,8 @@ PVOID getUdpTable(CLASS_TABLE Class)
} }
closeTcpFile(tcpFile); closeTcpFile(tcpFile);
tdiFreeThingSet(entitySet); tdiFreeThingSet(entitySet);
IpUdpTable->dwNumEntries = CurrIdx; IpUdpTable->dwNumEntries = CurrIdx;
return IpUdpTable; return IpUdpTable;
} }
@ -740,7 +732,8 @@ DWORD getNumTcpEntries(void)
TRACE("called.\n"); TRACE("called.\n");
status = openTcpFile(&tcpFile, FILE_READ_DATA); status = openTcpFile(&tcpFile, FILE_READ_DATA);
if( !NT_SUCCESS(status) ) { if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status); ERR("openTcpFile returned 0x%08lx\n", status);
return 0; return 0;
} }
@ -748,9 +741,8 @@ DWORD getNumTcpEntries(void)
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
for (i = 0; i < numEntities; i++) { for (i = 0; i < numEntities; i++) {
if( entitySet[i].tei_entity == CO_TL_ENTITY && if (entitySet[i].tei_entity == CO_TL_ENTITY && hasArp(tcpFile, &entitySet[i]))
hasArp( tcpFile, &entitySet[i] ) ) { {
status = tdiGetSetOfThings(tcpFile, status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL, INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER, INFO_TYPE_PROVIDER,
@ -790,13 +782,13 @@ PVOID getTcpTable(CLASS_TABLE Class)
totalNumber = getNumTcpEntries(); totalNumber = getNumTcpEntries();
status = openTcpFile(&tcpFile, FILE_READ_DATA); status = openTcpFile(&tcpFile, FILE_READ_DATA);
if( !NT_SUCCESS(status) ) { if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status); ERR("openTcpFile returned 0x%08lx\n", status);
return 0; return 0;
} }
IpTcpTable = HeapAlloc IpTcpTable = HeapAlloc(GetProcessHeap(), 0,
( GetProcessHeap(), 0,
UdpTcpTableCall[Class].TcpOffset + (UdpTcpTableCall[Class].TcpSize * totalNumber)); UdpTcpTableCall[Class].TcpOffset + (UdpTcpTableCall[Class].TcpSize * totalNumber));
if (!IpTcpTable) { if (!IpTcpTable) {
closeTcpFile(tcpFile); closeTcpFile(tcpFile);
@ -806,9 +798,8 @@ PVOID getTcpTable(CLASS_TABLE Class)
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities); status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
for (i = 0; i < numEntities; i++) { for (i = 0; i < numEntities; i++) {
if( entitySet[i].tei_entity == CO_TL_ENTITY && if (entitySet[i].tei_entity == CO_TL_ENTITY && hasArp(tcpFile, &entitySet[i]))
hasArp( tcpFile, &entitySet[i] ) ) { {
status = tdiGetSetOfThings(tcpFile, status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL, INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER, INFO_TYPE_PROVIDER,
@ -831,9 +822,7 @@ PVOID getTcpTable(CLASS_TABLE Class)
} }
closeTcpFile(tcpFile); closeTcpFile(tcpFile);
tdiFreeThingSet(entitySet); tdiFreeThingSet(entitySet);
IpTcpTable->dwNumEntries = CurrIdx; IpTcpTable->dwNumEntries = CurrIdx;
return IpTcpTable; return IpTcpTable;
} }