From 1199d0ee34d3eb13d7fcd92db1db8883dc444fc3 Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Wed, 9 Aug 2000 19:11:27 +0000
Subject: [PATCH] use isc_sockaddr_anyofpf()

---
 bin/dig/dighost.c  | 13 +++++--------
 lib/dns/resolver.c | 13 ++-----------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 02143dbd79..8d5d2d419f 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -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");
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 9892104458..541beef167 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -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;