wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1219 from vishesh/task/issue-1201 

fix: segfault due external assignment of Endpoint::addresses #1201
This commit is contained in:
Evan Tschannen 2019-03-04 16:35:42 -08:00 committed by GitHub
parent 85b18c0665 5cd8bac6cb
commit 1ee9b9cda1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fdbrpc/FlowTransport.actor.cpp
View File

@ -34,7 +34,7 @@
#endif
#include "flow/actorcompiler.h" // This must be the last #include.
static NetworkAddressList g_currentDeliveryPeerAddress;
static NetworkAddressList g_currentDeliveryPeerAddress = {NetworkAddress()};
const UID WLTOKEN_ENDPOINT_NOT_FOUND(-1, 0);
const UID WLTOKEN_PING_PACKET(-1, 1);
@ -491,11 +491,14 @@ ACTOR static void deliver( TransportData* self, Endpoint destination, ArenaReade
}
} else if (destination.token.first() & TOKEN_STREAM_FLAG) {
// We don't have the (stream) endpoint 'token', notify the remote machine
if (destination.token.first() != -1)
sendPacket( self,
SerializeSource<Endpoint>( Endpoint( self->localAddresses, destination.token ) ),
Endpoint( destination.addresses, WLTOKEN_ENDPOINT_NOT_FOUND),
false, true );
if (destination.token.first() != -1) {
sendPacket(self,
SerializeSource<Endpoint>(Endpoint(self->localAddresses.empty()
? NetworkAddressList(1, NetworkAddress())
: self->localAddresses,
destination.token)),
Endpoint(destination.addresses, WLTOKEN_ENDPOINT_NOT_FOUND), false, true);
}
}
if( inReadSocket )
@ -905,7 +908,7 @@ void FlowTransport::removePeerReference( const Endpoint& endpoint, NetworkMessag
void FlowTransport::addEndpoint( Endpoint& endpoint, NetworkMessageReceiver* receiver, uint32_t taskID ) {
endpoint.token = g_random->randomUniqueID();
if (receiver->isStream()) {
endpoint.addresses = self->localAddresses;
endpoint.addresses = self->localAddresses.empty() ? NetworkAddressList(1, NetworkAddress()) : self->localAddresses;
endpoint.token = UID( endpoint.token.first() | TOKEN_STREAM_FLAG, endpoint.token.second() );
} else {
endpoint.addresses = {NetworkAddress()};
@ -919,7 +922,7 @@ void FlowTransport::removeEndpoint( const Endpoint& endpoint, NetworkMessageRece
}
void FlowTransport::addWellKnownEndpoint( Endpoint& endpoint, NetworkMessageReceiver* receiver, uint32_t taskID ) {
endpoint.addresses = self->localAddresses;
endpoint.addresses = self->localAddresses.empty() ? NetworkAddressList(1, NetworkAddress()) : self->localAddresses;
ASSERT( ((endpoint.token.first() & TOKEN_STREAM_FLAG)!=0) == receiver->isStream() );
Endpoint::Token otoken = endpoint.token;
self->endpoints.insert( receiver, endpoint.token, taskID );

3
fdbrpc/FlowTransport.h
View File

@ -199,6 +199,9 @@ private:
inline bool Endpoint::isLocal() const {
auto localAddrs = FlowTransport::transport().getLocalAddresses();
if (localAddrs.empty()) {
return addresses[0] == NetworkAddress();
}
return std::find(localAddrs.begin(), localAddrs.end(), addresses[0]) != localAddrs.end();
}