path: root/fs/lockd
diff options
authorChuck Lever <chuck.lever@oracle.com>2008-12-04 14:20:08 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-01-06 11:53:49 -0500
commitbc995801a09d1fead0bec1356bfd836911c8eed7 (patch)
treeb7a2faad59bfa92db4057c23fcf7d31b70d20611 /fs/lockd
parent6999fb4016b2604c2f8a65586bba4a62a4b24ce7 (diff)
NLM: Support IPv6 scope IDs in nlm_display_address()
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. When nsm_use_hostnames is zero, without scope ID support NSM will fail to handle peers that contact us via a link-local address. Link-local addresses do not work without an interface ID, which is stored in the sockaddr's sin6_scope_id field. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/lockd')
1 files changed, 15 insertions, 6 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index beb5da81016..012e49aaecd 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -105,22 +105,31 @@ static void nlm_clear_port(struct sockaddr *sap)
+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, "%pI4", &sin6->sin6_addr.s6_addr32[3]);
+ else if (sin6->sin6_scope_id != 0)
+ snprintf(buf, len, "%pI6%%%u", &sin6->sin6_addr,
+ sin6->sin6_scope_id);
+ else
+ snprintf(buf, len, "%pI6", &sin6->sin6_addr);
static void nlm_display_address(const struct sockaddr *sap,
char *buf, const size_t len)
const struct sockaddr_in *sin = (struct sockaddr_in *)sap;
- const struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
switch (sap->sa_family) {
case AF_INET:
snprintf(buf, len, "%pI4", &sin->sin_addr.s_addr);
case AF_INET6:
- if (ipv6_addr_v4mapped(&sin6->sin6_addr))
- snprintf(buf, len, "%pI4",
- &sin6->sin6_addr.s6_addr32[3]);
- else
- snprintf(buf, len, "%pI6", &sin6->sin6_addr);
+ nlm_display_ipv6_address(sap, buf, len);
snprintf(buf, len, "unsupported address family");