p2p, refactor: return vector/optional<CService> in Lookup

This commit is contained in:
brunoerg
2022-10-10 15:02:59 -03:00
parent 7799eb125b
commit 34bcdfc6a6
9 changed files with 83 additions and 100 deletions

View File

@@ -133,15 +133,15 @@ bool TorControlConnection::Connect(const std::string& tor_control_center, const
Disconnect();
}
CService control_service;
if (!Lookup(tor_control_center, control_service, 9051, fNameLookup)) {
const std::optional<CService> control_service{Lookup(tor_control_center, 9051, fNameLookup)};
if (!control_service.has_value()) {
LogPrintf("tor: Failed to look up control center %s\n", tor_control_center);
return false;
}
struct sockaddr_storage control_address;
socklen_t control_address_len = sizeof(control_address);
if (!control_service.GetSockAddr(reinterpret_cast<struct sockaddr*>(&control_address), &control_address_len)) {
if (!control_service.value().GetSockAddr(reinterpret_cast<struct sockaddr*>(&control_address), &control_address_len)) {
LogPrintf("tor: Error parsing socket address %s\n", tor_control_center);
return false;
}