mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
d3c3c0a841
Going forward, we'll have different address types so let's use the addr2 TYPE_LEGACY for internal tracking rather than TYPE_NONE. Also, make ceph_pr_addr print the address type value as well. Signed-off-by: Jeff Layton <jlayton@kernel.org> Reviewed-by: "Yan, Zheng" <zyan@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
84 lines
2 KiB
C
84 lines
2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#include <linux/ceph/decode.h>
|
|
|
|
static int
|
|
ceph_decode_entity_addr_versioned(void **p, void *end,
|
|
struct ceph_entity_addr *addr)
|
|
{
|
|
int ret;
|
|
u8 struct_v;
|
|
u32 struct_len, addr_len;
|
|
void *struct_end;
|
|
|
|
ret = ceph_start_decoding(p, end, 1, "entity_addr_t", &struct_v,
|
|
&struct_len);
|
|
if (ret)
|
|
goto bad;
|
|
|
|
ret = -EINVAL;
|
|
struct_end = *p + struct_len;
|
|
|
|
ceph_decode_copy_safe(p, end, &addr->type, sizeof(addr->type), bad);
|
|
|
|
ceph_decode_copy_safe(p, end, &addr->nonce, sizeof(addr->nonce), bad);
|
|
|
|
ceph_decode_32_safe(p, end, addr_len, bad);
|
|
if (addr_len > sizeof(addr->in_addr))
|
|
goto bad;
|
|
|
|
memset(&addr->in_addr, 0, sizeof(addr->in_addr));
|
|
if (addr_len) {
|
|
ceph_decode_copy_safe(p, end, &addr->in_addr, addr_len, bad);
|
|
|
|
addr->in_addr.ss_family =
|
|
le16_to_cpu((__force __le16)addr->in_addr.ss_family);
|
|
}
|
|
|
|
/* Advance past anything the client doesn't yet understand */
|
|
*p = struct_end;
|
|
ret = 0;
|
|
bad:
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
ceph_decode_entity_addr_legacy(void **p, void *end,
|
|
struct ceph_entity_addr *addr)
|
|
{
|
|
int ret = -EINVAL;
|
|
|
|
/* Skip rest of type field */
|
|
ceph_decode_skip_n(p, end, 3, bad);
|
|
|
|
/*
|
|
* Clients that don't support ADDR2 always send TYPE_NONE, change it
|
|
* to TYPE_LEGACY for forward compatibility.
|
|
*/
|
|
addr->type = CEPH_ENTITY_ADDR_TYPE_LEGACY;
|
|
ceph_decode_copy_safe(p, end, &addr->nonce, sizeof(addr->nonce), bad);
|
|
memset(&addr->in_addr, 0, sizeof(addr->in_addr));
|
|
ceph_decode_copy_safe(p, end, &addr->in_addr,
|
|
sizeof(addr->in_addr), bad);
|
|
addr->in_addr.ss_family =
|
|
be16_to_cpu((__force __be16)addr->in_addr.ss_family);
|
|
ret = 0;
|
|
bad:
|
|
return ret;
|
|
}
|
|
|
|
int
|
|
ceph_decode_entity_addr(void **p, void *end, struct ceph_entity_addr *addr)
|
|
{
|
|
u8 marker;
|
|
|
|
ceph_decode_8_safe(p, end, marker, bad);
|
|
if (marker == 1)
|
|
return ceph_decode_entity_addr_versioned(p, end, addr);
|
|
else if (marker == 0)
|
|
return ceph_decode_entity_addr_legacy(p, end, addr);
|
|
bad:
|
|
return -EINVAL;
|
|
}
|
|
EXPORT_SYMBOL(ceph_decode_entity_addr);
|
|
|