Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
---
include/linux/sunrpc/clnt.h | 1 +
net/sunrpc/addr.c | 51 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index b9171f2..9c0b0a6 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -162,6 +162,7 @@ size_t rpc_uaddr2sockaddr(const char *, const size_t,
struct sockaddr *, const size_t);
bool rpc_cmp_addr(const struct sockaddr *sa1,
const struct sockaddr *sa2);
+bool rpc_copy_addr(struct sockaddr *dst, const struct sockaddr *src);
static inline unsigned short rpc_get_port(const struct sockaddr *sap)
{
diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c
index dbf908e..968a804 100644
--- a/net/sunrpc/addr.c
+++ b/net/sunrpc/addr.c
@@ -372,6 +372,17 @@ static bool __rpc_cmp_addr4(const struct sockaddr *sap1,
return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
}
+static bool __rpc_copy_addr4(struct sockaddr *dst,
+ const struct sockaddr *src)
+{
+ const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
+ struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
+
+ dsin->sin_family = ssin->sin_family;
+ dsin->sin_addr.s_addr = ssin->sin_addr.s_addr;
+ return true;
+}
+
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
static bool __rpc_cmp_addr6(const struct sockaddr *sap1,
const struct sockaddr *sap2)
@@ -380,12 +391,30 @@ static bool __rpc_cmp_addr6(const struct sockaddr *sap1,
const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sap2;
return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr);
}
+
+static bool __rpc_copy_addr6(struct sockaddr *dst,
+ const struct sockaddr *src)
+{
+ const struct sockaddr_in6 *ssin6 = (const struct sockaddr_in6 *) src;
+ struct sockaddr_in6 *dsin6 = (struct sockaddr_in6 *) dst;
+
+ dsin6->sin6_family = ssin6->sin6_family;
+ ipv6_addr_copy(&dsin6->sin6_addr, &ssin6->sin6_addr);
+ return true;
+}
+
#else /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
static bool __rpc_cmp_addr6(const struct sockaddr *sap1,
const struct sockaddr *sap2)
{
return false;
}
+
+static bool __rpc_copy_addr6(struct sockaddr *dst,
+ const struct sockaddr *src)
+{
+ return false;
+}
#endif /* !(CONFIG_IPV6 || CONFIG_IPV6_MODULE) */
/**
@@ -409,3 +438,25 @@ bool rpc_cmp_addr(const struct sockaddr *sap1, const struct sockaddr *sap2)
return false;
}
EXPORT_SYMBOL_GPL(rpc_cmp_addr);
+
+/**
+ * rpc_copy_addr - copy the address portion of one sockaddr to another
+ * @dst: destination sockaddr
+ * @src: source sockaddr
+ *
+ * Just copies the address portion and family. Ignores port, scope, etc.
+ * Caller is responsible for making certain that dst is large enough to hold
+ * the address in src. Returns true if address family is supported. Returns
+ * false otherwise.
+ */
+bool rpc_copy_addr(struct sockaddr *dst, const struct sockaddr *src)
+{
+ switch (src->sa_family) {
+ case AF_INET:
+ return __rpc_copy_addr4(dst, src);
+ case AF_INET6:
+ return __rpc_copy_addr6(dst, src);
+ }
+ return false;
+}
+EXPORT_SYMBOL_GPL(rpc_copy_addr);
--
1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
