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

iphlpapi: Move dns server enumeration to a single function.

This commit is contained in:
Huw Davies 2013-09-13 12:52:53 +01:00 committed by Alexandre Julliard
parent 01d5632e5e
commit 334875f38e
1 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
dlls/iphlpapi/iphlpapi_main.c
View File

@ -933,45 +933,59 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
static ULONG get_dns_server_addresses(PIP_ADAPTER_DNS_SERVER_ADDRESS address, ULONG *len) static int get_dns_servers( SOCKADDR_STORAGE *servers, int num )
{ {
DWORD size; int i;
SOCKADDR_STORAGE *addr;
initialise_resolver(); initialise_resolver();
/* FIXME: no support for IPv6 DNS server addresses. Doing so requires
* sizeof SOCKADDR_STORAGE instead, and using _res._u._ext.nsaddrs when /* AF_INET6 not yet enumerated */
* available. if (!servers || !num)
*/ {
size = _res.nscount * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(SOCKADDR)); num = _res.nscount;
return num;
}
for (i = 0, addr = servers; addr < (servers + num) && i < _res.nscount; i++)
{
*(struct sockaddr_in *)addr = _res.nsaddr_list[i];
memset( (char *)addr + sizeof(struct sockaddr_in), 0,
sizeof(SOCKADDR_STORAGE) - sizeof(struct sockaddr_in) );
addr++;
}
return addr - servers;
}
static ULONG get_dns_server_addresses(PIP_ADAPTER_DNS_SERVER_ADDRESS address, ULONG *len)
{
int num = get_dns_servers( NULL, 0 );
DWORD size;
size = num * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(SOCKADDR_STORAGE));
if (!address || *len < size) if (!address || *len < size)
{ {
*len = size; *len = size;
return ERROR_BUFFER_OVERFLOW; return ERROR_BUFFER_OVERFLOW;
} }
*len = size; *len = size;
if (_res.nscount > 0) if (num > 0)
{ {
PIP_ADAPTER_DNS_SERVER_ADDRESS addr; PIP_ADAPTER_DNS_SERVER_ADDRESS addr = address;
SOCKADDR_STORAGE *sock_addrs = (SOCKADDR_STORAGE *)(address + num);
int i; int i;
for (i = 0, addr = address; i < _res.nscount && addr; get_dns_servers( sock_addrs, num );
i++, addr = addr->Next)
{
SOCKADDR_IN *sin;
addr->Address.iSockaddrLength = sizeof(SOCKADDR); for (i = 0; i < num; i++, addr = addr->Next)
addr->Address.lpSockaddr = {
(LPSOCKADDR)((PBYTE)addr + sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS)); addr->u.s.Length = sizeof(*addr);
sin = (SOCKADDR_IN *)addr->Address.lpSockaddr; addr->Address.iSockaddrLength = sizeof(SOCKADDR_IN);
sin->sin_family = WS_AF_INET; addr->Address.lpSockaddr = (SOCKADDR *)(sock_addrs + i);
sin->sin_port = _res.nsaddr_list[i].sin_port; if (i == num - 1)
memcpy(&sin->sin_addr, &_res.nsaddr_list[i].sin_addr, sizeof(sin->sin_addr));
if (i == _res.nscount - 1)
addr->Next = NULL; addr->Next = NULL;
else else
addr->Next = addr->Next = addr + 1;
(PIP_ADAPTER_DNS_SERVER_ADDRESS)((PBYTE)addr +
sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(SOCKADDR));
} }
} }
return ERROR_SUCCESS; return ERROR_SUCCESS;
@ -1623,28 +1637,32 @@ static DWORD get_dns_server_list(PIP_ADDR_STRING list,
PIP_ADDR_STRING firstDynamic, DWORD *len) PIP_ADDR_STRING firstDynamic, DWORD *len)
{ {
DWORD size; DWORD size;
int num = get_dns_servers( NULL, 0 );
initialise_resolver(); size = num * sizeof(IP_ADDR_STRING);
size = _res.nscount * sizeof(IP_ADDR_STRING);
if (!list || *len < size) { if (!list || *len < size) {
*len = size; *len = size;
return ERROR_BUFFER_OVERFLOW; return ERROR_BUFFER_OVERFLOW;
} }
*len = size; *len = size;
if (_res.nscount > 0) { if (num > 0) {
PIP_ADDR_STRING ptr; PIP_ADDR_STRING ptr;
int i; int i;
SOCKADDR_STORAGE *addr = HeapAlloc( GetProcessHeap(), 0, num * sizeof(SOCKADDR_STORAGE) );
for (i = 0, ptr = list; i < _res.nscount && ptr; i++, ptr = ptr->Next) { get_dns_servers( addr, num );
toIPAddressString(_res.nsaddr_list[i].sin_addr.s_addr,
for (i = 0, ptr = list; i < num; i++, ptr = ptr->Next) {
toIPAddressString(((struct sockaddr_in *)(addr + i))->sin_addr.s_addr,
ptr->IpAddress.String); ptr->IpAddress.String);
if (i == _res.nscount - 1) if (i == num - 1)
ptr->Next = NULL; ptr->Next = NULL;
else if (i == 0) else if (i == 0)
ptr->Next = firstDynamic; ptr->Next = firstDynamic;
else else
ptr->Next = (PIP_ADDR_STRING)((PBYTE)ptr + sizeof(IP_ADDR_STRING)); ptr->Next = (PIP_ADDR_STRING)((PBYTE)ptr + sizeof(IP_ADDR_STRING));
} }
HeapFree( GetProcessHeap(), 0, addr );
} }
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }