Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 18:46:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed case of zero DNS servers specified in the registry.

Browse source 
svn path=/trunk/; revision=8056
This commit is contained in:
Art Yerkes 2004-02-06 20:21:58 +00:00
parent b58dac7496
commit 022e7cfde7
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
reactos/lib/iphlpapi/iphlpapi.c
View file

@ -534,31 +534,43 @@ GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen)
/* Now we have the name servers, place the first one in the struct, /* Now we have the name servers, place the first one in the struct,
and follow it with the rest */ and follow it with the rest */
if (!PrivateNSEnum.NumServers) if (!PrivateNSEnum.NumServers)
RtlZeroMemory( &pFixedInfo->DnsServerList, sizeof(IP_ADDR_STRING) ); RtlZeroMemory( &pFixedInfo->DnsServerList,
sizeof(pFixedInfo->DnsServerList) );
else else
memcpy( &pFixedInfo->DnsServerList, &PrivateNSEnum.AddrString[0], memcpy( &pFixedInfo->DnsServerList, &PrivateNSEnum.AddrString[0],
sizeof(PrivateNSEnum.AddrString[0]) ); sizeof(PrivateNSEnum.AddrString[0]) );
pFixedInfo->CurrentDnsServer = &pFixedInfo->DnsServerList;
if (PrivateNSEnum.NumServers > 1) if (PrivateNSEnum.NumServers > 1) {
pFixedInfo->CurrentDnsServer = &pFixedInfo->DnsServerList;
memcpy( &AddressAfterFixedInfo[0], memcpy( &AddressAfterFixedInfo[0],
&PrivateNSEnum.AddrString[1], &PrivateNSEnum.AddrString[1],
sizeof(IP_ADDR_STRING) * (PrivateNSEnum.NumServers - 1) ); sizeof(IP_ADDR_STRING) * (PrivateNSEnum.NumServers - 1) );
else } else if (PrivateNSEnum.NumServers == 0) {
pFixedInfo->CurrentDnsServer->Next = 0; pFixedInfo->CurrentDnsServer = &pFixedInfo->DnsServerList;
} else {
pFixedInfo->CurrentDnsServer = 0;
}
for( CurrentServer = 0; for( CurrentServer = 0;
CurrentServer < PrivateNSEnum.NumServers - 1; PrivateNSEnum.NumServers &&
CurrentServer < PrivateNSEnum.NumServers - 1;
CurrentServer++ ) { CurrentServer++ ) {
pFixedInfo->CurrentDnsServer->Next = &AddressAfterFixedInfo[CurrentServer]; pFixedInfo->CurrentDnsServer->Next = &AddressAfterFixedInfo[CurrentServer];
pFixedInfo->CurrentDnsServer = &AddressAfterFixedInfo[CurrentServer]; pFixedInfo->CurrentDnsServer = &AddressAfterFixedInfo[CurrentServer];
pFixedInfo->CurrentDnsServer->Next = 0; pFixedInfo->CurrentDnsServer->Next = 0;
} }
/* For now, set the first server as the current server */
pFixedInfo->CurrentDnsServer = &pFixedInfo->DnsServerList; /* For now, set the first server as the current server, if there are any */
if( PrivateNSEnum.NumServers ) {
pFixedInfo->CurrentDnsServer = &pFixedInfo->DnsServerList;
}
free(PrivateNSEnum.AddrString); free(PrivateNSEnum.AddrString);
} }
else else
{ {
WSH_DbgPrint( MIN_TRACE,
("Open Tcpip parameters key: error %08x\n", errCode ));
result = ERROR_NO_DATA; // No adapter information exists for the local computer result = ERROR_NO_DATA; // No adapter information exists for the local computer
} }
@ -587,7 +599,11 @@ GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen)
} }
else else
{ {
WSH_DbgPrint(MIN_TRACE,
("iphlpapi: Ignoring lack of netbios data for now.\n"));
#if 0
result = ERROR_NO_DATA; // No adapter information exists for the local computer result = ERROR_NO_DATA; // No adapter information exists for the local computer
#endif
} }
return result; return result;