knfsd: SUNRPC: Support IPv6 addresses in svc_tcp_accept
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): 20070202154949.24444.patches@notabene
PATCH RESEND 1/1 knfsd: SUNRPC: Support IPv6 addresses in svc_tcp_accept
Sorry, missed a cast in a dprintk that I could remove (and a '&' that had to go too).
NeilBrown
### Comments for Changeset
From: Chuck Lever <[email protected]>
Modify svc_tcp_accept to support connecting on IPv6 sockets.
### Diffstat output
./net/sunrpc/svcsock.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
net/sunrpc/svcsock.c +7 -9
@@ -949,7 +949,8 @@ static inline int svc_port_is_privilegedstatic void svc_tcp_accept (struct svc_sock *svsk) { -struct sockaddr_in sin; +struct sockaddr_storage addr; +struct sockaddr *sin = (struct sockaddr *) &addr;struct svc_serv *serv = svsk->sk_server;struct socket *sock = svsk->sk_sock;struct socket *newsock;
@@ -976,8 +977,7 @@ svc_tcp_accept(struct svc_sock *svsk)set_bit (SK_CONN , &svsk->sk_flags);svc_sock_enqueue (svsk); - slen =sizeof (sin); - err =kernel_getpeername (newsock, (struct sockaddr *) &sin, &slen); + err =kernel_getpeername (newsock, sin, &slen);if (err <0 ) {if (net_ratelimit ()) printk(KERN_WARNING "%s: peername failed (err %d)!\n",
@@ -989,16 +989,14 @@ svc_tcp_accept(struct svc_sock *svsk)* hosts here, but when we get encryption, the IP of the host won't * tell us anything. For now just warn about unpriv connections. */ -if (!svc_port_is_privileged ((struct sockaddr *) &sin)) { +if (!svc_port_is_privileged (sin)) {dprintk (KERN_WARNING "%s: connect from unprivileged port: %s\n" , serv->sv_name, -__svc_print_addr ((struct sockaddr *) &sin, buf, -sizeof (buf))); +__svc_print_addr (sin, buf,sizeof (buf))); }dprintk ("%s: connect from %s\n" , serv->sv_name, -__svc_print_addr ((struct sockaddr *) &sin, buf, -sizeof (buf))); +__svc_print_addr (sin, buf,sizeof (buf)));/* make sure that a write doesn't block forever when * low on memory
@@ -1008,7 +1006,7 @@ svc_tcp_accept(struct svc_sock *svsk)if (!(newsvsk =svc_setup_socket (serv, newsock, &err, (SVC_SOCK_ANONYMOUS |SVC_SOCK_TEMPORARY )))) goto failed; -memcpy (&newsvsk->sk_remote, &sin, slen); +memcpy (&newsvsk->sk_remote, sin, slen); newsvsk->sk_remotelen = slen;svc_sock_received (newsvsk);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs