ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iphlpapi: For platforms that do not implement /proc, return Unimplemented for the functions trying to read from there.

This commit is contained in:
Aric Stewart 2007-10-24 11:15:39 -05:00 committed by Alexandre Julliard
parent 826a6d09d4
commit 80969f5303
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/iphlpapi/iphlpapi_main.c
View File

@ -852,8 +852,8 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO
if (!pBestRoute)
return ERROR_INVALID_PARAMETER;
AllocateAndGetIpForwardTableFromStack(&table, FALSE, GetProcessHeap(), 0);
if (table) {
ret = AllocateAndGetIpForwardTableFromStack(&table, FALSE, GetProcessHeap(), 0);
if (table && !ret) {
DWORD ndx, matchedBits, matchedNdx = 0;
for (ndx = 0, matchedBits = 0; ndx < table->dwNumEntries; ndx++) {
@ -881,7 +881,7 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO
}
HeapFree(GetProcessHeap(), 0, table);
}
else
else if (!ret)
ret = ERROR_OUTOFMEMORY;
TRACE("returning %d\n", ret);
return ret;

27
dlls/iphlpapi/ipstats.c
View File

@ -182,7 +182,10 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry)
fclose(fp);
}
else
{
ERR ("unimplemented!\n");
return ERROR_NOT_SUPPORTED;
}
return NO_ERROR;
}
@ -312,7 +315,10 @@ DWORD getICMPStats(MIB_ICMP *stats)
fclose(fp);
}
else
{
ERR ("unimplemented!\n");
return ERROR_NOT_SUPPORTED;
}
return NO_ERROR;
}
@ -426,7 +432,10 @@ DWORD getIPStats(PMIB_IPSTATS stats)
fclose(fp);
}
else
{
ERR ("unimplemented!\n");
return ERROR_NOT_SUPPORTED;
}
return NO_ERROR;
}
@ -519,7 +528,10 @@ DWORD getTCPStats(MIB_TCPSTATS *stats)
fclose(fp);
}
else
{
ERR ("unimplemented!\n");
return ERROR_NOT_SUPPORTED;
}
return NO_ERROR;
}
@ -575,7 +587,10 @@ DWORD getUDPStats(MIB_UDPSTATS *stats)
fclose(fp);
}
else
{
ERR ("unimplemented!\n");
return ERROR_NOT_SUPPORTED;
}
return NO_ERROR;
}
@ -963,7 +978,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE *ppIpForwardTable, HANDLE heap,
else
{
ERR ("unimplemented!\n");
return ERROR_INVALID_PARAMETER;
return ERROR_NOT_SUPPORTED;
}
#endif
}
@ -984,7 +999,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpNetTable, HANDLE heap, DWORD flags)
#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP)
ERR ("unimplemented!\n");
return ERROR_INVALID_PARAMETER;
return ERROR_NOT_SUPPORTED;
#endif
if (!ppIpNetTable)
@ -1064,6 +1079,8 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpNetTable, HANDLE heap, DWORD flags)
}
fclose(fp);
}
else
ret = ERROR_NOT_SUPPORTED;
}
else
ret = ERROR_OUTOFMEMORY;
@ -1082,7 +1099,7 @@ DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags)
#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP)
ERR ("unimplemented!\n");
return ERROR_INVALID_PARAMETER;
return ERROR_NOT_SUPPORTED;
#endif
if (!ppUdpTable)
@ -1132,6 +1149,8 @@ DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags)
}
fclose(fp);
}
else
ret = ERROR_NOT_SUPPORTED;
}
else
ret = ERROR_OUTOFMEMORY;
@ -1294,7 +1313,7 @@ DWORD getTcpTable(PMIB_TCPTABLE *ppTcpTable, DWORD maxEntries, HANDLE heap,
/* get from /proc/net/tcp, no error if can't */
fp = fopen("/proc/net/tcp", "r");
if (!fp)
return NO_ERROR;
return ERROR_NOT_SUPPORTED;
/* skip header line */
ptr = fgets(buf, sizeof(buf), fp);