mirror of https://github.com/oxen-io/lokinet
Compare commits
2 Commits
56e64730bd
...
7730acc552
Author | SHA1 | Date |
---|---|---|
Jason Rhinelander | 7730acc552 | |
Jason Rhinelander | 8238fc1f7e |
|
@ -1 +1 @@
|
|||
Subproject commit f903a8f6d08398c591c9fd12e93a3c35c5fa65c7
|
||||
Subproject commit c9271e87eaa2d6bcbdf4e49936fcce2b7bc9e693
|
|
@ -51,27 +51,6 @@ namespace llarp
|
|||
return false;
|
||||
}
|
||||
|
||||
bool
|
||||
Endpoint::deregister_peer(RouterID _rid)
|
||||
{
|
||||
if (auto itr = conns.find(_rid); itr != conns.end())
|
||||
{
|
||||
auto& c = itr->second;
|
||||
auto& _scid = c->conn->scid();
|
||||
|
||||
link_manager._router.loop()->call([this, scid = _scid, rid = _rid]() {
|
||||
endpoint->close_connection(scid);
|
||||
|
||||
conns.erase(rid);
|
||||
connid_map.erase(scid);
|
||||
});
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
size_t
|
||||
Endpoint::num_connected(bool clients_only) const
|
||||
{
|
||||
|
@ -111,18 +90,15 @@ namespace llarp
|
|||
void
|
||||
Endpoint::close_connection(RouterID _rid)
|
||||
{
|
||||
if (auto itr = conns.find(_rid); itr != conns.end())
|
||||
{
|
||||
auto& c = itr->second;
|
||||
auto& _scid = c->conn->scid();
|
||||
assert(link_manager._router.loop()->inEventLoop());
|
||||
auto itr = conns.find(_rid);
|
||||
if (itr != conns.end())
|
||||
return;
|
||||
|
||||
link_manager._router.loop()->call([this, scid = _scid, rid = _rid]() {
|
||||
endpoint->close_connection(scid);
|
||||
|
||||
conns.erase(rid);
|
||||
connid_map.erase(scid);
|
||||
});
|
||||
}
|
||||
auto& conn = *itr->second->conn;
|
||||
conn.close_connection();
|
||||
connid_map.erase(conn.scid());
|
||||
conns.erase(itr);
|
||||
}
|
||||
|
||||
} // namespace link
|
||||
|
@ -216,7 +192,7 @@ namespace llarp
|
|||
std::optional<int64_t> id) -> std::shared_ptr<oxen::quic::Stream> {
|
||||
if (id && id == 0)
|
||||
{
|
||||
auto s = std::make_shared<oxen::quic::BTRequestStream>(
|
||||
auto s = e.make_shared<oxen::quic::BTRequestStream>(
|
||||
c, e, [](oxen::quic::Stream& s, uint64_t error_code) {
|
||||
log::warning(
|
||||
logcat,
|
||||
|
@ -227,7 +203,7 @@ namespace llarp
|
|||
register_commands(s);
|
||||
return s;
|
||||
}
|
||||
return std::make_shared<oxen::quic::Stream>(c, e);
|
||||
return nullptr;
|
||||
});
|
||||
}
|
||||
return ep;
|
||||
|
@ -464,18 +440,6 @@ namespace llarp
|
|||
return ep.have_conn(remote, true);
|
||||
}
|
||||
|
||||
void
|
||||
LinkManager::deregister_peer(RouterID remote)
|
||||
{
|
||||
if (auto rv = ep.deregister_peer(remote); rv)
|
||||
{
|
||||
persisting_conns.erase(remote);
|
||||
log::info(logcat, "Peer {} successfully de-registered", remote);
|
||||
}
|
||||
else
|
||||
log::warning(logcat, "Peer {} not found for de-registration!", remote);
|
||||
}
|
||||
|
||||
void
|
||||
LinkManager::stop()
|
||||
{
|
||||
|
|
|
@ -61,9 +61,6 @@ namespace llarp
|
|||
bool
|
||||
have_conn(const RouterID& remote, bool client_only) const;
|
||||
|
||||
bool
|
||||
deregister_peer(RouterID remote);
|
||||
|
||||
size_t
|
||||
num_connected(bool clients_only) const;
|
||||
|
||||
|
@ -268,9 +265,6 @@ namespace llarp
|
|||
bool
|
||||
have_client_connection_to(const RouterID& remote) const;
|
||||
|
||||
void
|
||||
deregister_peer(RouterID remote);
|
||||
|
||||
void
|
||||
test_reachability(const RouterID& rid, conn_open_hook, conn_closed_hook);
|
||||
|
||||
|
|
|
@ -595,8 +595,6 @@ namespace llarp
|
|||
? _listen_address
|
||||
: oxen::quic::Address{*paddr, pport ? *pport : DEFAULT_LISTEN_PORT};
|
||||
|
||||
log::critical(logcat, "listen_addr:{} \t public_addr:{}", _listen_address, _public_address);
|
||||
|
||||
RouterContact::BLOCK_BOGONS = conf.router.block_bogons;
|
||||
|
||||
auto& networkConfig = conf.network;
|
||||
|
@ -981,7 +979,7 @@ namespace llarp
|
|||
|
||||
// mark peers as de-registered
|
||||
for (auto& peer : close_peers)
|
||||
_link_manager.deregister_peer(peer);
|
||||
_link_manager.close_connection(peer);
|
||||
}
|
||||
*/
|
||||
|
||||
|
|
Loading…
Reference in New Issue