From: Andreas Gustafsson <source@isc.org>
Date: Thu, 21 Sep 2000 22:15:00 +0000 (+0000)
Subject: pullup:
X-Git-Tag: v9.0.0^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ea1b4334ad500254e8bc3a36550f7c492e907db;p=thirdparty%2Fbind9.git

pullup:
 379.   [func]          New library function isc_sockaddr_anyofpf().
---

diff --git a/CHANGES b/CHANGES
index aaed9b5cd19..5efed8a2ad5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,6 +26,8 @@
  387.	[func]		Add dns_byaddr_createptrname(), which converts
 			an address into the name used by a PTR query.
 
+ 379.	[func]		New library function isc_sockaddr_anyofpf().
+
 	--- 9.0.0 released ---
 
  463.	[bug]		nsupdate sent malformed SOA queries to the second
diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index 3e09f230df7..67b038ab2a9 100644
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: sockaddr.h,v 1.30 2000/06/22 21:58:02 tale Exp $ */
+/* $Id: sockaddr.h,v 1.30.2.1 2000/09/21 22:15:00 gson Exp $ */
 
 #ifndef ISC_SOCKADDR_H
 #define ISC_SOCKADDR_H 1
@@ -57,6 +57,9 @@ isc_sockaddr_any(isc_sockaddr_t *sockaddr);
 void
 isc_sockaddr_any6(isc_sockaddr_t *sockaddr);
 
+void
+isc_sockaddr_anyofpf(isc_sockaddr_t *sockaddr, int family);
+
 void
 isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
 		    in_port_t port);
diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index 107731257b9..06233757af4 100644
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: sockaddr.c,v 1.42 2000/06/22 21:57:12 tale Exp $ */
+/* $Id: sockaddr.c,v 1.42.2.1 2000/09/21 22:14:59 gson Exp $ */
 
 #include <config.h>
 
@@ -264,6 +264,20 @@ isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
 	ISC_LINK_INIT(sockaddr, link);
 }
 
+void
+isc_sockaddr_anyofpf(isc_sockaddr_t *sockaddr, int pf) {
+     switch (pf) {
+     case AF_INET:
+	     isc_sockaddr_any(sockaddr);
+	     break;
+     case AF_INET6:
+	     isc_sockaddr_any6(sockaddr);
+	     break;
+     default:
+	     INSIST(0);
+     }
+}
+
 void
 isc_sockaddr_fromin6(isc_sockaddr_t *sockaddr, const struct in6_addr *ina6,
 		     in_port_t port)