Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-15 09:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.13][IPHLPAPI][TCPIP][IP][LWIP] Port back minor fixes and formatting

Browse source 
by porting back:
0.4.15-dev-6231-g a5360f542f [IPHLPAPI] Formatting only, no functional change
partially 0.4.15-dev-4492-g 03422451b3 [IPHLPAPI] Add a missing \n in an ERR() logging within ipstats_reactos.c getNumRoutes(). And strip a good-path TRACE in return in the same func.
partially 0.4.14-dev-1425-g f540b2b20c [IPHLPAPI] GetAdaptersAddresses(): Add 1 free() in ERROR_NO_DATA case (#2526) (but leave out adding the comments in .h)

only whitespace fixes within [TCPIP][IP][LWIP]
This commit is contained in:
Joachim Henze 2023-07-03 01:10:48 +02:00
parent 94c4d9da6d
commit 7d4c736506
8 changed files with 319 additions and 516 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
dll/win32/iphlpapi/iphlpapi.spec
View file

@ -1,84 +1,84 @@
@ stdcall AddIPAddress( long long long ptr ptr )
@ stdcall AddIPAddress(long long long ptr ptr)
@ stub AllocateAndGetArpEntTableFromStack
@ stdcall AllocateAndGetIfTableFromStack( ptr long long long )
@ stdcall AllocateAndGetIpAddrTableFromStack( ptr long long long )
@ stdcall AllocateAndGetIpForwardTableFromStack( ptr long long long )
@ stdcall AllocateAndGetIpNetTableFromStack( ptr long long long )
@ stdcall AllocateAndGetTcpExTable2FromStack( ptr long long long long long )
@ stdcall AllocateAndGetTcpExTableFromStack( ptr long long long long )
@ stdcall AllocateAndGetTcpTableFromStack( ptr long long long )
@ stdcall AllocateAndGetUdpExTable2FromStack( ptr long long long long long )
@ stdcall AllocateAndGetUdpExTableFromStack( ptr long long long long )
@ stdcall AllocateAndGetUdpTableFromStack( ptr long long long )
@ stdcall AllocateAndGetIfTableFromStack(ptr long long long)
@ stdcall AllocateAndGetIpAddrTableFromStack(ptr long long long)
@ stdcall AllocateAndGetIpForwardTableFromStack(ptr long long long)
@ stdcall AllocateAndGetIpNetTableFromStack(ptr long long long)
@ stdcall AllocateAndGetTcpExTable2FromStack(ptr long long long long long)
@ stdcall AllocateAndGetTcpExTableFromStack(ptr long long long long)
@ stdcall AllocateAndGetTcpTableFromStack(ptr long long long)
@ stdcall AllocateAndGetUdpExTable2FromStack(ptr long long long long long)
@ stdcall AllocateAndGetUdpExTableFromStack(ptr long long long long)
@ stdcall AllocateAndGetUdpTableFromStack(ptr long long long)
@ stdcall CancelIPChangeNotify(ptr)
@ stub CancelSecurityHealthChangeNotify
@ stdcall CreateIpForwardEntry( ptr )
@ stdcall CreateIpNetEntry( ptr )
@ stdcall CreateProxyArpEntry( long long long )
@ stdcall DeleteIPAddress( long )
@ stdcall DeleteIpForwardEntry( ptr )
@ stdcall DeleteIpNetEntry( ptr )
@ stdcall DeleteProxyArpEntry( long long long )
@ stdcall CreateIpForwardEntry(ptr)
@ stdcall CreateIpNetEntry(ptr)
@ stdcall CreateProxyArpEntry(long long long)
@ stdcall DeleteIPAddress(long)
@ stdcall DeleteIpForwardEntry(ptr)
@ stdcall DeleteIpNetEntry(ptr)
@ stdcall DeleteProxyArpEntry(long long long)
@ stdcall DisableMediaSense(ptr ptr)
@ stdcall EnableRouter( ptr ptr )
@ stdcall FlushIpNetTable( long )
@ stdcall EnableRouter(ptr ptr)
@ stdcall FlushIpNetTable(long)
@ stub FlushIpNetTableFromStack
@ stdcall GetAdapterIndex( wstr ptr )
@ stdcall GetAdapterIndex(wstr ptr)
@ stdcall GetAdapterOrderMap()
@ stdcall GetAdaptersAddresses( long long ptr ptr ptr )
@ stdcall GetAdaptersInfo( ptr ptr )
@ stdcall GetBestInterface( long ptr )
@ stdcall GetAdaptersAddresses(long long ptr ptr ptr)
@ stdcall GetAdaptersInfo(ptr ptr)
@ stdcall GetBestInterface(long ptr)
@ stdcall GetBestInterfaceEx(ptr ptr)
@ stub GetBestInterfaceFromStack
@ stdcall GetBestRoute( long long long )
@ stdcall GetBestRoute(long long long)
@ stub GetBestRouteFromStack
@ stdcall GetExtendedTcpTable( ptr ptr long long long long )
@ stdcall GetExtendedUdpTable( ptr ptr long long long long )
@ stdcall GetFriendlyIfIndex( long )
@ stdcall GetIcmpStatistics( ptr )
@ stdcall GetExtendedTcpTable(ptr ptr long long long long)
@ stdcall GetExtendedUdpTable(ptr ptr long long long long)
@ stdcall GetFriendlyIfIndex(long)
@ stdcall GetIcmpStatistics(ptr)
@ stdcall GetIcmpStatisticsEx(ptr long)
@ stub GetIcmpStatsFromStack
@ stub GetIcmpStatsFromStackEx
@ stdcall GetIfEntry( ptr )
@ stdcall GetIfEntry(ptr)
@ stub GetIfEntryFromStack
@ stdcall GetIfTable( ptr ptr long )
@ stdcall GetIfTable(ptr ptr long)
@ stub GetIfTableFromStack
@ stub GetIgmpList
@ stdcall GetInterfaceInfo( ptr ptr )
@ stdcall GetIpAddrTable( ptr ptr long )
@ stdcall GetInterfaceInfo(ptr ptr)
@ stdcall GetIpAddrTable(ptr ptr long)
@ stub GetIpAddrTableFromStack
@ stdcall GetIpErrorString(long ptr ptr)
@ stdcall GetIpForwardTable( ptr ptr long )
@ stdcall GetIpForwardTable(ptr ptr long)
@ stub GetIpForwardTableFromStack
@ stdcall GetIpNetTable( ptr ptr long )
@ stdcall GetIpNetTable(ptr ptr long)
@ stub GetIpNetTableFromStack
@ stdcall GetIpStatistics( ptr )
@ stdcall GetIpStatistics(ptr)
@ stdcall GetIpStatisticsEx(ptr long)
@ stub GetIpStatsFromStack
@ stub GetIpStatsFromStackEx
@ stdcall GetNetworkParams( ptr ptr )
@ stdcall GetNumberOfInterfaces( ptr )
@ stdcall GetNetworkParams(ptr ptr)
@ stdcall GetNumberOfInterfaces(ptr)
@ stub GetOwnerModuleFromTcp6Entry
@ stdcall GetOwnerModuleFromTcpEntry ( ptr long ptr ptr )
@ stdcall GetOwnerModuleFromTcpEntry(ptr long ptr ptr)
@ stub GetOwnerModuleFromUdp6Entry
@ stdcall GetOwnerModuleFromUdpEntry ( ptr long ptr ptr )
@ stdcall GetPerAdapterInfo( long ptr ptr )
@ stdcall GetRTTAndHopCount( long ptr long ptr )
@ stdcall GetOwnerModuleFromUdpEntry(ptr long ptr ptr)
@ stdcall GetPerAdapterInfo(long ptr ptr)
@ stdcall GetRTTAndHopCount(long ptr long ptr)
@ stub GetTcpExTable2FromStack
@ stdcall GetTcpStatistics( ptr )
@ stdcall GetTcpStatistics(ptr)
@ stdcall GetTcpStatisticsEx(ptr long)
@ stub GetTcpStatsFromStack
@ stub GetTcpStatsFromStackEx
@ stdcall GetTcpTable( ptr ptr long )
@ stdcall GetTcpTable(ptr ptr long)
@ stub GetTcpTableFromStack
@ stub GetUdpExTable2FromStack
@ stdcall GetUdpStatistics( ptr )
@ stdcall GetUdpStatistics(ptr)
@ stdcall GetUdpStatisticsEx(ptr long)
@ stub GetUdpStatsFromStack
@ stub GetUdpStatsFromStackEx
@ stdcall GetUdpTable( ptr ptr long )
@ stdcall GetUdpTable(ptr ptr long)
@ stub GetUdpTableFromStack
@ stdcall GetUniDirectionalAdapterInfo( ptr ptr )
@ stdcall GetUniDirectionalAdapterInfo(ptr ptr)
@ stdcall Icmp6CreateFile()
@ stdcall -stub Icmp6ParseReplies(ptr long)
@ stdcall Icmp6SendEcho2(ptr ptr ptr ptr ptr ptr ptr long ptr ptr long long)
@ -102,8 +102,8 @@
@ stub InternalSetIpNetEntry
@ stub InternalSetIpStats
@ stub InternalSetTcpEntry
@ stdcall IpReleaseAddress( ptr )
@ stdcall IpRenewAddress( ptr )
@ stdcall IpReleaseAddress(ptr)
@ stdcall IpRenewAddress(ptr)
@ stub IsLocalAddress
@ stub NTPTimeToNTFileTime
@ stub NTTimeToNTPTime
@ -112,8 +112,8 @@
@ stdcall NhGetInterfaceNameFromGuid(ptr ptr ptr long long)
@ stdcall NhpAllocateAndGetInterfaceInfoFromStack(ptr ptr long ptr long)
@ stub NhpGetInterfaceIndexFromStack
@ stdcall NotifyAddrChange( ptr ptr )
@ stdcall NotifyRouteChange( ptr ptr )
@ stdcall NotifyAddrChange(ptr ptr)
@ stdcall NotifyRouteChange(ptr ptr)
@ stub NotifyRouteChangeEx
@ stub NotifySecurityHealthChange
@ stdcall _PfAddFiltersToInterface@24()
@ -136,22 +136,22 @@
@ stdcall SendARP(long long ptr ptr)
@ stub SetAdapterIpAddress
@ stub SetBlockRoutes
@ stdcall SetIfEntry( ptr )
@ stdcall SetIfEntry(ptr)
@ stub SetIfEntryToStack
@ stdcall SetIpForwardEntry( ptr )
@ stdcall SetIpForwardEntryToStack( ptr )
@ stdcall SetIpForwardEntry(ptr)
@ stdcall SetIpForwardEntryToStack(ptr)
@ stub SetIpMultihopRouteEntryToStack
@ stdcall SetIpNetEntry( ptr )
@ stdcall SetIpNetEntry(ptr)
@ stub SetIpNetEntryToStack
@ stub SetIpRouteEntryToStack
@ stdcall SetIpStatistics( ptr )
@ stdcall SetIpStatistics(ptr)
@ stub SetIpStatsToStack
@ stdcall SetIpTTL( long )
@ stdcall SetIpTTL(long)
@ stub SetProxyArpEntryToStack
@ stub SetRouteWithRef
@ stdcall SetTcpEntry( ptr )
@ stdcall SetTcpEntry(ptr)
@ stub SetTcpEntryToStack
@ stdcall UnenableRouter( ptr ptr )
@ stdcall UnenableRouter(ptr ptr)
@ stub do_echo_rep
@ stub do_echo_req
@ stub register_icmp

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

@ -54,9 +54,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
/******************************************************************
* AddIPAddress (IPHLPAPI.@)
*
*
* PARAMS
*
* Address [In]
* IpMask [In]
* IfIndex [In]
@ -64,9 +62,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
* NTEInstance [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI AddIPAddress(IPAddr Address, IPMask Netmask, DWORD IfIndex, PULONG NteContext, PULONG NteInstance)
{
@ -75,9 +71,9 @@ DWORD WINAPI AddIPAddress(IPAddr Address, IPMask Netmask, DWORD IfIndex, PULONG
DWORD getInterfaceGatewayByIndex(DWORD index)
{
DWORD ndx, retVal = 0, numRoutes = getNumRoutes();
RouteTable *table = getRouteTable();
if (!table) return 0;
DWORD ndx, retVal = 0, numRoutes = getNumRoutes();
RouteTable *table = getRouteTable();
if (!table) return 0;
for (ndx = 0; ndx < numRoutes; ndx++)
{
@ -91,9 +87,7 @@ DWORD getInterfaceGatewayByIndex(DWORD index)
/******************************************************************
* AllocateAndGetIfTableFromStack (IPHLPAPI.@)
*
*
* PARAMS
*
* ppIfTable [Out] -- pointer into which the MIB_IFTABLE is
* allocated and returned.
* 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
* GetIfTable returns otherwise
*
*/
DWORD WINAPI AllocateAndGetIfTableFromStack(PMIB_IFTABLE *ppIfTable,
BOOL bOrder, HANDLE heap, DWORD flags)
@ -135,18 +128,14 @@ DWORD WINAPI AllocateAndGetIfTableFromStack(PMIB_IFTABLE *ppIfTable,
/******************************************************************
* AllocateAndGetIpAddrTableFromStack (IPHLPAPI.@)
*
*
* PARAMS
*
* ppIpAddrTable [Out]
* bOrder [In] -- passed to GetIpAddrTable to order the table
* heap [In] -- heap from which the table is allocated
* flags [In] -- flags to HeapAlloc
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable,
BOOL bOrder, HANDLE heap, DWORD flags)
@ -179,7 +168,6 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable,
/******************************************************************
* AllocateAndGetIpForwardTableFromStack (IPHLPAPI.@)
*
*
* ppIpForwardTable [Out] -- pointer into which the MIB_IPFORWARDTABLE is
* allocated and returned.
* 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
* GetIpForwardTable returns otherwise
*
*/
DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *
ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags)
@ -221,18 +208,14 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *
/******************************************************************
* AllocateAndGetIpNetTableFromStack (IPHLPAPI.@)
*
*
* PARAMS
*
* ppIpNetTable [Out]
* bOrder [In] -- passed to GetIpNetTable to order the table
* heap [In] -- heap from which the table is allocated
* flags [In] -- flags to HeapAlloc
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable,
BOOL bOrder, HANDLE heap, DWORD flags)
@ -265,18 +248,14 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable,
/******************************************************************
* AllocateAndGetTcpTableFromStack (IPHLPAPI.@)
*
*
* PARAMS
*
* ppTcpTable [Out]
* bOrder [In] -- passed to GetTcpTable to order the table
* heap [In] -- heap from which the table is allocated
* flags [In] -- flags to HeapAlloc
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable,
BOOL bOrder, HANDLE heap, DWORD flags)
@ -309,9 +288,7 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable,
/******************************************************************
* AllocateAndGetTcpExTableFromStack (IPHLPAPI.@)
*
*
* PARAMS
*
* ppTcpTable [Out]
* bOrder [In] -- passed to GetExtendedTcpTable to order the table
* 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
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID *ppTcpTable,
BOOL bOrder, HANDLE heap, DWORD flags, DWORD family)
@ -354,9 +329,7 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack(PVOID *ppTcpTable,
/******************************************************************
* AllocateAndGetTcpExTable2FromStack (IPHLPAPI.@)
*
*
* PARAMS
*
* ppTcpTable [Out]
* bOrder [In] -- passed to GetExtendedTcpTable to order the table
* 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
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI AllocateAndGetTcpExTable2FromStack(PVOID *ppTcpTable,
BOOL bOrder, HANDLE heap, DWORD flags, DWORD family, TCP_TABLE_CLASS class)
@ -400,18 +371,14 @@ DWORD WINAPI AllocateAndGetTcpExTable2FromStack(PVOID *ppTcpTable,
/******************************************************************
* AllocateAndGetUdpTableFromStack (IPHLPAPI.@)
*
*
* PARAMS
*
* ppUdpTable [Out]
* bOrder [In] -- passed to GetUdpTable to order the table
* heap [In] -- heap from which the table is allocated
* flags [In] -- flags to HeapAlloc
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable,
BOOL bOrder, HANDLE heap, DWORD flags)
@ -444,9 +411,7 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable,
/******************************************************************
* AllocateAndGetUdpExTableFromStack (IPHLPAPI.@)
*
*
* PARAMS
*
* ppUdpTable [Out]
* bOrder [In] -- passed to GetExtendedUdpTable to order the table
* 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
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI AllocateAndGetUdpExTableFromStack(PVOID *ppUdpTable,
BOOL bOrder, HANDLE heap, DWORD flags, DWORD family)
@ -489,9 +452,7 @@ DWORD WINAPI AllocateAndGetUdpExTableFromStack(PVOID *ppUdpTable,
/******************************************************************
* AllocateAndGetUdpExTable2FromStack (IPHLPAPI.@)
*
*
* PARAMS
*
* ppUdpTable [Out]
* bOrder [In] -- passed to GetExtendedUdpTable to order the table
* 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
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI AllocateAndGetUdpExTable2FromStack(PVOID *ppUdpTable,
BOOL bOrder, HANDLE heap, DWORD flags, DWORD family, UDP_TABLE_CLASS class)
@ -535,15 +494,11 @@ DWORD WINAPI AllocateAndGetUdpExTable2FromStack(PVOID *ppUdpTable,
/******************************************************************
* CreateIpForwardEntry (IPHLPAPI.@)
*
*
* PARAMS
*
* pRoute [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI CreateIpForwardEntry(PMIB_IPFORWARDROW pRoute)
{
@ -554,15 +509,11 @@ DWORD WINAPI CreateIpForwardEntry(PMIB_IPFORWARDROW pRoute)
/******************************************************************
* CreateIpNetEntry (IPHLPAPI.@)
*
*
* PARAMS
*
* pArpEntry [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry)
{
@ -576,17 +527,13 @@ DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW pArpEntry)
/******************************************************************
* CreateProxyArpEntry (IPHLPAPI.@)
*
*
* PARAMS
*
* dwAddress [In]
* dwMask [In]
* dwIfIndex [In]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex)
{
@ -601,15 +548,11 @@ DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex)
/******************************************************************
* DeleteIPAddress (IPHLPAPI.@)
*
*
* PARAMS
*
* NTEContext [In]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI DeleteIPAddress(ULONG NTEContext)
{
@ -621,15 +564,11 @@ DWORD WINAPI DeleteIPAddress(ULONG NTEContext)
/******************************************************************
* DeleteIpForwardEntry (IPHLPAPI.@)
*
*
* PARAMS
*
* pRoute [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW pRoute)
{
@ -640,15 +579,11 @@ DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW pRoute)
/******************************************************************
* DeleteIpNetEntry (IPHLPAPI.@)
*
*
* PARAMS
*
* pArpEntry [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI DeleteIpNetEntry(PMIB_IPNETROW pArpEntry)
{
@ -662,17 +597,13 @@ DWORD WINAPI DeleteIpNetEntry(PMIB_IPNETROW pArpEntry)
/******************************************************************
* DeleteProxyArpEntry (IPHLPAPI.@)
*
*
* PARAMS
*
* dwAddress [In]
* dwMask [In]
* dwIfIndex [In]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI DeleteProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex)
{
@ -686,16 +617,12 @@ DWORD WINAPI DeleteProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex)
/******************************************************************
* EnableRouter (IPHLPAPI.@)
*
*
* PARAMS
*
* pHandle [In/Out]
* pOverlapped [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI EnableRouter(HANDLE * pHandle, OVERLAPPED * pOverlapped)
{
@ -711,15 +638,11 @@ DWORD WINAPI EnableRouter(HANDLE * pHandle, OVERLAPPED * pOverlapped)
/******************************************************************
* FlushIpNetTable (IPHLPAPI.@)
*
*
* PARAMS
*
* dwIfIndex [In]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex)
{
@ -734,16 +657,12 @@ DWORD WINAPI FlushIpNetTable(DWORD dwIfIndex)
/******************************************************************
* GetAdapterIndex (IPHLPAPI.@)
*
*
* PARAMS
*
* AdapterName [In/Out]
* IfIndex [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetAdapterIndex(LPWSTR AdapterName, PULONG IfIndex)
{
@ -757,16 +676,12 @@ DWORD WINAPI GetAdapterIndex(LPWSTR AdapterName, PULONG IfIndex)
/******************************************************************
* GetAdaptersInfo (IPHLPAPI.@)
*
*
* PARAMS
*
* pAdapterInfo [In/Out]
* pOutBufLen [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen)
{
@ -827,7 +742,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen)
winsEnabled = TRUE;
RegCloseKey(hKey);
}
TRACE("num of index is %lu\n", table->numIndexes);
TRACE("num of index is %lu\n", table->numIndexes);
for (ndx = 0; ndx < table->numIndexes; ndx++) {
PIP_ADAPTER_INFO ptr = &pAdapterInfo[ndx];
DWORD addrLen = sizeof(ptr->Address), type;
@ -894,16 +809,12 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen)
/******************************************************************
* GetBestInterface (IPHLPAPI.@)
*
*
* PARAMS
*
* dwDestAddr [In]
* pdwBestIfIndex [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex)
{
@ -927,17 +838,13 @@ DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex)
/******************************************************************
* GetBestRoute (IPHLPAPI.@)
*
*
* PARAMS
*
* dwDestAddr [In]
* dwSourceAddr [In]
* OUT [In]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDROW pBestRoute)
{
@ -1016,10 +923,7 @@ static int TcpTableSorter(const void *a, const void *b)
* RETURNS
* Success: NO_ERROR
* 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 i, count, size;
@ -1403,7 +1307,6 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, U
return ret;
}
static int UdpTableSorter(const void *a, const void *b)
{
int ret;
@ -1436,14 +1339,11 @@ static int UdpTableSorter(const void *a, const void *b)
* RETURNS
* Success: NO_ERROR
* 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 size;
DWORD ret = NO_ERROR;
DWORD ret = NO_ERROR;
if (!pdwSize)
{
@ -1551,15 +1451,11 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, U
/******************************************************************
* GetFriendlyIfIndex (IPHLPAPI.@)
*
*
* PARAMS
*
* IfIndex [In]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex)
{
@ -1574,15 +1470,11 @@ DWORD WINAPI GetFriendlyIfIndex(DWORD IfIndex)
/******************************************************************
* GetIcmpStatistics (IPHLPAPI.@)
*
*
* PARAMS
*
* pStats [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetIcmpStatistics(PMIB_ICMP pStats)
{
@ -1598,15 +1490,11 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP pStats)
/******************************************************************
* GetIfEntry (IPHLPAPI.@)
*
*
* PARAMS
*
* pIfRow [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow)
{
@ -1646,17 +1534,13 @@ static int IfTableSorter(const void *a, const void *b)
/******************************************************************
* GetIfTable (IPHLPAPI.@)
*
*
* PARAMS
*
* pIfTable [In/Out]
* pdwSize [In/Out]
* bOrder [In]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder)
{
@ -1714,16 +1598,12 @@ DWORD WINAPI GetIfTable(PMIB_IFTABLE pIfTable, PULONG pdwSize, BOOL bOrder)
/******************************************************************
* GetInterfaceInfo (IPHLPAPI.@)
*
*
* PARAMS
*
* pIfTable [In/Out]
* dwOutBufLen [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO pIfTable, PULONG dwOutBufLen)
{
@ -1801,17 +1681,13 @@ static int IpAddrTableSorter(const void *a, const void *b)
/******************************************************************
* GetIpAddrTable (IPHLPAPI.@)
*
*
* PARAMS
*
* pIpAddrTable [In/Out]
* pdwSize [In/Out]
* bOrder [In]
*
* RETURNS
*
* DWORD
*
*/
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.@)
*
*
* PARAMS
*
* pIpForwardTable [In/Out]
* pdwSize [In/Out]
* bOrder [In]
*
* RETURNS
*
* DWORD
*
*/
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.@)
*
*
* PARAMS
*
* pIpNetTable [In/Out]
* pdwSize [In/Out]
* bOrder [In]
*
* RETURNS
*
* DWORD
*
*/
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.@)
*
*
* PARAMS
*
* pStats [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats)
{
@ -2083,16 +1947,12 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS pStats)
/******************************************************************
* GetIpStatisticsEx (IPHLPAPI.@)
*
*
* PARAMS
*
* pStats [In/Out]
* dwFamily [In]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily)
{
@ -2107,16 +1967,12 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily)
/******************************************************************
* GetNetworkParams (IPHLPAPI.@)
*
*
* PARAMS
*
* pFixedInfo [In/Out]
* pOutBufLen [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen)
{
@ -2260,15 +2116,11 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen)
/******************************************************************
* GetNumberOfInterfaces (IPHLPAPI.@)
*
*
* PARAMS
*
* pdwNumIf [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf)
{
@ -2466,7 +2318,7 @@ static DWORD GetOwnerModuleFromTagEntry(DWORD OwningPid, DWORD OwningTag, TCPIP_
* NOTES
* The type of data returned in Buffer is indicated by the value of the Class parameter.
*/
DWORD WINAPI GetOwnerModuleFromTcpEntry( PMIB_TCPROW_OWNER_MODULE pTcpEntry, TCPIP_OWNER_MODULE_INFO_CLASS Class, PVOID Buffer, PDWORD pdwSize)
DWORD WINAPI GetOwnerModuleFromTcpEntry(PMIB_TCPROW_OWNER_MODULE pTcpEntry, TCPIP_OWNER_MODULE_INFO_CLASS Class, PVOID Buffer, PDWORD pdwSize)
{
/* If we have a service tag, that's a service connection */
if (pTcpEntry->OwningModuleInfo[0] != 0)
@ -2498,7 +2350,7 @@ DWORD WINAPI GetOwnerModuleFromTcpEntry( PMIB_TCPROW_OWNER_MODULE pTcpEntry, TCP
* NOTES
* The type of data returned in Buffer is indicated by the value of the Class parameter.
*/
DWORD WINAPI GetOwnerModuleFromUdpEntry( PMIB_UDPROW_OWNER_MODULE pUdpEntry, TCPIP_OWNER_MODULE_INFO_CLASS Class, PVOID Buffer, PDWORD pdwSize)
DWORD WINAPI GetOwnerModuleFromUdpEntry(PMIB_UDPROW_OWNER_MODULE pUdpEntry, TCPIP_OWNER_MODULE_INFO_CLASS Class, PVOID Buffer, PDWORD pdwSize)
{
/* If we have a service tag, that's a service connection */
if (pUdpEntry->OwningModuleInfo[0] != 0)
@ -2544,17 +2396,13 @@ static void CreateNameServerListEnumNamesFunc( PWCHAR Interface, PWCHAR Server,
/******************************************************************
* GetPerAdapterInfo (IPHLPAPI.@)
*
*
* PARAMS
*
* IfIndex [In]
* pPerAdapterInfo [In/Out]
* pOutBufLen [In/Out]
*
* RETURNS
*
* DWORD
*
*/
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.@)
*
*
* PARAMS
*
* DestIpAddress [In]
* HopCount [In/Out]
* MaxHops [In]
* RTT [In/Out]
*
* RETURNS
*
* BOOL
*
*/
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.@)
*
*
* PARAMS
*
* pStats [In/Out]
* dwFamily [In]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily)
{
@ -2667,15 +2507,11 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily)
/******************************************************************
* GetTcpStatistics (IPHLPAPI.@)
*
*
* PARAMS
*
* pStats [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats)
{
@ -2707,23 +2543,19 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats)
*/
DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder)
{
return GetExtendedTcpTable(pTcpTable, pdwSize, bOrder, AF_INET, TCP_TABLE_BASIC_ALL, 0);
return GetExtendedTcpTable(pTcpTable, pdwSize, bOrder, AF_INET, TCP_TABLE_BASIC_ALL, 0);
}
/******************************************************************
* GetUdpStatisticsEx (IPHLPAPI.@)
*
*
* PARAMS
*
* pStats [In/Out]
* dwFamily [In]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS pStats, DWORD dwFamily)
{
@ -2738,15 +2570,11 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS pStats, DWORD dwFamily)
/******************************************************************
* GetUdpStatistics (IPHLPAPI.@)
*
*
* PARAMS
*
* pStats [In/Out]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats)
{
@ -2757,21 +2585,17 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats)
/******************************************************************
* GetUdpTable (IPHLPAPI.@)
*
*
* PARAMS
*
* pUdpTable [In/Out]
* pdwSize [In/Out]
* bOrder [In]
*
* RETURNS
*
* DWORD
*
*/
DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder)
{
return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, AF_INET, UDP_TABLE_BASIC, 0);
return GetExtendedUdpTable(pUdpTable, pdwSize, bOrder, AF_INET, UDP_TABLE_BASIC, 0);
}
@ -2812,7 +2636,6 @@ DWORD WINAPI GetUniDirectionalAdapterInfo(PIP_UNIDIRECTIONAL_ADAPTER_ADDRESS pIP
* RETURNS
* Success: NO_ERROR
* Failure: error code from winerror.h
*
*/
DWORD WINAPI IpReleaseAddress(PIP_ADAPTER_INDEX_MAP AdapterInfo)
{
@ -2984,7 +2807,6 @@ DWORD WINAPI SetIfEntry(PMIB_IFROW pIfRow)
* RETURNS
* Success: NO_ERROR
* Failure: error code from winerror.h
*
*/
DWORD WINAPI SetIpForwardEntry(PMIB_IPFORWARDROW pRoute)
{
@ -3163,9 +2985,6 @@ PIP_ADAPTER_ORDER_MAP WINAPI GetAdapterOrderMap(VOID)
return 0L;
}
/*
* @implemented
*/
#ifdef GetAdaptersAddressesV1
DWORD WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG Family,ULONG Flags,PVOID Reserved,PIP_ADAPTER_ADDRESSES pAdapterAddresses,PULONG pOutBufLen)
{
@ -3186,7 +3005,10 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG Family,ULONG Flags,PVO
ret = openTcpFile(&tcpFile, FILE_READ_DATA);
if (!NT_SUCCESS(ret))
{
free(indexTable);
return ERROR_NO_DATA;
}
for (i = indexTable->numIndexes; i >= 0; i--)
{
@ -3467,9 +3289,6 @@ DWORD GetInterfaceNameInternal(_In_ const GUID * pInterfaceGUID,
return ERROR_SUCCESS;
}
/*
* @implemented
*/
DWORD WINAPI
NhGetInterfaceNameFromDeviceGuid(_In_ const GUID * pInterfaceGUID,
_Out_writes_bytes_to_(*pOutBufLen, *pOutBufLen) PWCHAR pInterfaceName,
@ -3485,9 +3304,6 @@ NhGetInterfaceNameFromDeviceGuid(_In_ const GUID * pInterfaceGUID,
return GetInterfaceNameInternal(pInterfaceGUID, pInterfaceName, pOutBufLen);
}
/*
* @implemented
*/
DWORD WINAPI
NhGetInterfaceNameFromGuid(_In_ const GUID * pInterfaceGUID,
_Out_writes_bytes_to_(*pOutBufLen, *pOutBufLen) PWCHAR pInterfaceName,

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

@ -108,14 +108,14 @@ NTSTATUS tdiGetMibForIpEntity
req.ID.toi_id = IP_MIB_STATS_ID;
req.ID.toi_entity = *ent;
status = DeviceIoControl( tcpFile,
IOCTL_TCP_QUERY_INFORMATION_EX,
&req,
sizeof(req),
entry,
sizeof(*entry),
&returnSize,
NULL );
status = DeviceIoControl(tcpFile,
IOCTL_TCP_QUERY_INFORMATION_EX,
&req,
sizeof(req),
entry,
sizeof(*entry),
&returnSize,
NULL);
TRACE("TdiGetMibForIpEntity() => status = 0x%08lx, entry = {\n"
" ipsi_forwarding ............ %lu\n"
@ -153,16 +153,16 @@ NTSTATUS tdiGetRoutesForIpEntity
TRACE("TdiGetRoutesForIpEntity(tcpFile 0x%p, entityId 0x%x)\n",
tcpFile, ent->tei_instance);
status = tdiGetSetOfThings( tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
IP_MIB_ARPTABLE_ENTRY_ID,
CL_NL_ENTITY,
ent->tei_instance,
0,
sizeof(IPRouteEntry),
(PVOID *)routes,
numRoutes);
status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
IP_MIB_ARPTABLE_ENTRY_ID,
CL_NL_ENTITY,
ent->tei_instance,
0,
sizeof(IPRouteEntry),
(PVOID *)routes,
numRoutes);
return status;
}
@ -174,16 +174,16 @@ NTSTATUS tdiGetIpAddrsForIpEntity
TRACE("TdiGetIpAddrsForIpEntity(tcpFile 0x%p, entityId 0x%x)\n",
tcpFile, ent->tei_instance);
status = tdiGetSetOfThings( tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
IP_MIB_ADDRTABLE_ENTRY_ID,
CL_NL_ENTITY,
ent->tei_instance,
0,
sizeof(IPAddrEntry),
(PVOID *)addrs,
numAddrs );
status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
IP_MIB_ADDRTABLE_ENTRY_ID,
CL_NL_ENTITY,
ent->tei_instance,
0,
sizeof(IPAddrEntry),
(PVOID *)addrs,
numAddrs);
return status;
}
@ -361,26 +361,27 @@ DWORD getNumRoutes(void)
TRACE("called.\n");
status = openTcpFile( &tcpFile, FILE_READ_DATA );
if( !NT_SUCCESS(status) ) {
status = openTcpFile(&tcpFile, FILE_READ_DATA);
if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status);
return 0;
}
status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities );
if( !NT_SUCCESS(status) ) {
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
if (!NT_SUCCESS(status)) {
ERR("tdiGetEntityIDSet returned 0x%08lx\n", status);
closeTcpFile( tcpFile );
return 0;
}
for( i = 0; i < numEntities; i++ ) {
if( isIpEntity( tcpFile, &entitySet[i] ) ) {
for (i = 0; i < numEntities; i++) {
if (isIpEntity(tcpFile, &entitySet[i])) {
IPSNMPInfo isnmp;
memset( &isnmp, 0, sizeof( isnmp ) );
status = tdiGetMibForIpEntity( tcpFile, &entitySet[i], &isnmp );
if( !NT_SUCCESS(status) ) {
ERR("tdiGetMibForIpEntity returned 0x%08lx, for i = %d", status, i);
memset(&isnmp, 0, sizeof(isnmp));
status = tdiGetMibForIpEntity(tcpFile, &entitySet[i], &isnmp);
if (!NT_SUCCESS(status)) {
ERR("tdiGetMibForIpEntity returned 0x%08lx, for i = %d\n", status, i);
numRoutes = 0;
break;
}
@ -388,10 +389,8 @@ DWORD getNumRoutes(void)
}
}
TRACE("numRoutes = %lu\n", numRoutes);
tdiFreeThingSet( entitySet );
closeTcpFile( tcpFile );
tdiFreeThingSet(entitySet);
closeTcpFile(tcpFile);
return numRoutes;
}
@ -415,17 +414,17 @@ RouteTable *getRouteTable(void)
DWORD numRoutes = getNumRoutes(), routesAdded = 0;
TDIEntityID ent;
HANDLE tcpFile;
NTSTATUS status = openTcpFile( &tcpFile, FILE_READ_DATA );
NTSTATUS status = openTcpFile(&tcpFile, FILE_READ_DATA);
int i;
if( !NT_SUCCESS(status) )
if (!NT_SUCCESS(status))
return 0;
TRACE("GETTING ROUTE TABLE\n");
out_route_table = HeapAlloc( GetProcessHeap(), 0,
sizeof(RouteTable) +
(sizeof(RouteEntry) * (numRoutes - 1)) );
out_route_table = HeapAlloc(GetProcessHeap(), 0,
sizeof(RouteTable) +
(sizeof(RouteEntry) * (numRoutes - 1)));
if (!out_route_table) {
closeTcpFile(tcpFile);
return NULL;
@ -433,28 +432,27 @@ RouteTable *getRouteTable(void)
out_route_table->numRoutes = numRoutes;
for( i = 0; routesAdded < out_route_table->numRoutes; i++ ) {
for (i = 0; routesAdded < out_route_table->numRoutes; i++) {
int j;
IPRouteEntry *route_set;
getNthIpEntity( tcpFile, i, &ent );
getNthIpEntity(tcpFile, i, &ent);
tdiGetRoutesForIpEntity( tcpFile, &ent, &route_set, &numRoutes );
if( !route_set ) {
closeTcpFile( tcpFile );
HeapFree( GetProcessHeap(), 0, out_route_table );
tdiGetRoutesForIpEntity(tcpFile, &ent, &route_set, &numRoutes);
if (!route_set) {
closeTcpFile(tcpFile);
HeapFree(GetProcessHeap(), 0, out_route_table);
return 0;
}
TRACE("%lu routes in instance %d\n", numRoutes, i);
#if 0
HexDump( route_set,
sizeof( IPRouteEntry ) *
snmpInfo.ipsi_numroutes );
HexDump(route_set,
sizeof(IPRouteEntry) *
snmpInfo.ipsi_numroutes);
#endif
for( j = 0; j < numRoutes; j++ ) {
for (j = 0; j < numRoutes; j++) {
int routeNum = j + routesAdded;
out_route_table->routes[routeNum].dest =
route_set[j].ire_dest;
@ -468,15 +466,13 @@ RouteTable *getRouteTable(void)
route_set[j].ire_metric1;
}
if( route_set ) tdiFreeThingSet( route_set );
if (route_set) tdiFreeThingSet(route_set);
routesAdded += numRoutes;
}
closeTcpFile( tcpFile );
closeTcpFile(tcpFile);
TRACE("status = 0x%08lx, out_route_table = 0x%p\n", status, out_route_table);
return out_route_table;
}
@ -492,39 +488,39 @@ DWORD getNumArpEntries(void)
TRACE("called.\n");
status = openTcpFile( &tcpFile, FILE_READ_DATA );
if( !NT_SUCCESS(status) ) {
status = openTcpFile(&tcpFile, FILE_READ_DATA);
if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status);
return 0;
}
status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities );
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
for( i = 0; i < numEntities; i++ ) {
if( isInterface( &entitySet[i] ) &&
hasArp( tcpFile, &entitySet[i] ) ) {
for (i = 0; i < numEntities; i++) {
if (isInterface(&entitySet[i]) && hasArp(tcpFile, &entitySet[i]))
{
status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
IP_MIB_ARPTABLE_ENTRY_ID,
AT_ENTITY,
entitySet[i].tei_instance,
0,
sizeof(MIB_IPNETROW),
(PVOID *)&IpArpTable,
&returnSize);
status = tdiGetSetOfThings( tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
IP_MIB_ARPTABLE_ENTRY_ID,
AT_ENTITY,
entitySet[i].tei_instance,
0,
sizeof(MIB_IPNETROW),
(PVOID *)&IpArpTable,
&returnSize );
if( status == STATUS_SUCCESS ) totalNumber += returnSize;
if( IpArpTable ) {
tdiFreeThingSet( IpArpTable );
IpArpTable = NULL;
}
}
if (status == STATUS_SUCCESS) totalNumber += returnSize;
if (IpArpTable) {
tdiFreeThingSet(IpArpTable);
IpArpTable = NULL;
}
}
}
closeTcpFile( tcpFile );
if( entitySet ) tdiFreeThingSet( entitySet );
closeTcpFile(tcpFile);
if (entitySet) tdiFreeThingSet(entitySet);
return totalNumber;
}
@ -542,50 +538,47 @@ PMIB_IPNETTABLE getArpTable(void)
totalNumber = getNumArpEntries();
status = openTcpFile( &tcpFile, FILE_READ_DATA );
if( !NT_SUCCESS(status) ) {
status = openTcpFile(&tcpFile, FILE_READ_DATA);
if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status);
return 0;
}
IpArpTable = HeapAlloc
( GetProcessHeap(), 0,
sizeof(DWORD) + (sizeof(MIB_IPNETROW) * totalNumber) );
IpArpTable = HeapAlloc(GetProcessHeap(), 0,
sizeof(DWORD) + (sizeof(MIB_IPNETROW) * totalNumber));
if (!IpArpTable) {
closeTcpFile(tcpFile);
return NULL;
}
status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities );
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
for( i = 0; i < numEntities; i++ ) {
if( isInterface( &entitySet[i] ) &&
hasArp( tcpFile, &entitySet[i] ) ) {
for (i = 0; i < numEntities; i++) {
if (isInterface(&entitySet[i]) && hasArp(tcpFile, &entitySet[i]))
{
status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
IP_MIB_ARPTABLE_ENTRY_ID,
AT_ENTITY,
entitySet[i].tei_instance,
0,
sizeof(MIB_IPNETROW),
(PVOID *)&AdapterArpTable,
&returnSize);
status = tdiGetSetOfThings( tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
IP_MIB_ARPTABLE_ENTRY_ID,
AT_ENTITY,
entitySet[i].tei_instance,
0,
sizeof(MIB_IPNETROW),
(PVOID *)&AdapterArpTable,
&returnSize );
if( status == STATUS_SUCCESS ) {
for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ )
if (status == STATUS_SUCCESS) {
for (TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++)
IpArpTable->table[CurrIdx] = AdapterArpTable[TmpIdx];
tdiFreeThingSet( AdapterArpTable );
tdiFreeThingSet(AdapterArpTable);
}
}
}
closeTcpFile( tcpFile );
tdiFreeThingSet( entitySet );
closeTcpFile(tcpFile);
tdiFreeThingSet(entitySet);
IpArpTable->dwNumEntries = CurrIdx;
return IpArpTable;
}
@ -616,39 +609,39 @@ DWORD getNumUdpEntries(void)
TRACE("called.\n");
status = openTcpFile( &tcpFile, FILE_READ_DATA );
if( !NT_SUCCESS(status) ) {
status = openTcpFile(&tcpFile, FILE_READ_DATA);
if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status);
return 0;
}
status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities );
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
for( i = 0; i < numEntities; i++ ) {
if( entitySet[i].tei_entity == CL_TL_ENTITY &&
hasArp( tcpFile, &entitySet[i] ) ) {
for (i = 0; i < numEntities; i++) {
if (entitySet[i].tei_entity == CL_TL_ENTITY && hasArp(tcpFile, &entitySet[i]))
{
status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
IP_MIB_ARPTABLE_ENTRY_ID,
CL_TL_ENTITY,
entitySet[i].tei_instance,
0,
sizeof(MIB_UDPROW),
(PVOID *)&IpUdpTable,
&returnSize);
status = tdiGetSetOfThings( tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
IP_MIB_ARPTABLE_ENTRY_ID,
CL_TL_ENTITY,
entitySet[i].tei_instance,
0,
sizeof(MIB_UDPROW),
(PVOID *)&IpUdpTable,
&returnSize );
if( status == STATUS_SUCCESS ) totalNumber += returnSize;
if( IpUdpTable ) {
tdiFreeThingSet( IpUdpTable );
IpUdpTable = NULL;
}
}
if (status == STATUS_SUCCESS) totalNumber += returnSize;
if (IpUdpTable) {
tdiFreeThingSet(IpUdpTable);
IpUdpTable = NULL;
}
}
}
closeTcpFile( tcpFile );
if( entitySet ) tdiFreeThingSet( entitySet );
closeTcpFile(tcpFile);
if (entitySet) tdiFreeThingSet(entitySet);
return totalNumber;
}
@ -666,52 +659,49 @@ PVOID getUdpTable(CLASS_TABLE Class)
totalNumber = getNumUdpEntries();
status = openTcpFile( &tcpFile, FILE_READ_DATA );
if( !NT_SUCCESS(status) ) {
status = openTcpFile(&tcpFile, FILE_READ_DATA);
if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status);
return 0;
}
IpUdpTable = HeapAlloc
( GetProcessHeap(), 0,
UdpTcpTableCall[Class].UdpOffset + (UdpTcpTableCall[Class].UdpSize * totalNumber) );
IpUdpTable = HeapAlloc(GetProcessHeap(), 0,
UdpTcpTableCall[Class].UdpOffset + (UdpTcpTableCall[Class].UdpSize * totalNumber));
if (!IpUdpTable) {
closeTcpFile(tcpFile);
return NULL;
}
status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities );
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
for( i = 0; i < numEntities; i++ ) {
if( entitySet[i].tei_entity == CL_TL_ENTITY &&
hasArp( tcpFile, &entitySet[i] ) ) {
for (i = 0; i < numEntities; i++) {
if (entitySet[i].tei_entity == CL_TL_ENTITY && hasArp(tcpFile, &entitySet[i]))
{
status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
UdpTcpTableCall[Class].TOIID,
CL_TL_ENTITY,
entitySet[i].tei_instance,
0,
UdpTcpTableCall[Class].UdpSize,
&AdapterUdpTable,
&returnSize);
status = tdiGetSetOfThings( tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
UdpTcpTableCall[Class].TOIID,
CL_TL_ENTITY,
entitySet[i].tei_instance,
0,
UdpTcpTableCall[Class].UdpSize,
&AdapterUdpTable,
&returnSize );
if( status == STATUS_SUCCESS ) {
for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ )
if (status == STATUS_SUCCESS) {
for (TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++)
CopyMemory(Add2Ptr(IpUdpTable, UdpTcpTableCall[Class].UdpOffset + UdpTcpTableCall[Class].UdpSize * CurrIdx),
Add2Ptr(AdapterUdpTable, UdpTcpTableCall[Class].UdpSize * TmpIdx),
UdpTcpTableCall[Class].UdpSize);
tdiFreeThingSet( AdapterUdpTable );
tdiFreeThingSet(AdapterUdpTable);
}
}
}
closeTcpFile( tcpFile );
tdiFreeThingSet( entitySet );
closeTcpFile(tcpFile);
tdiFreeThingSet(entitySet);
IpUdpTable->dwNumEntries = CurrIdx;
return IpUdpTable;
}
@ -727,39 +717,39 @@ DWORD getNumTcpEntries(void)
TRACE("called.\n");
status = openTcpFile( &tcpFile, FILE_READ_DATA );
if( !NT_SUCCESS(status) ) {
status = openTcpFile(&tcpFile, FILE_READ_DATA);
if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status);
return 0;
}
status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities );
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
for( i = 0; i < numEntities; i++ ) {
if( entitySet[i].tei_entity == CO_TL_ENTITY &&
hasArp( tcpFile, &entitySet[i] ) ) {
for (i = 0; i < numEntities; i++) {
if (entitySet[i].tei_entity == CO_TL_ENTITY && hasArp(tcpFile, &entitySet[i]))
{
status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
IP_MIB_ARPTABLE_ENTRY_ID,
CO_TL_ENTITY,
entitySet[i].tei_instance,
0,
sizeof(MIB_TCPROW),
(PVOID *)&IpTcpTable,
&returnSize);
status = tdiGetSetOfThings( tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
IP_MIB_ARPTABLE_ENTRY_ID,
CO_TL_ENTITY,
entitySet[i].tei_instance,
0,
sizeof(MIB_TCPROW),
(PVOID *)&IpTcpTable,
&returnSize );
if( status == STATUS_SUCCESS ) totalNumber += returnSize;
if( IpTcpTable ) {
tdiFreeThingSet( IpTcpTable );
IpTcpTable = NULL;
}
}
if (status == STATUS_SUCCESS) totalNumber += returnSize;
if (IpTcpTable) {
tdiFreeThingSet(IpTcpTable);
IpTcpTable = NULL;
}
}
}
closeTcpFile( tcpFile );
if( entitySet ) tdiFreeThingSet( entitySet );
closeTcpFile(tcpFile);
if (entitySet) tdiFreeThingSet(entitySet);
return totalNumber;
}
@ -777,51 +767,48 @@ PVOID getTcpTable(CLASS_TABLE Class)
totalNumber = getNumTcpEntries();
status = openTcpFile( &tcpFile, FILE_READ_DATA );
if( !NT_SUCCESS(status) ) {
status = openTcpFile(&tcpFile, FILE_READ_DATA);
if (!NT_SUCCESS(status))
{
ERR("openTcpFile returned 0x%08lx\n", status);
return 0;
}
IpTcpTable = HeapAlloc
( GetProcessHeap(), 0,
UdpTcpTableCall[Class].TcpOffset + (UdpTcpTableCall[Class].TcpSize * totalNumber) );
IpTcpTable = HeapAlloc(GetProcessHeap(), 0,
UdpTcpTableCall[Class].TcpOffset + (UdpTcpTableCall[Class].TcpSize * totalNumber));
if (!IpTcpTable) {
closeTcpFile(tcpFile);
return NULL;
}
status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities );
status = tdiGetEntityIDSet(tcpFile, &entitySet, &numEntities);
for( i = 0; i < numEntities; i++ ) {
if( entitySet[i].tei_entity == CO_TL_ENTITY &&
hasArp( tcpFile, &entitySet[i] ) ) {
for (i = 0; i < numEntities; i++) {
if (entitySet[i].tei_entity == CO_TL_ENTITY && hasArp(tcpFile, &entitySet[i]))
{
status = tdiGetSetOfThings(tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
UdpTcpTableCall[Class].TOIID,
CO_TL_ENTITY,
entitySet[i].tei_instance,
0,
UdpTcpTableCall[Class].TcpSize,
&AdapterTcpTable,
&returnSize);
status = tdiGetSetOfThings( tcpFile,
INFO_CLASS_PROTOCOL,
INFO_TYPE_PROVIDER,
UdpTcpTableCall[Class].TOIID,
CO_TL_ENTITY,
entitySet[i].tei_instance,
0,
UdpTcpTableCall[Class].TcpSize,
&AdapterTcpTable,
&returnSize );
if( status == STATUS_SUCCESS ) {
for( TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++ )
if (status == STATUS_SUCCESS) {
for (TmpIdx = 0; TmpIdx < returnSize; TmpIdx++, CurrIdx++)
CopyMemory(Add2Ptr(IpTcpTable, UdpTcpTableCall[Class].TcpOffset + UdpTcpTableCall[Class].TcpSize * CurrIdx),
Add2Ptr(AdapterTcpTable, UdpTcpTableCall[Class].TcpSize * TmpIdx),
UdpTcpTableCall[Class].TcpSize);
tdiFreeThingSet( AdapterTcpTable );
tdiFreeThingSet(AdapterTcpTable);
}
}
}
closeTcpFile( tcpFile );
tdiFreeThingSet( entitySet );
closeTcpFile(tcpFile);
tdiFreeThingSet(entitySet);
IpTcpTable->dwNumEntries = CurrIdx;
return IpTcpTable;
}

2
drivers/network/tcpip/include/titypes.h
View file

@ -275,7 +275,7 @@ typedef struct _CONNECTION_ENDPOINT {
LIST_ENTRY ShutdownRequest;/* Queued shutdown requests */
LIST_ENTRY PacketQueue; /* Queued received packets waiting to be processed */
/* Disconnect Timer */
KTIMER DisconnectTimer;
KDPC DisconnectDpc;

26
drivers/network/tcpip/tcpip/fileobjs.c
View file

@ -42,7 +42,7 @@ PADDRESS_FILE AddrSearchFirst(
PAF_SEARCH SearchContext)
{
KIRQL OldIrql;
SearchContext->Address = Address;
SearchContext->Port = Port;
SearchContext->Protocol = Protocol;
@ -115,7 +115,7 @@ LogActiveObjects(VOID)
PCONNECTION_ENDPOINT Conn;
DbgPrint("----------- TCP/IP Active Object Dump -------------\n");
TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql);
CurrentEntry = AddressFileListHead.Flink;
@ -144,19 +144,19 @@ LogActiveObjects(VOID)
}
DbgPrint("\n");
}
CurrentEntry = CurrentEntry->Flink;
}
TcpipReleaseSpinLock(&AddressFileListLock, OldIrql);
TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql);
CurrentEntry = ConnectionEndpointListHead.Flink;
while (CurrentEntry != &ConnectionEndpointListHead)
{
Conn = CONTAINING_RECORD(CurrentEntry, CONNECTION_ENDPOINT, ListEntry);
DbgPrint("Connection @ 0x%p | Ref count: %d\n", Conn, Conn->RefCount);
DbgPrint("\tPCB: ");
if (Conn->SocketContext == NULL)
@ -177,10 +177,10 @@ LogActiveObjects(VOID)
DbgPrint("\tReceive shutdown: %s\n", Conn->ReceiveShutdown ? "Yes" : "No");
if (Conn->ReceiveShutdown) DbgPrint("\tReceive shutdown status: 0x%x\n", Conn->ReceiveShutdownStatus);
DbgPrint("\tClosing: %s\n", Conn->Closing ? "Yes" : "No");
CurrentEntry = CurrentEntry->Flink;
}
TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql);
DbgPrint("---------------------------------------------------\n");
@ -237,7 +237,7 @@ PADDRESS_FILE AddrSearchNext(
PADDRESS_FILE Current = NULL;
BOOLEAN Found = FALSE;
PADDRESS_FILE StartingAddrFile;
TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql);
if (SearchContext->Next == &AddressFileListHead)
@ -465,14 +465,14 @@ NTSTATUS FileOpenAddress(
{
/* The client specified an explicit port so we force a bind to this */
AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port);
/* Check for bind success */
if (AddrFile->Port == 0xffff)
{
ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG);
return STATUS_ADDRESS_ALREADY_EXISTS;
}
/* Sanity check */
ASSERT(Address->Address[0].Address[0].sin_port == AddrFile->Port);
}
@ -480,7 +480,7 @@ NTSTATUS FileOpenAddress(
{
/* The client is trying to bind to a local address so allocate a port now too */
AddrFile->Port = TCPAllocatePort(0);
/* Check for bind success */
if (AddrFile->Port == 0xffff)
{

2
drivers/network/tcpip/tcpip/ninfo.c
View file

@ -25,7 +25,7 @@ TDI_STATUS InfoTdiQueryGetRouteTable( PIP_INTERFACE IF, PNDIS_BUFFER Buffer, PUI
TI_DbgPrint(DEBUG_INFO, ("Called, routes = %d\n",
RtCount));
if (RtCount == 0)
return InfoCopyOut(NULL, 0, NULL, BufferSize);

52
sdk/lib/drivers/ip/transport/tcp/tcp.c
View file

@ -43,29 +43,29 @@ DisconnectTimeoutDpc(PKDPC Dpc,
while (!IsListEmpty(&Connection->SendRequest))
{
Entry = RemoveHeadList(&Connection->SendRequest);
Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry);
Bucket->Information = 0;
Bucket->Status = STATUS_FILE_CLOSED;
CompleteBucket(Connection, Bucket, FALSE);
}
while (!IsListEmpty(&Connection->ShutdownRequest))
{
Entry = RemoveHeadList( &Connection->ShutdownRequest );
Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Bucket->Status = STATUS_TIMEOUT;
Bucket->Information = 0;
CompleteBucket(Connection, Bucket, FALSE);
}
UnlockObjectFromDpcLevel(Connection);
DereferenceObject(Connection);
}
@ -176,7 +176,7 @@ VOID TCPReceive(PIP_INTERFACE Interface, PIP_PACKET IPPacket)
TI_DbgPrint(DEBUG_TCP,("Sending packet %d (%d) to lwIP\n",
IPPacket->TotalSize,
IPPacket->HeaderSize));
LibIPInsertPacket(Interface->TCPContext, IPPacket->Header, IPPacket->TotalSize);
}
@ -202,13 +202,13 @@ NTSTATUS TCPStartup(VOID)
sizeof(TDI_BUCKET),
TDI_BUCKET_TAG,
0);
/* Initialize our IP library */
LibIPInitialize();
/* Register this protocol with IP layer */
IPRegisterProtocol(IPPROTO_TCP, TCPReceive);
TCPInitialized = TRUE;
return STATUS_SUCCESS;
@ -226,7 +226,7 @@ NTSTATUS TCPShutdown(VOID)
return STATUS_SUCCESS;
ExDeleteNPagedLookasideList(&TdiBucketLookasideList);
LibIPShutdown();
/* Deregister this protocol with IP layer */
@ -334,7 +334,7 @@ NTSTATUS TCPConnect
Status = TCPTranslateError(LibTCPBind(Connection,
&bindaddr,
Connection->AddressFile->Port));
if (NT_SUCCESS(Status))
{
/* Copy bind address into connection */
@ -348,7 +348,7 @@ NTSTATUS TCPConnect
{
/* Allocate the port in the port bitmap */
Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port);
/* This should never fail */
ASSERT(Connection->AddressFile->Port != 0xFFFF);
}
@ -364,12 +364,12 @@ NTSTATUS TCPConnect
UnlockObject(Connection, OldIrql);
return STATUS_NO_MEMORY;
}
Bucket->Request.RequestNotifyObject = (PVOID)Complete;
Bucket->Request.RequestContext = Context;
InsertTailList( &Connection->ConnectRequest, &Bucket->Entry );
Status = TCPTranslateError(LibTCPConnect(Connection,
&connaddr,
RemotePort));
@ -415,7 +415,7 @@ NTSTATUS TCPDisconnect
TCPTranslateError(LibTCPShutdown(Connection, 0, 1));
Status = STATUS_TIMEOUT;
}
else
else
{
/* Use the timeout specified or 1 second if none was specified */
if (Timeout)
@ -502,7 +502,7 @@ NTSTATUS TCPReceiveData
return STATUS_NO_MEMORY;
}
Bucket->Request.RequestNotifyObject = Complete;
Bucket->Request.RequestContext = Context;
@ -548,7 +548,7 @@ NTSTATUS TCPSendData
SendLength,
BytesSent,
FALSE));
TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Send: %x, %d\n", Status, SendLength));
/* Keep this request around ... there was no data yet */
@ -562,10 +562,10 @@ NTSTATUS TCPSendData
TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Failed to allocate bucket\n"));
return STATUS_NO_MEMORY;
}
Bucket->Request.RequestNotifyObject = Complete;
Bucket->Request.RequestContext = Context;
InsertTailList( &Connection->SendRequest, &Bucket->Entry );
TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Queued write irp\n"));
}
@ -607,7 +607,7 @@ NTSTATUS TCPGetSockAddress
struct ip_addr ipaddr;
NTSTATUS Status;
KIRQL OldIrql;
AddressIP->TAAddressCount = 1;
AddressIP->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP;
AddressIP->Address[0].AddressType = TDI_ADDRESS_TYPE_IP;
@ -628,9 +628,9 @@ NTSTATUS TCPGetSockAddress
}
UnlockObject(Connection, OldIrql);
AddressIP->Address[0].Address[0].in_addr = ipaddr.addr;
RtlZeroMemory(&AddressIP->Address[0].Address[0].sin_zero,
sizeof(AddressIP->Address[0].Address[0].sin_zero));

4
sdk/lib/drivers/lwip/src/include/rosip.h
View file

@ -25,7 +25,7 @@ struct lwip_callback_msg
{
/* Synchronization */
KEVENT Event;
/* Input */
union {
struct {
@ -60,7 +60,7 @@ struct lwip_callback_msg
int Callback;
} Close;
} Input;
/* Output */
union {
struct {