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

Commit 3aba4553 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: Clean up address type casts in rpcb_v4_register() 



Clean up: Simplify rpcb_v4_register() and its helpers by moving the
details of sockaddr type casting to rpcb_v4_register()'s helper
functions.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent ba5c35e0

net/sunrpc/rpcb_clnt.c

+12 −14
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static struct rpc_clnt *rpcb_create(char *hostname, struct sockaddr *srvaddr, 
	return rpc_create(&args);

}



static int rpcb_register_call(u32 version, struct rpc_message *msg)

static int rpcb_register_call(const u32 version, struct rpc_message *msg)

{

	struct sockaddr *addr = (struct sockaddr *)&rpcb_inaddr_loopback;

	size_t addrlen = sizeof(rpcb_inaddr_loopback);
@@ -255,17 +255,17 @@ int rpcb_register(u32 prog, u32 vers, int prot, unsigned short port) 
/*

 * Fill in AF_INET family-specific arguments to register

 */

static int rpcb_register_netid4(struct sockaddr_in *address_to_register,

static int rpcb_register_netid4(const struct sockaddr *sap,

				struct rpc_message *msg)

{

	const struct sockaddr_in *sin = (const struct sockaddr_in *)sap;

	struct rpcbind_args *map = msg->rpc_argp;

	unsigned short port = ntohs(address_to_register->sin_port);

	unsigned short port = ntohs(sin->sin_port);

	char buf[32];



	/* Construct AF_INET universal address */

	snprintf(buf, sizeof(buf), "%pI4.%u.%u",

		 &address_to_register->sin_addr.s_addr,

		 port >> 8, port & 0xff);

		 &sin->sin_addr.s_addr, port >> 8, port & 0xff);

	map->r_addr = buf;



	dprintk("RPC:       %sregistering [%u, %u, %s, '%s'] with "
@@ -283,21 +283,21 @@ static int rpcb_register_netid4(struct sockaddr_in *address_to_register, 
/*

 * Fill in AF_INET6 family-specific arguments to register

 */

static int rpcb_register_netid6(struct sockaddr_in6 *address_to_register,

static int rpcb_register_netid6(const struct sockaddr *sap,

				struct rpc_message *msg)

{

	const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)sap;

	struct rpcbind_args *map = msg->rpc_argp;

	unsigned short port = ntohs(address_to_register->sin6_port);

	unsigned short port = ntohs(sin6->sin6_port);

	char buf[64];



	/* Construct AF_INET6 universal address */

	if (ipv6_addr_any(&address_to_register->sin6_addr))

	if (ipv6_addr_any(&sin6->sin6_addr))

		snprintf(buf, sizeof(buf), "::.%u.%u",

				port >> 8, port & 0xff);

	else

		snprintf(buf, sizeof(buf), "%pI6.%u.%u",

			 &address_to_register->sin6_addr,

			 port >> 8, port & 0xff);

			 &sin6->sin6_addr, port >> 8, port & 0xff);

	map->r_addr = buf;



	dprintk("RPC:       %sregistering [%u, %u, %s, '%s'] with "
@@ -369,11 +369,9 @@ int rpcb_v4_register(const u32 program, const u32 version, 


	switch (address->sa_family) {

	case AF_INET:

		return rpcb_register_netid4((struct sockaddr_in *)address,

					    &msg);

		return rpcb_register_netid4(address, &msg);

	case AF_INET6:

		return rpcb_register_netid6((struct sockaddr_in6 *)address,

					    &msg);

		return rpcb_register_netid6(address, &msg);

	}



	return -EAFNOSUPPORT;