lkml.org 
[lkml]   [2006]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patches in this message
/
From
Date
Subject[PATCH 008 of 13] knfsd: SUNRPC: Make rq_daddr field address-version independent

From: Chuck Lever <chuck.lever@oracle.com>

The rq_daddr field must support larger addresses.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: Neil Brown <neilb@suse.de>

### Diffstat output
./include/linux/sunrpc/svc.h | 15 +++++++++++----
./net/sunrpc/svcsock.c | 4 ++--
2 files changed, 13 insertions(+), 6 deletions(-)

diff .prev/include/linux/sunrpc/svc.h ./include/linux/sunrpc/svc.h
--- .prev/include/linux/sunrpc/svc.h 2006-12-08 13:55:35.000000000 +1100
+++ ./include/linux/sunrpc/svc.h 2006-12-08 13:57:52.000000000 +1100
@@ -11,6 +11,7 @@
#define SUNRPC_SVC_H

#include <linux/in.h>
+#include <linux/in6.h>
#include <linux/sunrpc/types.h>
#include <linux/sunrpc/xdr.h>
#include <linux/sunrpc/auth.h>
@@ -188,7 +189,13 @@ static inline void svc_putu32(struct kve
iov->iov_len += sizeof(__be32);
}

-
+union svc_addr_u {
+ struct in_addr addr;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+ struct in6_addr addr6;
+#endif
+};
+
/*
* The context of a single thread, including the request currently being
* processed.
@@ -224,8 +231,8 @@ struct svc_rqst {
unsigned short
rq_secure : 1; /* secure port */

-
- __be32 rq_daddr; /* dest addr of request - reply from here */
+ union svc_addr_u rq_daddr; /* dest addr of request -
+ * reply from here */

void * rq_argp; /* decoded arguments */
void * rq_resp; /* xdr'd results */
@@ -292,7 +299,7 @@ struct svc_deferred_req {
struct sockaddr_storage addr;
int addrlen;
struct svc_sock *svsk; /* where reply must go */
- __be32 daddr; /* where reply must come from */
+ union svc_addr_u daddr; /* where reply must come from */
struct cache_deferred_req handle;
int argslen;
__be32 args[0];
diff .prev/net/sunrpc/svcsock.c ./net/sunrpc/svcsock.c
--- .prev/net/sunrpc/svcsock.c 2006-12-08 13:55:35.000000000 +1100
+++ ./net/sunrpc/svcsock.c 2006-12-08 13:57:20.000000000 +1100
@@ -476,7 +476,7 @@ svc_sendto(struct svc_rqst *rqstp, struc
cmh->cmsg_level = SOL_IP;
cmh->cmsg_type = IP_PKTINFO;
pki->ipi_ifindex = 0;
- pki->ipi_spec_dst.s_addr = rqstp->rq_daddr;
+ pki->ipi_spec_dst.s_addr = rqstp->rq_daddr.addr.s_addr;

if (sock_sendmsg(sock, &msg, 0) < 0)
goto out;
@@ -747,7 +747,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
sin->sin_family = AF_INET;
sin->sin_port = skb->h.uh->source;
sin->sin_addr.s_addr = skb->nh.iph->saddr;
- rqstp->rq_daddr = skb->nh.iph->daddr;
+ rqstp->rq_daddr.addr.s_addr = skb->nh.iph->daddr;

if (skb_is_nonlinear(skb)) {
/* we have to copy */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2006-12-08 13:07    [W:0.079 / U:1.348 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site