On Mon, Dec 01, 2008 at 01:57:42PM -0500, Chuck Lever wrote:
> Scope ID support is needed since the kernel's NSM implementation is
> about to use these displayed addresses as a mon_name in some cases.
>
> If nsm_use_hostnames is zero, NSM will fail to handle peers that
> contact us via a link-local address without scope ID support. Link-
> local addresses do not work without an interface ID, which is stored
> in the sockaddr's sin6_scope_id field.
As always: what's the latest progress on getting this
ipv6-address-display stuff into the core networking code?
Anyway, looks fine, but looking forward to be able to delete some of
this one day....
Just one more question below:
> Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
> ---
>
> fs/lockd/host.c | 31 +++++++++++++++++++++++--------
> include/linux/lockd/lockd.h | 2 +-
> 2 files changed, 24 insertions(+), 9 deletions(-)
>
> diff --git a/fs/lockd/host.c b/fs/lockd/host.c
> index 68e00c0..cd7edc3 100644
> --- a/fs/lockd/host.c
> +++ b/fs/lockd/host.c
> @@ -105,22 +105,37 @@ static void nlm_clear_port(struct sockaddr *sap)
> }
> }
>
> -static void nlm_display_address(const struct sockaddr *sap,
> - char *buf, const size_t len)
> +static void nlm_display_ipv4_address(const struct sockaddr *sap, char *buf,
> + const size_t len)
> {
> const struct sockaddr_in *sin = (struct sockaddr_in *)sap;
> + snprintf(buf, len, NIPQUAD_FMT, NIPQUAD(sin->sin_addr.s_addr));
> +}
> +
> +static void nlm_display_ipv6_address(const struct sockaddr *sap, char *buf,
> + const size_t len)
> +{
> const struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
>
> + if (ipv6_addr_v4mapped(&sin6->sin6_addr))
> + snprintf(buf, len, NIPQUAD_FMT,
> + NIPQUAD(sin6->sin6_addr.s6_addr32[3]));
> + else if (sin6->sin6_scope_id != 0)
> + snprintf(buf, len, NIP6_FMT "%%%u", NIP6(sin6->sin6_addr),
> + sin6->sin6_scope_id);
> + else
> + snprintf(buf, len, NIP6_FMT, NIP6(sin6->sin6_addr));
> +}
> +
> +static void nlm_display_address(const struct sockaddr *sap,
> + char *buf, const size_t len)
> +{
> switch (sap->sa_family) {
> case AF_INET:
> - snprintf(buf, len, NIPQUAD_FMT, NIPQUAD(sin->sin_addr.s_addr));
> + nlm_display_ipv4_address(sap, buf, len);
> break;
> case AF_INET6:
> - if (ipv6_addr_v4mapped(&sin6->sin6_addr))
> - snprintf(buf, len, NIPQUAD_FMT,
> - NIPQUAD(sin6->sin6_addr.s6_addr32[3]));
> - else
> - snprintf(buf, len, NIP6_FMT, NIP6(sin6->sin6_addr));
> + nlm_display_ipv6_address(sap, buf, len);
> break;
> default:
> snprintf(buf, len, "unsupported address family");
> diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
> index 4467b83..307a8f0 100644
> --- a/include/linux/lockd/lockd.h
> +++ b/include/linux/lockd/lockd.h
> @@ -75,7 +75,7 @@ struct nsm_handle {
> size_t sm_addrlen;
> unsigned int sm_monitored : 1,
> sm_sticky : 1; /* don't unmonitor */
> - char sm_addrbuf[48]; /* address eyecatcher */
> + char sm_addrbuf[63]; /* presentation address */
> };
Could you add a brief (1-line?) comment justifying the choice of 63?
--b.
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
