lokinet/llarp/iwp/linklayer.cpp

102 lines
2.6 KiB
C++
Raw Normal View History

2019-03-29 15:17:49 +00:00
#include <iwp/linklayer.hpp>
2019-08-22 20:53:27 +00:00
#include <iwp/session.hpp>
#include <config/key_manager.hpp>
#include <memory>
#include <unordered_set>
2019-03-29 12:19:59 +00:00
namespace llarp
{
namespace iwp
{
2019-12-06 17:13:09 +00:00
LinkLayer::LinkLayer(std::shared_ptr< KeyManager > keyManager,
GetRCFunc getrc, LinkMessageHandler h,
SignBufferFunc sign, SessionEstablishedHandler est,
2019-08-22 20:53:27 +00:00
SessionRenegotiateHandler reneg,
TimeoutHandler timeout, SessionClosedHandler closed,
PumpDoneHandler pumpDone, bool allowInbound)
2019-12-06 17:13:09 +00:00
: ILinkLayer(keyManager, getrc, h, sign, est, reneg, timeout, closed,
pumpDone)
2019-08-22 20:53:27 +00:00
, permitInbound{allowInbound}
2019-03-29 12:19:59 +00:00
{
}
2019-09-05 17:39:09 +00:00
LinkLayer::~LinkLayer() = default;
2019-03-29 12:19:59 +00:00
const char*
LinkLayer::Name() const
{
return "iwp";
}
uint16_t
LinkLayer::Rank() const
{
return 2;
}
2019-09-05 14:57:01 +00:00
void
LinkLayer::QueueWork(std::function< void(void) > func)
{
2019-09-05 17:39:09 +00:00
m_Worker->addJob(func);
2019-03-29 12:19:59 +00:00
}
void
LinkLayer::RecvFrom(const Addr& from, ILinkSession::Packet_t pkt)
2019-03-29 12:19:59 +00:00
{
2019-08-22 20:53:27 +00:00
std::shared_ptr< ILinkSession > session;
auto itr = m_AuthedAddrs.find(from);
bool isNewSession = false;
2019-08-23 11:32:52 +00:00
if(itr == m_AuthedAddrs.end())
2019-03-29 12:19:59 +00:00
{
De-abseil, part 2: mutex, locks, (most) time - util::Mutex is now a std::shared_timed_mutex, which is capable of exclusive and shared locks. - util::Lock is still present as a std::lock_guard<util::Mutex>. - the locking annotations are preserved, but updated to the latest supported by clang rather than using abseil's older/deprecated ones. - ACQUIRE_LOCK macro is gone since we don't pass mutexes by pointer into locks anymore (WTF abseil). - ReleasableLock is gone. Instead there are now some llarp::util helper methods to obtain unique and/or shared locks: - `auto lock = util::unique_lock(mutex);` gets an RAII-but-also unlockable object (std::unique_lock<T>, with T inferred from `mutex`). - `auto lock = util::shared_lock(mutex);` gets an RAII shared (i.e. "reader") lock of the mutex. - `auto lock = util::unique_locks(mutex1, mutex2, mutex3);` can be used to atomically lock multiple mutexes at once (returning a tuple of the locks). This are templated on the mutex which makes them a bit more flexible than using a concrete type: they can be used for any type of lockable mutex, not only util::Mutex. (Some of the code here uses them for getting locks around a std::mutex). Until C++17, using the RAII types is painfully verbose: ```C++ // pre-C++17 - needing to figure out the mutex type here is annoying: std::unique_lock<util::Mutex> lock(mutex); // pre-C++17 and even more verbose (but at least the type isn't needed): std::unique_lock<decltype(mutex)> lock(mutex); // our compromise: auto lock = util::unique_lock(mutex); // C++17: std::unique_lock lock(mutex); ``` All of these functions will also warn (under gcc or clang) if you discard the return value. You can also do fancy things like `auto l = util::unique_lock(mutex, std::adopt_lock)` (which lets a lock take over an already-locked mutex). - metrics code is gone, which also removes a big pile of code that was only used by metrics: - llarp::util::Scheduler - llarp::thread::TimerQueue - llarp::util::Stopwatch
2020-02-21 17:21:11 +00:00
Lock_t lock(m_PendingMutex);
2019-08-22 20:53:27 +00:00
if(m_Pending.count(from) == 0)
{
2019-08-23 11:32:52 +00:00
if(not permitInbound)
return;
isNewSession = true;
2019-08-22 20:53:27 +00:00
m_Pending.insert({from, std::make_shared< Session >(this, from)});
}
session = m_Pending.find(from)->second;
2019-03-29 12:19:59 +00:00
}
2019-08-23 11:32:52 +00:00
else
{
De-abseil, part 2: mutex, locks, (most) time - util::Mutex is now a std::shared_timed_mutex, which is capable of exclusive and shared locks. - util::Lock is still present as a std::lock_guard<util::Mutex>. - the locking annotations are preserved, but updated to the latest supported by clang rather than using abseil's older/deprecated ones. - ACQUIRE_LOCK macro is gone since we don't pass mutexes by pointer into locks anymore (WTF abseil). - ReleasableLock is gone. Instead there are now some llarp::util helper methods to obtain unique and/or shared locks: - `auto lock = util::unique_lock(mutex);` gets an RAII-but-also unlockable object (std::unique_lock<T>, with T inferred from `mutex`). - `auto lock = util::shared_lock(mutex);` gets an RAII shared (i.e. "reader") lock of the mutex. - `auto lock = util::unique_locks(mutex1, mutex2, mutex3);` can be used to atomically lock multiple mutexes at once (returning a tuple of the locks). This are templated on the mutex which makes them a bit more flexible than using a concrete type: they can be used for any type of lockable mutex, not only util::Mutex. (Some of the code here uses them for getting locks around a std::mutex). Until C++17, using the RAII types is painfully verbose: ```C++ // pre-C++17 - needing to figure out the mutex type here is annoying: std::unique_lock<util::Mutex> lock(mutex); // pre-C++17 and even more verbose (but at least the type isn't needed): std::unique_lock<decltype(mutex)> lock(mutex); // our compromise: auto lock = util::unique_lock(mutex); // C++17: std::unique_lock lock(mutex); ``` All of these functions will also warn (under gcc or clang) if you discard the return value. You can also do fancy things like `auto l = util::unique_lock(mutex, std::adopt_lock)` (which lets a lock take over an already-locked mutex). - metrics code is gone, which also removes a big pile of code that was only used by metrics: - llarp::util::Scheduler - llarp::thread::TimerQueue - llarp::util::Stopwatch
2020-02-21 17:21:11 +00:00
Lock_t lock(m_AuthedLinksMutex);
2019-08-23 11:32:52 +00:00
auto range = m_AuthedLinks.equal_range(itr->second);
session = range.first->second;
}
if(session)
{
bool success = session->Recv_LL(std::move(pkt));
if(!success and isNewSession)
{
LogWarn(
"Brand new session failed; removing from pending sessions list");
m_Pending.erase(m_Pending.find(from));
}
2019-08-23 11:32:52 +00:00
}
}
bool
LinkLayer::MapAddr(const RouterID& r, ILinkSession* s)
{
if(!ILinkLayer::MapAddr(r, s))
return false;
m_AuthedAddrs.emplace(s->GetRemoteEndpoint(), r);
return true;
}
void
LinkLayer::UnmapAddr(const Addr& a)
{
m_AuthedAddrs.erase(a);
2019-03-29 12:19:59 +00:00
}
2019-04-02 09:03:53 +00:00
std::shared_ptr< ILinkSession >
2019-03-29 12:19:59 +00:00
LinkLayer::NewOutboundSession(const RouterContact& rc,
const AddressInfo& ai)
{
2019-08-22 20:53:27 +00:00
return std::make_shared< Session >(this, rc, ai);
2019-03-29 12:19:59 +00:00
}
} // namespace iwp
} // namespace llarp