From: Sage Weil <sage@redhat.com>
Date: Tue, 3 Jul 2018 23:07:46 +0000 (-0500)
Subject: common/ipaddr: expose netmask_ipv[46]
X-Git-Tag: v14.0.1~601^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52bed1e72bcfad889293f64c6db848560e72c4c2;p=ceph.git

common/ipaddr: expose netmask_ipv[46]

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/ipaddr.cc b/src/common/ipaddr.cc
index c880bfd402e82..0ee96eb9dcc1a 100644
--- a/src/common/ipaddr.cc
+++ b/src/common/ipaddr.cc
@@ -11,7 +11,7 @@
 
 #include "include/ipaddr.h"
 
-static void netmask_ipv4(const struct in_addr *addr,
+void netmask_ipv4(const struct in_addr *addr,
 			 unsigned int prefix_len,
 			 struct in_addr *out) {
   uint32_t mask;
@@ -57,9 +57,9 @@ const struct ifaddrs *find_ipv4_in_subnet(const struct ifaddrs *addrs,
 }
 
 
-static void netmask_ipv6(const struct in6_addr *addr,
-			 unsigned int prefix_len,
-			 struct in6_addr *out) {
+void netmask_ipv6(const struct in6_addr *addr,
+		  unsigned int prefix_len,
+		  struct in6_addr *out) {
   if (prefix_len > 128)
     prefix_len = 128;
 
diff --git a/src/include/ipaddr.h b/src/include/ipaddr.h
index e4c9d4cf0c515..5ded4200a93c9 100644
--- a/src/include/ipaddr.h
+++ b/src/include/ipaddr.h
@@ -24,4 +24,11 @@ const struct ifaddrs *find_ip_in_subnet(const struct ifaddrs *addrs,
  */
 bool parse_network(const char *s, struct sockaddr_storage *network, unsigned int *prefix_len);
 
+void netmask_ipv6(const struct in6_addr *addr,
+		  unsigned int prefix_len,
+		  struct in6_addr *out);
+
+void netmask_ipv4(const struct in_addr *addr,
+		  unsigned int prefix_len,
+		  struct in_addr *out);
 #endif