2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00

eliminate port-wiring hack

This commit is contained in:
Bob Halley
2000-01-26 19:23:53 +00:00
parent 043c6c62e6
commit 5b5ab09b34

View File

@@ -3392,7 +3392,6 @@ dns_resolver_create(dns_view_t *view,
dns_resolver_t *res; dns_resolver_t *res;
isc_result_t result = ISC_R_SUCCESS; isc_result_t result = ISC_R_SUCCESS;
unsigned int i, buckets_created = 0; unsigned int i, buckets_created = 0;
in_port_t port = 5353;
char name[16]; char name[16];
/* /*
@@ -3448,9 +3447,6 @@ dns_resolver_create(dns_view_t *view,
if (dispatchv4 != NULL) { if (dispatchv4 != NULL) {
dns_dispatch_attach(dispatchv4, &res->dispatchv4); dns_dispatch_attach(dispatchv4, &res->dispatchv4);
} else if (isc_net_probeipv4() == ISC_R_SUCCESS) { } else if (isc_net_probeipv4() == ISC_R_SUCCESS) {
struct in_addr ina;
isc_sockaddr_t sa;
/* /*
* Create an IPv4 UDP socket and a dispatcher for it. * Create an IPv4 UDP socket and a dispatcher for it.
*/ */
@@ -3459,18 +3455,6 @@ dns_resolver_create(dns_view_t *view,
&res->udpsocketv4); &res->udpsocketv4);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup_buckets; goto cleanup_buckets;
result = ISC_R_UNEXPECTED;
while (result != ISC_R_SUCCESS && port < 5400) {
ina.s_addr = htonl(INADDR_ANY);
isc_sockaddr_fromin(&sa, &ina, port);
result = isc_socket_bind(res->udpsocketv4, &sa);
if (result != ISC_R_SUCCESS)
port++;
}
if (result != ISC_R_SUCCESS) {
RTRACE("Could not open UDP port");
goto cleanup_buckets;
}
result = dns_dispatch_create(res->mctx, res->udpsocketv4, result = dns_dispatch_create(res->mctx, res->udpsocketv4,
res->buckets[0].task, 4096, res->buckets[0].task, 4096,
1000, 32768, 16411, 16433, NULL, 1000, 32768, 16411, 16433, NULL,