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

iphlpapi: Implement GetBestInterfaceEx.

This commit is contained in:
Rob Shearman 2008-01-17 12:26:14 +00:00 committed by Alexandre Julliard
parent a4b18699ac
commit a9e9673460
3 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/iphlpapi/iphlpapi.spec
View File

@ -20,6 +20,7 @@
@ stub GetAdapterOrderMap @ stub GetAdapterOrderMap
@ stdcall GetAdaptersInfo( ptr ptr ) @ stdcall GetAdaptersInfo( ptr ptr )
@ stdcall GetBestInterface( long ptr ) @ stdcall GetBestInterface( long ptr )
@ stdcall GetBestInterfaceEx( ptr ptr )
@ stub GetBestInterfaceFromStack @ stub GetBestInterfaceFromStack
@ stdcall GetBestRoute( long long long ) @ stdcall GetBestRoute( long long long )
@ stub GetBestRouteFromStack @ stub GetBestRouteFromStack

36
dlls/iphlpapi/iphlpapi_main.c
View File

@ -39,9 +39,12 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winreg.h" #include "winreg.h"
#define USE_WS_PREFIX
#include "winsock2.h"
#include "iphlpapi.h" #include "iphlpapi.h"
#include "ifenum.h" #include "ifenum.h"
#include "ipstats.h" #include "ipstats.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi);
@ -811,18 +814,45 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen)
* Failure: error code from winerror.h * Failure: error code from winerror.h
*/ */
DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex) DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex)
{
struct WS_sockaddr_in sa_in;
memset(&sa_in, 0, sizeof(sa_in));
sa_in.sin_family = AF_INET;
sa_in.sin_addr.S_un.S_addr = dwDestAddr;
return GetBestInterfaceEx((struct WS_sockaddr *)&sa_in, pdwBestIfIndex);
}
/******************************************************************
* GetBestInterfaceEx (IPHLPAPI.@)
*
* Get the interface, with the best route for the given IP address.
*
* PARAMS
* dwDestAddr [In] IP address to search the interface for
* pdwBestIfIndex [Out] found best interface
*
* RETURNS
* Success: NO_ERROR
* Failure: error code from winerror.h
*/
DWORD WINAPI GetBestInterfaceEx(struct WS_sockaddr *pDestAddr, PDWORD pdwBestIfIndex)
{ {
DWORD ret; DWORD ret;
TRACE("dwDestAddr 0x%08lx, pdwBestIfIndex %p\n", dwDestAddr, pdwBestIfIndex); TRACE("pDestAddr %p, pdwBestIfIndex %p\n", pDestAddr, pdwBestIfIndex);
if (!pdwBestIfIndex) if (!pDestAddr || !pdwBestIfIndex)
ret = ERROR_INVALID_PARAMETER; ret = ERROR_INVALID_PARAMETER;
else { else {
MIB_IPFORWARDROW ipRow; MIB_IPFORWARDROW ipRow;
ret = GetBestRoute(dwDestAddr, 0, &ipRow); if (pDestAddr->sa_family == AF_INET) {
ret = GetBestRoute(((struct WS_sockaddr_in *)pDestAddr)->sin_addr.S_un.S_addr, 0, &ipRow);
if (ret == ERROR_SUCCESS) if (ret == ERROR_SUCCESS)
*pdwBestIfIndex = ipRow.dwForwardIfIndex; *pdwBestIfIndex = ipRow.dwForwardIfIndex;
} else {
FIXME("address family %d not supported\n", pDestAddr->sa_family);
ret = ERROR_NOT_SUPPORTED;
}
} }
TRACE("returning %d\n", ret); TRACE("returning %d\n", ret);
return ret; return ret;

10
include/iphlpapi.h
View File

@ -94,6 +94,16 @@ DWORD WINAPI GetUniDirectionalAdapterInfo(
DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex); DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex);
#ifdef __WINE_WINSOCKAPI_STDLIB_H
DWORD WINAPI GetBestInterfaceEx(
#ifdef USE_WS_PREFIX
struct WS_sockaddr *pDestAddr,
#else
struct sockaddr *pDestAddr,
#endif
PDWORD pdwBestIfIndex);
#endif
DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr,
PMIB_IPFORWARDROW pBestRoute); PMIB_IPFORWARDROW pBestRoute);