R_ResolverFlushCache(
DNSRSLVR_HANDLE pwszServerName)
{
+ DPRINT("R_ResolverFlushCache()\n");
+
// FIXME Should store (and flush) entries by server handle
DnsIntCacheFlush();
return 0;
DWORD
R_ResolverQuery(
- DNSRSLVR_HANDLE pwszServerName,
- LPCWSTR pwsName,
+ DNSRSLVR_HANDLE pszServerName,
+ LPCWSTR pszName,
WORD wType,
- DWORD Flags,
+ DWORD dwFlags,
DWORD *dwRecords,
DNS_RECORDW **ppResultRecords)
{
-#if 0
- DNS_QUERY_REQUEST QueryRequest = { 0 };
- DNS_QUERY_RESULT QueryResults = { 0 };
-#endif
- DNS_STATUS Status;
- PDNS_RECORDW Record;
+ PDNS_RECORDW Record;
+ DNS_STATUS Status;
+
+ DPRINT("R_ResolverQuery(%S %S %x %lx %p %p)\n",
+ pszServerName, pszName, wType, dwFlags, dwRecords, ppResultRecords);
- DPRINT1("R_ResolverQuery %p %p %x %lx %p %p\n",
- pwszServerName, pwsName, wType, Flags, dwRecords, ppResultRecords);
+ if (pszName == NULL || wType == 0 || ppResultRecords == NULL)
+ return ERROR_INVALID_PARAMETER;
- if (!pwszServerName || !pwsName || !wType || !ppResultRecords)
+ if ((dwFlags & DNS_QUERY_WIRE_ONLY) != 0 && (dwFlags & DNS_QUERY_NO_WIRE_QUERY) != 0)
return ERROR_INVALID_PARAMETER;
- // FIXME Should lookup entries by server handle
- if (DnsIntCacheGetEntryFromName(pwsName, ppResultRecords))
+ if (DnsIntCacheGetEntryFromName(pszName, ppResultRecords))
{
+ DPRINT("DNS cache query successful!\n");
Status = ERROR_SUCCESS;
}
else
{
-#if 0
- QueryRequest.Version = DNS_QUERY_REQUEST_VERSION1;
- QueryRequest.QueryType = wType;
- QueryRequest.QueryName = pwsName;
- QueryRequest.QueryOptions = Flags;
- QueryResults.Version = DNS_QUERY_REQUEST_VERSION1;
-
- Status = DnsQueryEx(&QueryRequest, &QueryResults, NULL);
+ DPRINT("DNS query!\n");
+ Status = Query_Main(pszName,
+ wType,
+ dwFlags,
+ ppResultRecords);
if (Status == ERROR_SUCCESS)
{
- // FIXME Should store (and flush) entries by server handle
- DnsIntCacheAddEntry(QueryResults.pQueryRecords);
- *ppResultRecords = QueryResults.pQueryRecords;
+ DPRINT("DNS query successful!\n");
+ DnsIntCacheAddEntry(*ppResultRecords);
}
-#endif
}
if (dwRecords)
+ {
*dwRecords = 0;
- if (Status == ERROR_SUCCESS)
- {
- Record = *ppResultRecords;
- while (Record)
+ if (Status == ERROR_SUCCESS)
{
- if (dwRecords)
+ Record = *ppResultRecords;
+ while (Record)
+ {
+ DPRINT("Record: %S\n", Record->pName);
(*dwRecords)++;
- Record = Record->pNext;
+ Record = Record->pNext;
+ }
}
}
- DPRINT1("R_ResolverQuery result %ld %ld\n", Status, *dwRecords);
+ DPRINT("R_ResolverQuery result %ld %ld\n", Status, *dwRecords);
return Status;
}
PWCHAR Buffer;
DNS_STATUS Status;
PDNS_RECORD QueryResultWide;
- PDNS_RECORD ConvertedRecord = NULL, LastRecord = NULL;
+ PDNS_RECORD ConvertedRecord = 0, LastRecord = 0;
if (Name == NULL)
return ERROR_INVALID_PARAMETER;
}
if (LastRecord)
- LastRecord->pNext = NULL;
+ LastRecord->pNext = 0;
/* The name */
RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer);
PVOID Extra,
PDNS_RECORD *QueryResultSet,
PVOID *Reserved)
+{
+ DWORD dwRecords = 0;
+ DNS_STATUS Status = ERROR_SUCCESS;
+
+ DPRINT("DnsQuery_W()\n");
+
+ *QueryResultSet = NULL;
+
+ RpcTryExcept
+ {
+ Status = R_ResolverQuery(NULL,
+ Name,
+ Type,
+ Options,
+ &dwRecords,
+ (DNS_RECORDW **)QueryResultSet);
+ DPRINT("R_ResolverQuery() returned %lu\n", Status);
+ }
+ RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+ {
+ Status = RpcExceptionCode();
+ DPRINT("Exception returned %lu\n", Status);
+ }
+ RpcEndExcept;
+
+ return Status;
+}
+
+
+DNS_STATUS
+WINAPI
+Query_Main(LPCWSTR Name,
+ WORD Type,
+ DWORD Options,
+ PDNS_RECORD *QueryResultSet)
{
adns_state astate;
int quflags = (Options & DNS_QUERY_NO_RECURSION) == 0 ? adns_qf_search : 0;
return ERROR_INVALID_PARAMETER;
if (QueryResultSet == NULL)
return ERROR_INVALID_PARAMETER;
- if ((Options & DNS_QUERY_WIRE_ONLY) != 0 && (Options & DNS_QUERY_NO_WIRE_QUERY) != 0)
- return ERROR_INVALID_PARAMETER;
- *QueryResultSet = 0;
+ *QueryResultSet = NULL;
switch (Type)
{