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

Commit 169026a6 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: Clean up RPCBIND_MAXUADDRLEN definitions 



Clean up: Replace the single-integer definition of RPCBIND_MAXUADDRLEN
with a definition that is based on previously defined address string
sizes, and document the way this maximum is calculated.  Also provide
a separate macro for the size of the port number extension.

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

include/linux/sunrpc/msg_prot.h

+16 −1
Original line number Diff line number Diff line
@@ -189,7 +189,22 @@ typedef __be32 rpc_fraghdr; 
 * Additionally, the two alternative forms specified in Section 2.2 of

 * [RFC2373] are also acceptable.

 */

#define RPCBIND_MAXUADDRLEN	(56u)



#include <linux/inet.h>



/* Maximum size of the port number part of a universal address */

#define RPCBIND_MAXUADDRPLEN	sizeof(".255.255")



/* Maximum size of an IPv4 universal address */

#define RPCBIND_MAXUADDR4LEN	\

		(INET_ADDRSTRLEN + RPCBIND_MAXUADDRPLEN)



/* Maximum size of an IPv6 universal address */

#define RPCBIND_MAXUADDR6LEN	\

		(INET6_ADDRSTRLEN + RPCBIND_MAXUADDRPLEN)



/* Assume INET6_ADDRSTRLEN will always be larger than INET_ADDRSTRLEN... */

#define RPCBIND_MAXUADDRLEN	RPCBIND_MAXUADDR6LEN



#endif /* __KERNEL__ */

#endif /* _LINUX_SUNRPC_MSGPROT_H_ */