update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / include / ipaddr.h

diff --git a/ceph/src/include/ipaddr.h b/ceph/src/include/ipaddr.h
index d9e096886545d64f37dfad603231a865c72f4467..e8bed82920af35a7db8dabeac776e38cf7714053 100644 (file)
--- a/ceph/src/include/ipaddr.h
+++ b/ceph/src/include/ipaddr.h
@@ -1,17 +1,48 @@
 #ifndef CEPH_IPADDR_H
 #define CEPH_IPADDR_H
 
-/*
-  Find an IP address that is in the wanted subnet.
+class entity_addr_t;
 
-  If there are multiple matches, the first one is returned; this order
-  is system-dependent and should not be relied on.
+/*
+ * Find an IP address that is in the wanted subnet.
+ *
+ * If there are multiple matches, the first one is returned; this order
+ * is system-dependent and should not be relied on.
  */
 const struct ifaddrs *find_ip_in_subnet(const struct ifaddrs *addrs,
-                                        const struct sockaddr *net,
-                                        unsigned int prefix_len);
+                                       const struct sockaddr *net,
+                                       unsigned int prefix_len,
+                                       int numa_node = -1);
+
+/*
+ * Validate and parse IPv4 or IPv6 network
+ *
+ * Given a network (e.g. "192.168.0.0/24") and pointers to a sockaddr_storage
+ * struct and an unsigned int:
+ *
+ * if the network string is valid, return true and populate sockaddr_storage
+ * and prefix_len;
+ *
+ * if the network string is invalid, return false.
+ */
+bool parse_network(const char *s,
+                  struct sockaddr_storage *network,
+                  unsigned int *prefix_len);
+bool parse_network(const char *s,
+                  entity_addr_t *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);
 
-bool parse_network(const char *s, struct sockaddr_storage *network, unsigned int *prefix_len);
+bool network_contains(
+       const struct entity_addr_t& network,
+       unsigned int prefix_len,
+       const struct entity_addr_t& addr);
 
 #endif