rds: Extend RDS API for IPv6 support

There are many data structures (RDS socket options) used by RDS apps
which use a 32 bit integer to store IP address. To support IPv6,
struct in6_addr needs to be used. To ensure backward compatibility, a
new data structure is introduced for each of those data structures
which use a 32 bit integer to represent an IP address. And new socket
options are introduced to use those new structures. This means that
existing apps should work without a problem with the new RDS module.
For apps which want to use IPv6, those new data structures and socket
options can be used. IPv4 mapped address is used to represent IPv4
address in the new data structures.

v4: Revert changes to SO_RDS_TRANSPORT

Signed-off-by: Ka-Cheong Poon <ka-cheong.poon@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 25 insertions, 0 deletions

diff --git a/net/rds/recv.c b/net/rds/recv.c
index 1402c21210b1..03cd8df54c26 100644
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -792,3 +792,28 @@ void rds_inc_info_copy(struct rds_incoming *inc,
 
         rds_info_copy(iter, &minfo, sizeof(minfo));
 }
+
+void rds6_inc_info_copy(struct rds_incoming *inc,
+                        struct rds_info_iterator *iter,
+                        struct in6_addr *saddr, struct in6_addr *daddr,
+                        int flip)
+{
+        struct rds6_info_message minfo6;
+
+        minfo6.seq = be64_to_cpu(inc->i_hdr.h_sequence);
+        minfo6.len = be32_to_cpu(inc->i_hdr.h_len);
+
+        if (flip) {
+                minfo6.laddr = *daddr;
+                minfo6.faddr = *saddr;
+                minfo6.lport = inc->i_hdr.h_dport;
+                minfo6.fport = inc->i_hdr.h_sport;
+        } else {
+                minfo6.laddr = *saddr;
+                minfo6.faddr = *daddr;
+                minfo6.lport = inc->i_hdr.h_sport;
+                minfo6.fport = inc->i_hdr.h_dport;
+        }
+
+        rds_info_copy(iter, &minfo6, sizeof(minfo6));
+}