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>
147 lines
3.3 KiB
C++
147 lines
3.3 KiB
C++
#ifndef LLARP_EXIT_ENDPOINT_HPP
|
|
#define LLARP_EXIT_ENDPOINT_HPP
|
|
|
|
#include <crypto/types.hpp>
|
|
#include <net/ip_packet.hpp>
|
|
#include <path/path.hpp>
|
|
#include <util/time.hpp>
|
|
|
|
#include <queue>
|
|
|
|
namespace llarp
|
|
{
|
|
namespace handlers
|
|
{
|
|
// forward declare
|
|
struct ExitEndpoint;
|
|
} // namespace handlers
|
|
|
|
namespace exit
|
|
{
|
|
/// persistant exit state for 1 identity on the exit node
|
|
struct Endpoint
|
|
{
|
|
static constexpr size_t MaxUpstreamQueueSize = 256;
|
|
|
|
Endpoint(
|
|
const llarp::PubKey& remoteIdent,
|
|
const llarp::PathID_t& beginPath,
|
|
bool rewriteIP,
|
|
huint128_t ip,
|
|
llarp::handlers::ExitEndpoint* parent);
|
|
|
|
~Endpoint();
|
|
|
|
/// close ourselves
|
|
void
|
|
Close();
|
|
|
|
/// implement istateful
|
|
util::StatusObject
|
|
ExtractStatus() const;
|
|
|
|
/// return true if we are expired right now
|
|
bool
|
|
IsExpired(llarp_time_t now) const;
|
|
|
|
bool
|
|
ExpiresSoon(llarp_time_t now, llarp_time_t dlt = 5s) const;
|
|
|
|
/// return true if this endpoint looks dead right now
|
|
bool
|
|
LooksDead(llarp_time_t now, llarp_time_t timeout = 10s) const;
|
|
|
|
/// tick ourself, reset tx/rx rates
|
|
void
|
|
Tick(llarp_time_t now);
|
|
|
|
/// queue traffic from service node / internet to be transmitted
|
|
bool
|
|
QueueInboundTraffic(ManagedBuffer buff);
|
|
|
|
/// flush inbound and outbound traffic queues
|
|
bool
|
|
Flush();
|
|
|
|
/// queue outbound traffic
|
|
/// does ip rewrite here
|
|
bool
|
|
QueueOutboundTraffic(ManagedBuffer pkt, uint64_t counter);
|
|
|
|
/// update local path id and cascade information to parent
|
|
/// return true if success
|
|
bool
|
|
UpdateLocalPath(const llarp::PathID_t& nextPath);
|
|
|
|
llarp::path::HopHandler_ptr
|
|
GetCurrentPath() const;
|
|
|
|
const llarp::PubKey&
|
|
PubKey() const
|
|
{
|
|
return m_remoteSignKey;
|
|
}
|
|
|
|
const llarp::PathID_t&
|
|
LocalPath() const
|
|
{
|
|
return m_CurrentPath;
|
|
}
|
|
|
|
uint64_t
|
|
TxRate() const
|
|
{
|
|
return m_TxRate;
|
|
}
|
|
|
|
uint64_t
|
|
RxRate() const
|
|
{
|
|
return m_RxRate;
|
|
}
|
|
|
|
huint128_t
|
|
LocalIP() const
|
|
{
|
|
return m_IP;
|
|
}
|
|
|
|
const llarp_time_t createdAt;
|
|
|
|
private:
|
|
llarp::handlers::ExitEndpoint* m_Parent;
|
|
llarp::PubKey m_remoteSignKey;
|
|
llarp::PathID_t m_CurrentPath;
|
|
llarp::huint128_t m_IP;
|
|
uint64_t m_TxRate, m_RxRate;
|
|
llarp_time_t m_LastActive;
|
|
bool m_RewriteSource;
|
|
using InboundTrafficQueue_t = std::deque<llarp::routing::TransferTrafficMessage>;
|
|
using TieredQueue = std::map<uint8_t, InboundTrafficQueue_t>;
|
|
// maps number of fragments the message will fit in to the queue for it
|
|
TieredQueue m_DownstreamQueues;
|
|
|
|
struct UpstreamBuffer
|
|
{
|
|
UpstreamBuffer(const llarp::net::IPPacket& p, uint64_t c) : pkt(p), counter(c)
|
|
{}
|
|
|
|
llarp::net::IPPacket pkt;
|
|
uint64_t counter;
|
|
|
|
bool
|
|
operator<(const UpstreamBuffer& other) const
|
|
{
|
|
return counter < other.counter;
|
|
}
|
|
};
|
|
|
|
using UpstreamQueue_t = std::priority_queue<UpstreamBuffer>;
|
|
UpstreamQueue_t m_UpstreamQueue;
|
|
uint64_t m_Counter;
|
|
};
|
|
} // namespace exit
|
|
} // namespace llarp
|
|
|
|
#endif
|