diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index cfe6cdef7b..2c7add379a 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dispatch.c,v 1.153 2008/08/26 02:04:20 jinmei Exp $ */ +/* $Id: dispatch.c,v 1.154 2008/09/04 00:23:14 jinmei Exp $ */ /*! \file */ @@ -290,8 +290,7 @@ static isc_result_t get_udpsocket(dns_dispatchmgr_t *mgr, dns_dispatch_t *disp, isc_socketmgr_t *sockmgr, isc_sockaddr_t *localaddr, - isc_socket_t **sockp, - unsigned int maxtry); + isc_socket_t **sockp); static isc_result_t dispatch_createudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, isc_taskmgr_t *taskmgr, @@ -2536,7 +2535,7 @@ dns_dispatch_getudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, static isc_result_t get_udpsocket(dns_dispatchmgr_t *mgr, dns_dispatch_t *disp, isc_socketmgr_t *sockmgr, isc_sockaddr_t *localaddr, - isc_socket_t **sockp, unsigned int maxtry) + isc_socket_t **sockp) { unsigned int i, j; isc_socket_t *held[DNS_DISPATCH_HELD]; @@ -2594,7 +2593,7 @@ get_udpsocket(dns_dispatchmgr_t *mgr, dns_dispatch_t *disp, memset(held, 0, sizeof(held)); i = 0; - for (j = 0; j < maxtry; j++) { + for (j = 0; j < 0xffffU; j++) { result = open_socket(sockmgr, localaddr, 0, &sock); if (result != ISC_R_SUCCESS) goto end; @@ -2609,7 +2608,7 @@ get_udpsocket(dns_dispatchmgr_t *mgr, dns_dispatch_t *disp, if (i == DNS_DISPATCH_HELD) i = 0; } - if (j == maxtry) { + if (j == 0xffffU) { mgr_log(mgr, ISC_LOG_ERROR, "avoid-v%s-udp-ports: unable to allocate " "an available port", @@ -2650,8 +2649,7 @@ dispatch_createudp(dns_dispatchmgr_t *mgr, isc_socketmgr_t *sockmgr, return (result); if ((attributes & DNS_DISPATCHATTR_EXCLUSIVE) == 0) { - result = get_udpsocket(mgr, disp, sockmgr, localaddr, &sock, - 0xffffU); + result = get_udpsocket(mgr, disp, sockmgr, localaddr, &sock); if (result != ISC_R_SUCCESS) goto deallocate_dispatch; } else {