ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

use isc_sockaddr_anyofpf()

Browse Source
This commit is contained in:
Andreas Gustafsson
2000-08-09 19:11:27 +00:00
parent ff92fcaff3
commit 1199d0ee34
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/dig/dighost.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dighost.c,v 1.113 2000/08/03 18:26:22 mws Exp $ */
/* $Id: dighost.c,v 1.114 2000/08/09 19:10:54 gson Exp $ */
/*
* Notice to programmers: Do not use this code as an example of how to
@@ -2309,14 +2309,11 @@ do_lookup_udp(dig_lookup_t *lookup) {
check_result(result, "isc_socket_create");
sockcount++;
debug("sockcount=%d", sockcount);
if (specified_source)
if (specified_source) {
result = isc_socket_bind(query->sock, &bind_address);
else {
/* XXX Add this to lib, send gson mail. */
if (isc_sockaddr_pf(&query->sockaddr) == AF_INET)
isc_sockaddr_any(&bind_any);
else
isc_sockaddr_any6(&bind_any);
} else {
isc_sockaddr_anyofpf(&bind_any,
isc_sockaddr_pf(&query->sockaddr));
result = isc_socket_bind(query->sock, &bind_any);
}
check_result(result, "isc_socket_bind");

13
lib/dns/resolver.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: resolver.c,v 1.162 2000/08/01 01:22:51 tale Exp $ */
/* $Id: resolver.c,v 1.163 2000/08/09 19:11:27 gson Exp $ */
#include <config.h>
@@ -717,16 +717,7 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
if (result != ISC_R_SUCCESS)
goto cleanup_query;
switch (pf) {
case AF_INET:
isc_sockaddr_any(&any);
break;
case AF_INET6:
isc_sockaddr_any6(&any);
break;
default:
INSIST(0);
}
isc_sockaddr_anyofpf(&any, pf);
result = isc_socket_bind(query->tcpsocket, &any);
if (result != ISC_R_SUCCESS)
goto cleanup_socket;