RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #25934 into master

Browse Source 
* refs/pull/25934/head:
	msg/msg_type: entity_addr_t: fix legacy decode
	msg/msg_types: make set_sockaddr() work with AF_UNSPEC (i.e., zeroed)
	msg/msg_types: make set_sockaddr() a bit more robust
	msg/async: fix IP inference

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Sage Weil 2019-01-16 13:12:35 -06:00
commit 63ba6d249a
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/msg/async/ProtocolV1.cc
View File

@ -1786,7 +1786,7 @@ CtPtr ProtocolV1::handle_client_banner(char *buffer, int r) {
if (peer_addr.is_blank_ip()) {
// peer apparently doesn't know what ip they have; figure it out for them.
int port = peer_addr.get_port();
peer_addr.u = connection->socket_addr.u;
peer_addr.set_sockaddr(connection->target_addr.get_sockaddr());
peer_addr.set_port(port);
ldout(cct, 0) << __func__ << " accept peer addr is really " << peer_addr

4
src/msg/async/ProtocolV2.cc
View File

@ -1829,10 +1829,10 @@ CtPtr ProtocolV2::handle_client_addrvec(char *buffer, int r) {
if (peer_addr.is_blank_ip()) {
// peer apparently doesn't know what ip they have; figure it out for them.
int port = peer_addr.get_port();
peer_addr.u = connection->socket_addr.u;
peer_addr.set_sockaddr(connection->target_addr.get_sockaddr());
peer_addr.set_port(port);
ldout(cct, 0) << __func__ << " accept peer addr is really " << peer_addr
<< " (socket is " << connection->socket_addr << ")"
<< " (target is " << connection->target_addr << ")"
<< dendl;
peer_addr_p = &peer_addr;
}

13
src/msg/msg_types.h
View File

@ -313,11 +313,18 @@ struct entity_addr_t {
{
switch (sa->sa_family) {
case AF_INET:
// pre-zero, since we're only copying a portion of the source
memset(&u, 0, sizeof(u));
memcpy(&u.sin, sa, sizeof(u.sin));
break;
case AF_INET6:
// pre-zero, since we're only copying a portion of the source
memset(&u, 0, sizeof(u));
memcpy(&u.sin6, sa, sizeof(u.sin6));
break;
case AF_UNSPEC:
memset(&u, 0, sizeof(u));
break;
default:
return false;
}
@ -433,11 +440,15 @@ struct entity_addr_t {
__u16 rest;
decode(marker, bl);
decode(rest, bl);
type = TYPE_LEGACY;
decode(nonce, bl);
sockaddr_storage ss;
decode(ss, bl);
set_sockaddr((sockaddr*)&ss);
if (get_family() == AF_UNSPEC) {
type = TYPE_NONE;
} else {
type = TYPE_LEGACY;
}
}
// Right now, these only deal with sockaddr_storage that have only family and content.

6
src/test/test_addrs.cc
View File

@ -131,7 +131,7 @@ TEST(Msgr, TestEmptyAddrvecEncodeAddrDecode)
addrvec.encode(bl, 0);
auto bli = bl.cbegin();
addr.decode(bli);
ASSERT_EQ(addr, entity_addr_t(1, 0));
ASSERT_EQ(addr, entity_addr_t());
}
const char *addrvec_checks[][4] = {
@ -237,9 +237,11 @@ TEST(Msgr, TestAddrvecEncodeAddrDecode3)
auto bli = bl.cbegin();
addr.decode(bli);
//cout << addrvec << " (legacy " << addrvec.legacy_addr()
//<< ") -> " << addr << std::endl;
ASSERT_NE(addr, addrvec.v[0]); // it's not the first addr(which is non-legacy)
ASSERT_NE(addr, entity_addr_t(1, 0)); // it's not a blank addr either
ASSERT_EQ(addr, entity_addr_t()); // it's not a blank addr either
}
const char *addrvec_parse_checks[][3] = {