Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90058d37 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: create an IPv6-savvy mechanism for binding to a reserved port 



Clone xs_bindresvport into two functions, one that can handle IPv4
addresses, and one that can handle IPv6 addresses.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 7dc753f0

net/sunrpc/xprtsock.c

+33 −0
Original line number Diff line number Diff line
@@ -1261,6 +1261,39 @@ static int xs_bind4(struct sock_xprt *transport, struct socket *sock) 
	return err;

}



static int xs_bind6(struct sock_xprt *transport, struct socket *sock)

{

	struct sockaddr_in6 myaddr = {

		.sin6_family = AF_INET6,

	};

	struct sockaddr_in6 *sa;

	int err;

	unsigned short port = transport->port;



	if (!transport->xprt.resvport)

		port = 0;

	sa = (struct sockaddr_in6 *)&transport->addr;

	myaddr.sin6_addr = sa->sin6_addr;

	do {

		myaddr.sin6_port = htons(port);

		err = kernel_bind(sock, (struct sockaddr *) &myaddr,

						sizeof(myaddr));

		if (!transport->xprt.resvport)

			break;

		if (err == 0) {

			transport->port = port;

			break;

		}

		if (port <= xprt_min_resvport)

			port = xprt_max_resvport;

		else

			port--;

	} while (err == -EADDRINUSE && port != transport->port);

	dprintk("RPC:       xs_bind6 "NIP6_FMT":%u: %s (%d)\n",

		NIP6(myaddr.sin6_addr), port, err ? "failed" : "ok", err);

	return err;

}



#ifdef CONFIG_DEBUG_LOCK_ALLOC

static struct lock_class_key xs_key[2];

static struct lock_class_key xs_slock_key[2];