2009-07-15 21:36:57

by Chuck Lever III

Subject: [PATCH 01/10] 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: Chuck Lever <[email protected]>
---

include/linux/sunrpc/msg_prot.h | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/include/linux/sunrpc/msg_prot.h b/include/linux/sunrpc/msg_prot.h
index 70df4f1..063e806 100644
--- a/include/linux/sunrpc/msg_prot.h
+++ b/include/linux/sunrpc/msg_prot.h
@@ -189,7 +189,23 @@ 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)
+
+#define __RPCB_MAXLEN(x, y) (x > y ? x : y)
+#define RPCBIND_MAXUADDRLEN \
+ __RPCB_MAXLEN(RPCBIND_MAXUADDR4LEN, RPCBIND_MAXUADDR6LEN)

#endif /* __KERNEL__ */
#endif /* _LINUX_SUNRPC_MSGPROT_H_ */

2009-07-16 18:56:33

by Trond Myklebust

Subject: Re: [PATCH 01/10] SUNRPC: Clean up RPCBIND_MAXUADDRLEN definitions

On Wed, 2009-07-15 at 17:36 -0400, Chuck Lever wrote:
> 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: Chuck Lever <[email protected]>
> ---
>
> include/linux/sunrpc/msg_prot.h | 18 +++++++++++++++++-
> 1 files changed, 17 insertions(+), 1 deletions(-)
>
> diff --git a/include/linux/sunrpc/msg_prot.h b/include/linux/sunrpc/msg_prot.h
> index 70df4f1..063e806 100644
> --- a/include/linux/sunrpc/msg_prot.h
> +++ b/include/linux/sunrpc/msg_prot.h
> @@ -189,7 +189,23 @@ 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)
> +
> +#define __RPCB_MAXLEN(x, y) (x > y ? x : y)
> +#define RPCBIND_MAXUADDRLEN \
> + __RPCB_MAXLEN(RPCBIND_MAXUADDR4LEN, RPCBIND_MAXUADDR6LEN)

Ewww... We _know_ that this will always evaluate to
RPCBIND_MAXUADDR6LEN, so why pretend that we need the above
"calculation"?

> #endif /* __KERNEL__ */
> #endif /* _LINUX_SUNRPC_MSGPROT_H_ */
>