diff --git a/bin/tests/optional/adb_test.c b/bin/tests/optional/adb_test.c index efec3706d1..97bf3cfaf9 100644 --- a/bin/tests/optional/adb_test.c +++ b/bin/tests/optional/adb_test.c @@ -258,7 +258,8 @@ lookup(const char *target) { options |= DNS_ADBFIND_GLUEOK; result = dns_adb_createfind(adb, t2, lookup_callback, client, &client->name, dns_rootname, 0, options, - now, NULL, view->dstport, &client->find); + now, NULL, view->dstport, 0, NULL, + &client->find); if (result != ISC_R_SUCCESS) printf("DNS_ADB_CREATEFIND -> %s\n", dns_result_totext(result)); dns_adb_dumpfind(client->find, stderr); diff --git a/bin/tests/optional/byname_test.c b/bin/tests/optional/byname_test.c index 0990967043..fb4b2b8413 100644 --- a/bin/tests/optional/byname_test.c +++ b/bin/tests/optional/byname_test.c @@ -120,7 +120,7 @@ do_find(isc_boolean_t want_event) { dns_fixedname_name(&fixed), dns_rootname, 0, options, 0, dns_fixedname_name(&target), 0, - &find); + 0, NULL, &find); if (result == ISC_R_SUCCESS) { if (!ISC_LIST_EMPTY(find->list)) { /* diff --git a/lib/dns/adb.c b/lib/dns/adb.c index 68cffe96e5..c052fa11ba 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -2937,20 +2937,8 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, void *arg, const dns_name_t *name, const dns_name_t *qname, dns_rdatatype_t qtype, unsigned int options, isc_stdtime_t now, dns_name_t *target, - in_port_t port, dns_adbfind_t **findp) -{ - return (dns_adb_createfind2(adb, task, action, arg, name, - qname, qtype, options, now, - target, port, 0, NULL, findp)); -} - -isc_result_t -dns_adb_createfind2(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, - void *arg, const dns_name_t *name, const dns_name_t *qname, - dns_rdatatype_t qtype, unsigned int options, - isc_stdtime_t now, dns_name_t *target, - in_port_t port, unsigned int depth, isc_counter_t *qc, - dns_adbfind_t **findp) + in_port_t port, unsigned int depth, isc_counter_t *qc, + dns_adbfind_t **findp) { dns_adbfind_t *find; dns_adbname_t *adbname; @@ -4481,12 +4469,7 @@ dns_adb_getudpsize(dns_adb_t *adb, dns_adbaddrinfo_t *addr) { } unsigned int -dns_adb_probesize(dns_adb_t *adb, dns_adbaddrinfo_t *addr) { - return dns_adb_probesize2(adb, addr, 0); -} - -unsigned int -dns_adb_probesize2(dns_adb_t *adb, dns_adbaddrinfo_t *addr, int lookups) { +dns_adb_probesize(dns_adb_t *adb, dns_adbaddrinfo_t *addr, int lookups) { int bucket; unsigned int size; diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h index e04605415c..7331d1c54e 100644 --- a/lib/dns/include/dns/adb.h +++ b/lib/dns/include/dns/adb.h @@ -333,15 +333,9 @@ isc_result_t dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, void *arg, const dns_name_t *name, const dns_name_t *qname, dns_rdatatype_t qtype, unsigned int options, - isc_stdtime_t now, dns_name_t *target, - in_port_t port, dns_adbfind_t **find); -isc_result_t -dns_adb_createfind2(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, - void *arg, const dns_name_t *name, const dns_name_t *qname, - dns_rdatatype_t qtype, unsigned int options, - isc_stdtime_t now, dns_name_t *target, in_port_t port, - unsigned int depth, isc_counter_t *qc, - dns_adbfind_t **find); + isc_stdtime_t now, dns_name_t *target, in_port_t port, + unsigned int depth, isc_counter_t *qc, + dns_adbfind_t **find); /*%< * Main interface for clients. The adb will look up the name given in * "name" and will build up a list of found addresses, and perhaps start @@ -611,9 +605,7 @@ dns_adb_getudpsize(dns_adb_t *adb, dns_adbaddrinfo_t *addr); */ unsigned int -dns_adb_probesize(dns_adb_t *adb, dns_adbaddrinfo_t *addr); -unsigned int -dns_adb_probesize2(dns_adb_t *adb, dns_adbaddrinfo_t *addr, int lookups); +dns_adb_probesize (dns_adb_t *adb, dns_adbaddrinfo_t *addr, int lookups); /*% * Return suggested EDNS UDP size based on observed responses / failures. * 'lookups' is the number of times the current lookup has been attempted. diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 86a45a6849..b7b46db2e0 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -2538,9 +2538,9 @@ resquery_send(resquery_t *query) { if ((flags & FCTX_ADDRINFO_EDNSOK) != 0 && (query->options & DNS_FETCHOPT_EDNS512) == 0) { - udpsize = dns_adb_probesize2(fctx->adb, - query->addrinfo, - fctx->timeouts); + udpsize = dns_adb_probesize(fctx->adb, + query->addrinfo, + fctx->timeouts); if (udpsize > res->udpsize) udpsize = res->udpsize; } @@ -3346,13 +3346,13 @@ findname(fetchctx_t *fctx, const dns_name_t *name, in_port_t port, * See what we know about this address. */ find = NULL; - result = dns_adb_createfind2(fctx->adb, - res->buckets[fctx->bucketnum].task, - fctx_finddone, fctx, name, - &fctx->name, fctx->type, - options, now, NULL, - res->view->dstport, - fctx->depth + 1, fctx->qc, &find); + result = dns_adb_createfind(fctx->adb, + res->buckets[fctx->bucketnum].task, + fctx_finddone, fctx, name, + &fctx->name, fctx->type, + options, now, NULL, + res->view->dstport, + fctx->depth + 1, fctx->qc, &find); if (result != ISC_R_SUCCESS) { if (result == DNS_R_ALIAS) { char namebuf[DNS_NAME_FORMATSIZE]; diff --git a/lib/dns/win32/libdns.def.in b/lib/dns/win32/libdns.def.in index 0a00eb6aa9..7b8e883192 100644 --- a/lib/dns/win32/libdns.def.in +++ b/lib/dns/win32/libdns.def.in @@ -32,7 +32,6 @@ dns_adb_cancelfind dns_adb_changeflags dns_adb_create dns_adb_createfind -dns_adb_createfind2 dns_adb_destroyfind dns_adb_detach dns_adb_dump @@ -50,7 +49,6 @@ dns_adb_marklame dns_adb_noedns dns_adb_plainresponse dns_adb_probesize -dns_adb_probesize2 dns_adb_setadbsize dns_adb_setcookie dns_adb_setquota diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 5e402f95ad..707d5c9fc7 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -10858,7 +10858,7 @@ notify_find_address(dns_notify_t *notify) { ¬ify->ns, dns_rootname, 0, options, 0, NULL, notify->zone->view->dstport, - ¬ify->find); + 0, NULL, ¬ify->find); /* Something failed? */ if (result != ISC_R_SUCCESS)