Add helper function isc_sockaddr_disabled

(cherry picked from commit 9be1873ef37a4f20e01dc2ad1e64112b7104d942)

diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index 9f3986b01ff62f6aa24f079a46f70f4990ac2b9b..97349a334324ba54335243e3522d2b961ebc5358 100644 (file)
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -245,4 +245,11 @@ isc_sockaddr_fromsockaddr(isc_sockaddr_t *isa, const struct sockaddr *sa);
  * Minimum size of array to pass to isc_sockaddr_format().
  */
 
+bool
+isc_sockaddr_disabled(const isc_sockaddr_t *sockaddr);
+/*%<
+ * Report whether or not the address family of 'sockaddr'
+ * has been disabled.
+ */
+
 ISC_LANG_ENDDECLS

diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index 038e3ec7c42273e8a5f4148017d698ce5903b6a5..cf3e7612a9c4c404b4cbe544a98bcee7da308e89 100644 (file)
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -497,3 +497,15 @@ isc_sockaddr_fromsockaddr(isc_sockaddr_t *isa, const struct sockaddr *sa) {
 
        return (ISC_R_SUCCESS);
 }
+
+bool
+isc_sockaddr_disabled(const isc_sockaddr_t *sockaddr) {
+       if ((sockaddr->type.sa.sa_family == AF_INET &&
+            isc_net_probeipv4() == ISC_R_DISABLED) ||
+           (sockaddr->type.sa.sa_family == AF_INET6 &&
+            isc_net_probeipv6() == ISC_R_DISABLED))
+       {
+               return (true);
+       }
+       return (false);
+}