RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28379 from jtlayton/wip-jlayton-40114

Browse Source 
msg: fix addr2 encoding for sockaddrs

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2019-06-08 23:31:58 +08:00 committed by GitHub
commit e11c6865f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/msg/msg_types.h
View File

@ -489,16 +489,16 @@ struct entity_addr_t {
}
encode(nonce, bl);
__u32 elen = get_sockaddr_len();
#if (__FreeBSD__) || defined(__APPLE__)
elen -= sizeof(u.sa.sa_len);
#endif
encode(elen, bl);
if (elen) {
#if (__FreeBSD__) || defined(__APPLE__)
__le16 ss_family = u.sa.sa_family;
uint16_t ss_family = u.sa.sa_family;
encode(ss_family, bl);
bl.append(u.sa.sa_data,
elen - sizeof(u.sa.sa_len) - sizeof(u.sa.sa_family));
#else
bl.append((char*)get_sockaddr(), elen);
#endif
elen -= sizeof(u.sa.sa_family);
bl.append(u.sa.sa_data, elen);
}
ENCODE_FINISH(bl);
}
@ -520,7 +520,8 @@ struct entity_addr_t {
if (elen) {
#if defined(__FreeBSD__) || defined(__APPLE__)
u.sa.sa_len = 0;
__le16 ss_family;
#endif
uint16_t ss_family;
if (elen < sizeof(ss_family)) {
throw buffer::malformed_input("elen smaller than family len");
}
@ -531,17 +532,6 @@ struct entity_addr_t {
throw buffer::malformed_input("elen exceeds sockaddr len");
}
bl.copy(elen, u.sa.sa_data);
#else
if (elen < sizeof(u.sa.sa_family)) {
throw ceph::buffer::malformed_input("elen smaller than family len");
}
bl.copy(sizeof(u.sa.sa_family), (char*)&u.sa.sa_family);
if (elen > get_sockaddr_len()) {
throw ceph::buffer::malformed_input("elen exceeds sockaddr len");
}
elen -= sizeof(u.sa.sa_family);
bl.copy(elen, u.sa.sa_data);
#endif
}
DECODE_FINISH(bl);
}