diff options
| author | David Teigland <teigland@redhat.com> | 2008-08-28 11:36:19 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2008-09-02 14:32:08 -0500 |
| commit | 44be6fdf1056b685eb79e53e42bd2d321b085cfc (patch) | |
| tree | 3af8658e3400b5090b78f730591da8e347cde327 /fs/dlm | |
| parent | c1dcf65ffc5796bf4ff75c13f448e63b3a416fd6 (diff) | |
| download | linux-3.10-44be6fdf1056b685eb79e53e42bd2d321b085cfc.tar.gz linux-3.10-44be6fdf1056b685eb79e53e42bd2d321b085cfc.tar.bz2 linux-3.10-44be6fdf1056b685eb79e53e42bd2d321b085cfc.zip | |
dlm: fix address compare
Compare only the addr and port fields of sockaddr structures.
Fixes a problem with ipv6 where sin6_scope_id does not match.
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm')
| -rw-r--r-- | fs/dlm/config.c | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/fs/dlm/config.c b/fs/dlm/config.c index 89d2fb7b991..1359be3b0bb 100644 --- a/fs/dlm/config.c +++ b/fs/dlm/config.c @@ -14,6 +14,9 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/configfs.h> +#include <linux/in.h> +#include <linux/in6.h> +#include <net/ipv6.h> #include <net/sock.h> #include "config.h" @@ -776,6 +779,33 @@ static void put_space(struct dlm_space *sp) config_item_put(&sp->group.cg_item); } +static int addr_compare(struct sockaddr_storage *x, struct sockaddr_storage *y) +{ + switch (x->ss_family) { + case AF_INET: { + struct sockaddr_in *sinx = (struct sockaddr_in *)x; + struct sockaddr_in *siny = (struct sockaddr_in *)y; + if (sinx->sin_addr.s_addr != siny->sin_addr.s_addr) + return 0; + if (sinx->sin_port != siny->sin_port) + return 0; + break; + } + case AF_INET6: { + struct sockaddr_in6 *sinx = (struct sockaddr_in6 *)x; + struct sockaddr_in6 *siny = (struct sockaddr_in6 *)y; + if (!ipv6_addr_equal(&sinx->sin6_addr, &siny->sin6_addr)) + return 0; + if (sinx->sin6_port != siny->sin6_port) + return 0; + break; + } + default: + return 0; + } + return 1; +} + static struct dlm_comm *get_comm(int nodeid, struct sockaddr_storage *addr) { struct config_item *i; @@ -797,8 +827,7 @@ static struct dlm_comm *get_comm(int nodeid, struct sockaddr_storage *addr) config_item_get(i); break; } else { - if (!cm->addr_count || - memcmp(cm->addr[0], addr, sizeof(*addr))) + if (!cm->addr_count || !addr_compare(cm->addr[0], addr)) continue; found = 1; config_item_get(i); |