mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-15 12:13:24 +00:00
af6caf776a
* Config file API/comment improvements API improvements: ================= Make the config API use position-independent tag parameters (Required, Default{123}, MultiValue) rather than a sequence of bools with overloads. For example, instead of: conf.defineOption<int>("a", "b", false, true, 123, [] { ... }); you now write: conf.defineOption<int>("a", "b", MultiValue, Default{123}, [] { ... }); The tags are: - Required - MultiValue - Default{value} plus new abilities (see below): - Hidden - RelayOnly - ClientOnly - Comment{"line1", "line2", "line3"} Made option definition more powerful: ===================================== - `Hidden` allows you to define an option that won't show up in the generated config file if it isn't set. - `RelayOnly`/`ClientOnly` sets up an option that is only accepted and only shows up for relay or client configs. (If neither is specified the option shows up in both modes). - `Comment{...}` lets the option comments be specified as part of the defineOption. Comment improvements ==================== - Rewrote comments for various options to expand on details. - Inlined all the comments with the option definitions. - Several options that were missing comments got comments added. - Made various options for deprecated and or internal options hidden by default so that they don't show up in a default config file. - show the section comment (but not option comments) *after* the [section] tag instead of before it as it makes more sense that way (particularly for the [bind] section which has a new long comment to describe how it works). Disable profiling by default ============================ We had this weird state where we use and store profiling by default but never *load* it when starting up. This commit makes us just not use profiling at all unless explicitly enabled. Other misc changes: =================== - change default worker threads to 0 (= num cpus) instead of 1, and fix it to allow 0. - Actually apply worker-threads option - fixed default data-dir value erroneously having quotes around it - reordered ifname/ifaddr/mapaddr (was previously mapaddr/ifaddr/ifname) as mapaddr is a sort of specialization of ifaddr and so makes more sense to come after it (particularly because it now references ifaddr in its help message). - removed peer-stats option (since we always require it for relays and never use it for clients) - removed router profiles filename option (this doesn't need to be configurable) - removed defunct `service-node-seed` option - Change default logging output file to "" (which means stdout), and also made "-" work for stdout. * Router hive compilation fixes * Comments for SNApp SRV settings in ini file * Add extra blank line after section comments * Better deprecated option handling Allow {client,relay}-only options in {relay,client} configs to be specified as implicitly deprecated options: they warn, and don't set anything. Add an explicit `Deprecated` tag and move deprecated option handling into definition.cpp. * Move backwards compat options into section definitions Keep the "addBackwardsCompatibleConfigOptions" only for options in sections that no longer exist. * Fix INI parsing issues & C++17-ify - don't allow inline comments because it seems they aren't allowed in ini formats in general, and is going to cause problems if there is a comment character in a value (e.g. an exit auth string). Additionally it was breaking on a line such as: # some comment; see? because it was treating only `; see?` as the comment and then producing an error message about the rest of the line being invalid. - make section parsing stricter: the `[` and `]` have to be at the beginning at end of the line now (after stripping whitespace). - Move whitespace stripping to the top since everything in here does it. - chop off string_view suffix/prefix rather than maintaining position values - fix potential infinite loop/segfault when given a line such as `]foo[` * Make config parsing failure fatal Load() LogError's and returns false on failure, so we weren't aborting on config file errors. * Formatting: allow `{}` for empty functions/structs Instead of using two lines when empty: { } * Make default dns bind 127.0.0.1 on non-Linux * Don't show empty section; fix tests We can conceivably have sections that only make sense for clients or relays, and so want to completely omit that section if we have no options for the type of config being generated. Also fixes missing empty lines between tests. Co-authored-by: Thomas Winget <tewinget@gmail.com>
514 lines
12 KiB
C++
514 lines
12 KiB
C++
#include <link/server.hpp>
|
|
#include <ev/ev.hpp>
|
|
#include <crypto/crypto.hpp>
|
|
#include <config/key_manager.hpp>
|
|
#include <memory>
|
|
#include <util/fs.hpp>
|
|
#include <utility>
|
|
#include <unordered_set>
|
|
|
|
static constexpr auto LINK_LAYER_TICK_INTERVAL = 100ms;
|
|
|
|
namespace llarp
|
|
{
|
|
static constexpr size_t MaxSessionsPerKey = 16;
|
|
|
|
ILinkLayer::ILinkLayer(
|
|
std::shared_ptr<KeyManager> keyManager,
|
|
GetRCFunc getrc,
|
|
LinkMessageHandler handler,
|
|
SignBufferFunc signbuf,
|
|
BeforeConnectFunc_t before,
|
|
SessionEstablishedHandler establishedSession,
|
|
SessionRenegotiateHandler reneg,
|
|
TimeoutHandler timeout,
|
|
SessionClosedHandler closed,
|
|
PumpDoneHandler pumpDone,
|
|
WorkerFunc_t work)
|
|
: HandleMessage(std::move(handler))
|
|
, HandleTimeout(std::move(timeout))
|
|
, Sign(std::move(signbuf))
|
|
, GetOurRC(std::move(getrc))
|
|
, BeforeConnect(std::move(before))
|
|
, SessionEstablished(std::move(establishedSession))
|
|
, SessionClosed(std::move(closed))
|
|
, SessionRenegotiate(std::move(reneg))
|
|
, PumpDone(std::move(pumpDone))
|
|
, QueueWork(std::move(work))
|
|
, m_RouterEncSecret(keyManager->encryptionKey)
|
|
, m_SecretKey(keyManager->transportKey)
|
|
{}
|
|
|
|
ILinkLayer::~ILinkLayer() = default;
|
|
|
|
bool
|
|
ILinkLayer::HasSessionTo(const RouterID& id)
|
|
{
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
return m_AuthedLinks.find(id) != m_AuthedLinks.end();
|
|
}
|
|
|
|
void
|
|
ILinkLayer::ForEachSession(std::function<void(const ILinkSession*)> visit, bool randomize) const
|
|
{
|
|
std::vector<std::shared_ptr<ILinkSession>> sessions;
|
|
{
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
if (m_AuthedLinks.size() == 0)
|
|
return;
|
|
const size_t sz = randint() % m_AuthedLinks.size();
|
|
auto itr = m_AuthedLinks.begin();
|
|
auto begin = itr;
|
|
if (randomize)
|
|
{
|
|
std::advance(itr, sz);
|
|
begin = itr;
|
|
}
|
|
while (itr != m_AuthedLinks.end())
|
|
{
|
|
sessions.emplace_back(itr->second);
|
|
++itr;
|
|
}
|
|
if (randomize)
|
|
{
|
|
itr = m_AuthedLinks.begin();
|
|
while (itr != begin)
|
|
{
|
|
sessions.emplace_back(itr->second);
|
|
++itr;
|
|
}
|
|
}
|
|
}
|
|
for (const auto& session : sessions)
|
|
visit(session.get());
|
|
}
|
|
|
|
bool
|
|
ILinkLayer::VisitSessionByPubkey(const RouterID& pk, std::function<bool(ILinkSession*)> visit)
|
|
{
|
|
std::shared_ptr<ILinkSession> session;
|
|
{
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
auto itr = m_AuthedLinks.find(pk);
|
|
if (itr == m_AuthedLinks.end())
|
|
return false;
|
|
session = itr->second;
|
|
}
|
|
return visit(session.get());
|
|
}
|
|
|
|
void
|
|
ILinkLayer::ForEachSession(std::function<void(ILinkSession*)> visit)
|
|
{
|
|
std::vector<std::shared_ptr<ILinkSession>> sessions;
|
|
{
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
auto itr = m_AuthedLinks.begin();
|
|
while (itr != m_AuthedLinks.end())
|
|
{
|
|
sessions.emplace_back(itr->second);
|
|
++itr;
|
|
}
|
|
}
|
|
for (const auto& s : sessions)
|
|
visit(s.get());
|
|
}
|
|
|
|
bool
|
|
ILinkLayer::Configure(llarp_ev_loop_ptr loop, const std::string& ifname, int af, uint16_t port)
|
|
{
|
|
m_Loop = loop;
|
|
m_udp.user = this;
|
|
m_udp.recvfrom = [](llarp_udp_io* udp, const llarp::SockAddr& from, ManagedBuffer pktbuf) {
|
|
ILinkSession::Packet_t pkt;
|
|
auto& buf = pktbuf.underlying;
|
|
pkt.resize(buf.sz);
|
|
std::copy_n(buf.base, buf.sz, pkt.data());
|
|
static_cast<ILinkLayer*>(udp->user)->RecvFrom(from, std::move(pkt));
|
|
};
|
|
m_udp.tick = &ILinkLayer::udp_tick;
|
|
if (ifname == "*")
|
|
{
|
|
if (!AllInterfaces(af, m_ourAddr))
|
|
return false;
|
|
}
|
|
else
|
|
{
|
|
if (const auto maybe = GetIFAddr(ifname, af))
|
|
{
|
|
m_ourAddr = *maybe;
|
|
}
|
|
else
|
|
{
|
|
try
|
|
{
|
|
m_ourAddr = IpAddress(ifname);
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
LogError(stringify("Could not use ifname ", ifname, " to configure ILinkLayer"));
|
|
throw e;
|
|
}
|
|
}
|
|
}
|
|
m_ourAddr.setPort(port);
|
|
return llarp_ev_add_udp(m_Loop.get(), &m_udp, m_ourAddr.createSockAddr()) != -1;
|
|
}
|
|
|
|
void
|
|
ILinkLayer::Pump()
|
|
{
|
|
std::unordered_set<RouterID, RouterID::Hash> closedSessions;
|
|
std::vector<std::shared_ptr<ILinkSession>> closedPending;
|
|
auto _now = Now();
|
|
{
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
auto itr = m_AuthedLinks.begin();
|
|
while (itr != m_AuthedLinks.end())
|
|
{
|
|
if (not itr->second->TimedOut(_now))
|
|
{
|
|
itr->second->Pump();
|
|
++itr;
|
|
}
|
|
else
|
|
{
|
|
llarp::LogInfo("session to ", RouterID(itr->second->GetPubKey()), " timed out");
|
|
itr->second->Close();
|
|
closedSessions.emplace(itr->first);
|
|
itr = m_AuthedLinks.erase(itr);
|
|
}
|
|
}
|
|
}
|
|
{
|
|
Lock_t l(m_PendingMutex);
|
|
|
|
auto itr = m_Pending.begin();
|
|
while (itr != m_Pending.end())
|
|
{
|
|
if (not itr->second->TimedOut(_now))
|
|
{
|
|
itr->second->Pump();
|
|
++itr;
|
|
}
|
|
else
|
|
{
|
|
LogInfo("pending session at ", itr->first, " timed out");
|
|
// defer call so we can acquire mutexes later
|
|
closedPending.emplace_back(std::move(itr->second));
|
|
itr = m_Pending.erase(itr);
|
|
}
|
|
}
|
|
}
|
|
{
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
for (const auto& r : closedSessions)
|
|
{
|
|
if (m_AuthedLinks.count(r) == 0)
|
|
{
|
|
SessionClosed(r);
|
|
}
|
|
}
|
|
}
|
|
for (const auto& pending : closedPending)
|
|
{
|
|
if (pending->IsInbound())
|
|
continue;
|
|
HandleTimeout(pending.get());
|
|
}
|
|
}
|
|
|
|
bool
|
|
ILinkLayer::MapAddr(const RouterID& pk, ILinkSession* s)
|
|
{
|
|
Lock_t l_authed(m_AuthedLinksMutex);
|
|
Lock_t l_pending(m_PendingMutex);
|
|
IpAddress addr = s->GetRemoteEndpoint();
|
|
auto itr = m_Pending.find(addr);
|
|
if (itr != m_Pending.end())
|
|
{
|
|
if (m_AuthedLinks.count(pk) > MaxSessionsPerKey)
|
|
{
|
|
LogWarn("too many session for ", pk);
|
|
s->Close();
|
|
return false;
|
|
}
|
|
m_AuthedLinks.emplace(pk, itr->second);
|
|
itr = m_Pending.erase(itr);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool
|
|
ILinkLayer::PickAddress(const RouterContact& rc, llarp::AddressInfo& picked) const
|
|
{
|
|
std::string OurDialect = Name();
|
|
for (const auto& addr : rc.addrs)
|
|
{
|
|
if (addr.dialect == OurDialect)
|
|
{
|
|
picked = addr;
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
util::StatusObject
|
|
ILinkLayer::ExtractStatus() const
|
|
{
|
|
std::vector<util::StatusObject> pending, established;
|
|
|
|
{
|
|
Lock_t l(m_PendingMutex);
|
|
std::transform(
|
|
m_Pending.cbegin(),
|
|
m_Pending.cend(),
|
|
std::back_inserter(pending),
|
|
[](const auto& item) -> util::StatusObject { return item.second->ExtractStatus(); });
|
|
}
|
|
{
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
std::transform(
|
|
m_AuthedLinks.cbegin(),
|
|
m_AuthedLinks.cend(),
|
|
std::back_inserter(established),
|
|
[](const auto& item) -> util::StatusObject { return item.second->ExtractStatus(); });
|
|
}
|
|
|
|
return {{"name", Name()},
|
|
{"rank", uint64_t(Rank())},
|
|
{"addr", m_ourAddr.toString()},
|
|
{"sessions", util::StatusObject{{"pending", pending}, {"established", established}}}};
|
|
}
|
|
|
|
bool
|
|
ILinkLayer::TryEstablishTo(RouterContact rc)
|
|
{
|
|
{
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
if (m_AuthedLinks.count(rc.pubkey) >= MaxSessionsPerKey)
|
|
{
|
|
LogDebug("Too many links to ", RouterID{rc.pubkey}, ", not establishing another one");
|
|
return false;
|
|
}
|
|
}
|
|
llarp::AddressInfo to;
|
|
if (!PickAddress(rc, to))
|
|
return false;
|
|
const IpAddress address = to.toIpAddress();
|
|
{
|
|
Lock_t l(m_PendingMutex);
|
|
if (m_Pending.count(address) >= MaxSessionsPerKey)
|
|
{
|
|
LogDebug(
|
|
"Too many pending connections to ",
|
|
address,
|
|
" while establishing to ",
|
|
RouterID{rc.pubkey},
|
|
", not establishing another");
|
|
return false;
|
|
}
|
|
}
|
|
std::shared_ptr<ILinkSession> s = NewOutboundSession(rc, to);
|
|
if (BeforeConnect)
|
|
{
|
|
BeforeConnect(std::move(rc));
|
|
}
|
|
if (PutSession(s))
|
|
{
|
|
s->Start();
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool
|
|
ILinkLayer::Start(std::shared_ptr<Logic> l)
|
|
{
|
|
m_Logic = l;
|
|
ScheduleTick(LINK_LAYER_TICK_INTERVAL);
|
|
return true;
|
|
}
|
|
|
|
void
|
|
ILinkLayer::Tick(llarp_time_t now)
|
|
{
|
|
{
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
auto itr = m_AuthedLinks.begin();
|
|
while (itr != m_AuthedLinks.end())
|
|
{
|
|
itr->second->Tick(now);
|
|
++itr;
|
|
}
|
|
}
|
|
|
|
{
|
|
Lock_t l(m_PendingMutex);
|
|
auto itr = m_Pending.begin();
|
|
while (itr != m_Pending.end())
|
|
{
|
|
itr->second->Tick(now);
|
|
++itr;
|
|
}
|
|
}
|
|
{
|
|
// decay recently closed list
|
|
auto itr = m_RecentlyClosed.begin();
|
|
while (itr != m_RecentlyClosed.end())
|
|
{
|
|
if (itr->second >= now)
|
|
itr = m_RecentlyClosed.erase(itr);
|
|
else
|
|
++itr;
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
ILinkLayer::Stop()
|
|
{
|
|
if (m_Logic && tick_id)
|
|
m_Logic->remove_call(tick_id);
|
|
{
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
auto itr = m_AuthedLinks.begin();
|
|
while (itr != m_AuthedLinks.end())
|
|
{
|
|
itr->second->Close();
|
|
++itr;
|
|
}
|
|
}
|
|
{
|
|
Lock_t l(m_PendingMutex);
|
|
auto itr = m_Pending.begin();
|
|
while (itr != m_Pending.end())
|
|
{
|
|
itr->second->Close();
|
|
++itr;
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
ILinkLayer::CloseSessionTo(const RouterID& remote)
|
|
{
|
|
static constexpr auto CloseGraceWindow = 500ms;
|
|
const auto now = Now();
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
RouterID r = remote;
|
|
llarp::LogInfo("Closing all to ", r);
|
|
auto range = m_AuthedLinks.equal_range(r);
|
|
auto itr = range.first;
|
|
while (itr != range.second)
|
|
{
|
|
itr->second->Close();
|
|
m_RecentlyClosed.emplace(itr->second->GetRemoteEndpoint(), now + CloseGraceWindow);
|
|
itr = m_AuthedLinks.erase(itr);
|
|
}
|
|
}
|
|
|
|
void
|
|
ILinkLayer::KeepAliveSessionTo(const RouterID& remote)
|
|
{
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
auto range = m_AuthedLinks.equal_range(remote);
|
|
auto itr = range.first;
|
|
while (itr != range.second)
|
|
{
|
|
if (itr->second->ShouldPing())
|
|
{
|
|
LogDebug("keepalive to ", remote);
|
|
itr->second->SendKeepAlive();
|
|
}
|
|
++itr;
|
|
}
|
|
}
|
|
|
|
bool
|
|
ILinkLayer::SendTo(
|
|
const RouterID& remote, const llarp_buffer_t& buf, ILinkSession::CompletionHandler completed)
|
|
{
|
|
std::shared_ptr<ILinkSession> s;
|
|
{
|
|
Lock_t l(m_AuthedLinksMutex);
|
|
auto range = m_AuthedLinks.equal_range(remote);
|
|
auto itr = range.first;
|
|
// pick lowest backlog session
|
|
size_t min = std::numeric_limits<size_t>::max();
|
|
|
|
while (itr != range.second)
|
|
{
|
|
const auto backlog = itr->second->SendQueueBacklog();
|
|
if (backlog < min)
|
|
{
|
|
s = itr->second;
|
|
min = backlog;
|
|
}
|
|
++itr;
|
|
}
|
|
}
|
|
ILinkSession::Message_t pkt(buf.sz);
|
|
std::copy_n(buf.base, buf.sz, pkt.begin());
|
|
return s && s->SendMessageBuffer(std::move(pkt), completed);
|
|
}
|
|
|
|
bool
|
|
ILinkLayer::GetOurAddressInfo(llarp::AddressInfo& addr) const
|
|
{
|
|
addr.fromIpAddress(m_ourAddr);
|
|
addr.dialect = Name();
|
|
addr.pubkey = TransportPubKey();
|
|
addr.rank = Rank();
|
|
return true;
|
|
}
|
|
|
|
const byte_t*
|
|
ILinkLayer::TransportPubKey() const
|
|
{
|
|
return llarp::seckey_topublic(TransportSecretKey());
|
|
}
|
|
|
|
const SecretKey&
|
|
ILinkLayer::TransportSecretKey() const
|
|
{
|
|
return m_SecretKey;
|
|
}
|
|
|
|
bool
|
|
ILinkLayer::PutSession(const std::shared_ptr<ILinkSession>& s)
|
|
{
|
|
static constexpr size_t MaxSessionsPerEndpoint = 5;
|
|
Lock_t lock(m_PendingMutex);
|
|
IpAddress address = s->GetRemoteEndpoint();
|
|
if (m_Pending.count(address) >= MaxSessionsPerEndpoint)
|
|
return false;
|
|
m_Pending.emplace(address, s);
|
|
return true;
|
|
}
|
|
|
|
void
|
|
ILinkLayer::OnTick()
|
|
{
|
|
auto now = Now();
|
|
Tick(now);
|
|
ScheduleTick(LINK_LAYER_TICK_INTERVAL);
|
|
}
|
|
|
|
void
|
|
ILinkLayer::ScheduleTick(llarp_time_t interval)
|
|
{
|
|
tick_id = m_Logic->call_later(interval, std::bind(&ILinkLayer::OnTick, this));
|
|
}
|
|
|
|
void
|
|
ILinkLayer::udp_tick(llarp_udp_io* udp)
|
|
{
|
|
ILinkLayer* link = static_cast<ILinkLayer*>(udp->user);
|
|
link->Pump();
|
|
}
|
|
|
|
} // namespace llarp
|