Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixup: refactor handshake objects to use socket address as key as well #5644

Merged
merged 2 commits into from
Jun 20, 2023
Merged

fixup: refactor handshake objects to use socket address as key as well #5644

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfef921
fixup: refactor handshake objects to use socket address as key as well
tearfur Jun 20, 2023
8be96c4
fix use-after-free
tearfur Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions libtransmission/peer-mgr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ struct peer_atom
static auto inline n_atoms = std::atomic<size_t>{};
};

using Handshakes = std::map<tr_address, tr_handshake>;
using Handshakes = std::map<std::pair<tr_address, tr_port>, tr_handshake>;

#define tr_logAddDebugSwarm(swarm, msg) tr_logAddDebugTor((swarm)->tor, msg)
#define tr_logAddTraceSwarm(swarm, msg) tr_logAddTraceTor((swarm)->tor, msg)
Expand Down Expand Up @@ -1011,11 +1011,11 @@ void create_bit_torrent_peer(tr_torrent* tor, std::shared_ptr<tr_peerIo> io, str

if (result.io->is_incoming())
{
manager->incoming_handshakes.erase(addr);
manager->incoming_handshakes.erase(std::make_pair(addr, port));
}
else if (s != nullptr)
{
s->outgoing_handshakes.erase(addr);
s->outgoing_handshakes.erase(std::make_pair(addr, port));
}

auto const lock = manager->unique_lock();
Expand Down Expand Up @@ -1112,15 +1112,15 @@ void tr_peerMgrAddIncoming(tr_peerMgr* manager, tr_peer_socket&& socket)
tr_logAddTrace(fmt::format("Banned IP address '{}' tried to connect to us", socket.display_name()));
socket.close();
}
else if (manager->incoming_handshakes.count(socket.address()) != 0U)
else if (manager->incoming_handshakes.count(socket.socketAddress()) != 0U)
{
socket.close();
}
else /* we don't have a connection to them yet... */
{
auto address = socket.address();
auto const& socket_address = socket.socketAddress();
manager->incoming_handshakes.try_emplace(
address,
socket_address,
&manager->handshake_mediator_,
tr_peerIo::new_incoming(session, &session->top_bandwidth_, std::move(socket)),
session->encryptionMode(),
Expand Down Expand Up @@ -2225,8 +2225,8 @@ void tr_peerMgr::bandwidthPulse()

bool tr_swarm::peer_is_in_use(peer_atom const& atom) const
{
return atom.is_connected || outgoing_handshakes.count(atom.addr) != 0U ||
manager->incoming_handshakes.count(atom.addr) != 0U;
return atom.is_connected || outgoing_handshakes.count(std::make_pair(atom.addr, atom.port)) != 0U ||
manager->incoming_handshakes.count(std::make_pair(atom.addr, atom.port)) != 0U;
}

namespace
Expand Down Expand Up @@ -2466,7 +2466,7 @@ void initiateConnection(tr_peerMgr* mgr, tr_swarm* s, peer_atom& atom)
else
{
s->outgoing_handshakes.try_emplace(
atom.addr,
std::make_pair(atom.addr, atom.port),
&mgr->handshake_mediator_,
peer_io,
session->encryptionMode(),
Expand Down
Loading