mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

817. [func] Adjust timeouts for dialup zone queries.

Browse Source
This commit is contained in:
Mark Andrews
2001-04-27 02:34:18 +00:00
parent de8717a721
commit ecaedd50f4
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -1,3 +1,4 @@
817. [func] Adjust timeouts for dialup zone queries.
816. [func] Report potential problems with log file accessibility 816. [func] Report potential problems with log file accessibility
at configuration time, since such problems can't at configuration time, since such problems can't

20
lib/dns/zone.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: zone.c,v 1.319 2001/04/24 23:03:04 gson Exp $ */ /* $Id: zone.c,v 1.320 2001/04/27 02:34:18 marka Exp $ */
#include <config.h> #include <config.h>
@@ -2388,6 +2388,7 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) {
dns_tsigkey_t *key = NULL; dns_tsigkey_t *key = NULL;
char addrbuf[ISC_SOCKADDR_FORMATSIZE]; char addrbuf[ISC_SOCKADDR_FORMATSIZE];
isc_sockaddr_t src; isc_sockaddr_t src;
int timeout;
notify = event->ev_arg; notify = event->ev_arg;
REQUIRE(DNS_NOTIFY_VALID(notify)); REQUIRE(DNS_NOTIFY_VALID(notify));
@@ -2430,8 +2431,11 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) {
result = ISC_R_NOTIMPLEMENTED; result = ISC_R_NOTIMPLEMENTED;
goto cleanup_key; goto cleanup_key;
} }
timeout = 15;
if (DNS_ZONE_FLAG(notify->zone, DNS_ZONEFLG_DIALNOTIFY))
timeout = 30;
result = dns_request_createvia(notify->zone->view->requestmgr, message, result = dns_request_createvia(notify->zone->view->requestmgr, message,
&src, &notify->dst, 0, key, 15, &src, &notify->dst, 0, key, timeout,
notify->zone->task, notify->zone->task,
notify_done, notify, notify_done, notify,
&notify->request); &notify->request);
@@ -3347,6 +3351,7 @@ soa_query(isc_task_t *task, isc_event_t *event) {
isc_uint32_t options; isc_uint32_t options;
isc_sockaddr_t src; isc_sockaddr_t src;
isc_boolean_t cancel = ISC_TRUE; isc_boolean_t cancel = ISC_TRUE;
int timeout;
REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(DNS_ZONE_VALID(zone));
@@ -3391,9 +3396,12 @@ soa_query(isc_task_t *task, isc_event_t *event) {
goto cleanup; goto cleanup;
} }
zone_iattach(zone, &dummy); zone_iattach(zone, &dummy);
timeout = 15;
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALREFRESH))
timeout = 30;
result = dns_request_createvia(zone->view->requestmgr, message, result = dns_request_createvia(zone->view->requestmgr, message,
&src, &zone->masteraddr, options, key, &src, &zone->masteraddr, options, key,
15 /* XXX */, zone->task, timeout, zone->task,
refresh_callback, zone, &zone->request); refresh_callback, zone, &zone->request);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
zone_idetach(&dummy); zone_idetach(&dummy);
@@ -3426,6 +3434,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
dns_tsigkey_t *key = NULL; dns_tsigkey_t *key = NULL;
dns_dbnode_t *node = NULL; dns_dbnode_t *node = NULL;
isc_sockaddr_t src; isc_sockaddr_t src;
int timeout;
REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(DNS_ZONE_VALID(zone));
REQUIRE((soardataset != NULL && stub == NULL) || REQUIRE((soardataset != NULL && stub == NULL) ||
@@ -3528,9 +3537,12 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
result = ISC_R_NOTIMPLEMENTED; result = ISC_R_NOTIMPLEMENTED;
goto cleanup; goto cleanup;
} }
timeout = 15;
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALREFRESH))
timeout = 30;
result = dns_request_createvia(zone->view->requestmgr, message, result = dns_request_createvia(zone->view->requestmgr, message,
&src, &zone->masteraddr, &src, &zone->masteraddr,
DNS_REQUESTOPT_TCP, key, 15 /* XXX */, DNS_REQUESTOPT_TCP, key, timeout,
zone->task, stub_callback, stub, zone->task, stub_callback, stub,
&zone->request); &zone->request);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {