mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-17 15:25:35 +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>
215 lines
4.7 KiB
C++
215 lines
4.7 KiB
C++
#ifndef LLARP_BUFFER_HPP
|
|
#define LLARP_BUFFER_HPP
|
|
|
|
#include <util/common.hpp>
|
|
#include <util/mem.h>
|
|
#include <util/types.hpp>
|
|
|
|
#include <cassert>
|
|
#include <iterator>
|
|
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
#include <cstring>
|
|
#include <utility>
|
|
#include <algorithm>
|
|
|
|
/**
|
|
* buffer.h
|
|
*
|
|
* generic memory buffer
|
|
*/
|
|
|
|
/**
|
|
llarp_buffer_t represents a region of memory that is ONLY
|
|
valid in the current scope.
|
|
|
|
make sure to follow the rules:
|
|
|
|
ALWAYS copy the contents of the buffer if that data is to be used outside the
|
|
current scope.
|
|
|
|
ALWAYS pass a llarp_buffer_t * if you plan on modifying the data associated
|
|
with the buffer
|
|
|
|
ALWAYS pass a llarp_buffer_t * if you plan on advancing the stream position
|
|
|
|
ALWAYS pass a const llarp_buffer_t & if you are doing a read only operation
|
|
that does not modify the buffer
|
|
|
|
ALWAYS pass a const llarp_buffer_t & if you don't want to advance the stream
|
|
position
|
|
|
|
ALWAYS bail out of the current operation if you run out of space in a buffer
|
|
|
|
ALWAYS assume the pointers in the buffer are stack allocated memory
|
|
(yes even if you know they are not)
|
|
|
|
NEVER malloc() the pointers in the buffer when using it
|
|
|
|
NEVER realloc() the pointers in the buffer when using it
|
|
|
|
NEVER free() the pointers in the buffer when using it
|
|
|
|
NEVER use llarp_buffer_t ** (double pointers)
|
|
|
|
NEVER use llarp_buffer_t ** (double pointers)
|
|
|
|
ABSOLUTELY NEVER USE DOUBLE POINTERS.
|
|
|
|
*/
|
|
|
|
struct ManagedBuffer;
|
|
|
|
struct llarp_buffer_t
|
|
{
|
|
/// starting memory address
|
|
byte_t* base{nullptr};
|
|
/// memory address of stream position
|
|
byte_t* cur{nullptr};
|
|
/// max size of buffer
|
|
size_t sz{0};
|
|
|
|
byte_t operator[](size_t x)
|
|
{
|
|
return *(this->base + x);
|
|
}
|
|
|
|
llarp_buffer_t() = default;
|
|
|
|
llarp_buffer_t(byte_t* b, byte_t* c, size_t s) : base(b), cur(c), sz(s)
|
|
{}
|
|
|
|
llarp_buffer_t(const ManagedBuffer&) = delete;
|
|
llarp_buffer_t(ManagedBuffer&&) = delete;
|
|
|
|
template <typename T>
|
|
llarp_buffer_t(T* buf, size_t _sz) : base(reinterpret_cast<byte_t*>(buf)), cur(base), sz(_sz)
|
|
{}
|
|
|
|
template <typename T>
|
|
llarp_buffer_t(const T* buf, size_t _sz)
|
|
: base(reinterpret_cast<byte_t*>(const_cast<T*>(buf))), cur(base), sz(_sz)
|
|
{}
|
|
|
|
/** initialize llarp_buffer_t from container */
|
|
template <typename T>
|
|
llarp_buffer_t(T& t) : base(t.data()), cur(t.data()), sz(t.size())
|
|
{
|
|
// use data over the first element to "enforce" the container used has
|
|
// contiguous memory. (Note this isn't required by the standard, but a
|
|
// reasonable test on most standard library implementations).
|
|
}
|
|
|
|
template <typename T>
|
|
llarp_buffer_t(const T& t) : llarp_buffer_t(t.data(), t.size())
|
|
{}
|
|
|
|
// clang-format off
|
|
byte_t * begin() { return base; }
|
|
byte_t * begin() const { return base; }
|
|
byte_t * end() { return base + sz; }
|
|
byte_t * end() const { return base + sz; }
|
|
// clang-format on
|
|
|
|
size_t
|
|
size_left() const;
|
|
|
|
template <typename OutputIt>
|
|
bool
|
|
read_into(OutputIt begin, OutputIt end);
|
|
|
|
template <typename InputIt>
|
|
bool
|
|
write(InputIt begin, InputIt end);
|
|
|
|
#ifndef _WIN32
|
|
bool
|
|
writef(const char* fmt, ...) __attribute__((format(printf, 2, 3)));
|
|
|
|
#elif defined(__MINGW64__) || defined(__MINGW32__)
|
|
bool
|
|
writef(const char* fmt, ...) __attribute__((__format__(__MINGW_PRINTF_FORMAT, 2, 3)));
|
|
#else
|
|
bool
|
|
writef(const char* fmt, ...);
|
|
#endif
|
|
|
|
bool
|
|
put_uint16(uint16_t i);
|
|
bool
|
|
put_uint32(uint32_t i);
|
|
|
|
bool
|
|
put_uint64(uint64_t i);
|
|
|
|
bool
|
|
read_uint16(uint16_t& i);
|
|
bool
|
|
read_uint32(uint32_t& i);
|
|
|
|
bool
|
|
read_uint64(uint64_t& i);
|
|
|
|
size_t
|
|
read_until(char delim, byte_t* result, size_t resultlen);
|
|
|
|
private:
|
|
friend struct ManagedBuffer;
|
|
llarp_buffer_t(const llarp_buffer_t&) = default;
|
|
llarp_buffer_t(llarp_buffer_t&&) = default;
|
|
};
|
|
|
|
bool
|
|
operator==(const llarp_buffer_t& buff, const char* data);
|
|
|
|
template <typename OutputIt>
|
|
bool
|
|
llarp_buffer_t::read_into(OutputIt begin, OutputIt end)
|
|
{
|
|
auto dist = std::distance(begin, end);
|
|
if (static_cast<decltype(dist)>(size_left()) >= dist)
|
|
{
|
|
std::copy_n(cur, dist, begin);
|
|
cur += dist;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
template <typename InputIt>
|
|
bool
|
|
llarp_buffer_t::write(InputIt begin, InputIt end)
|
|
{
|
|
auto dist = std::distance(begin, end);
|
|
if (static_cast<decltype(dist)>(size_left()) >= dist)
|
|
{
|
|
cur = std::copy(begin, end, cur);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
Provide a copyable/moveable wrapper around `llarp_buffer_t`.
|
|
*/
|
|
struct ManagedBuffer
|
|
{
|
|
llarp_buffer_t underlying;
|
|
|
|
ManagedBuffer() = delete;
|
|
|
|
explicit ManagedBuffer(const llarp_buffer_t& b) : underlying(b)
|
|
{}
|
|
|
|
ManagedBuffer(ManagedBuffer&&) = default;
|
|
ManagedBuffer(const ManagedBuffer&) = default;
|
|
|
|
operator const llarp_buffer_t&() const
|
|
{
|
|
return underlying;
|
|
}
|
|
};
|
|
|
|
#endif
|