2021-03-09 22:24:35 +00:00
|
|
|
#pragma once
|
2018-12-12 00:33:54 +00:00
|
|
|
|
2021-03-02 02:06:20 +00:00
|
|
|
#include <type_traits>
|
2021-03-09 22:24:35 +00:00
|
|
|
#include "common.hpp"
|
|
|
|
#include "mem.h"
|
|
|
|
#include "types.hpp"
|
2018-12-12 00:33:54 +00:00
|
|
|
|
2019-02-02 23:12:42 +00:00
|
|
|
#include <cassert>
|
2019-02-17 12:13:34 +00:00
|
|
|
#include <iterator>
|
2019-07-30 23:42:13 +00:00
|
|
|
|
|
|
|
#include <cstdio>
|
|
|
|
#include <cstdlib>
|
|
|
|
#include <cstring>
|
2019-02-02 23:12:42 +00:00
|
|
|
#include <utility>
|
2019-03-07 15:17:29 +00:00
|
|
|
#include <algorithm>
|
2021-03-02 02:06:20 +00:00
|
|
|
#include <memory>
|
2021-04-05 20:11:00 +00:00
|
|
|
#include <vector>
|
2022-07-28 16:07:38 +00:00
|
|
|
#include <string_view>
|
2019-02-02 23:12:42 +00:00
|
|
|
|
2022-07-28 16:07:38 +00:00
|
|
|
namespace llarp
|
|
|
|
{
|
|
|
|
using byte_view_t = std::basic_string_view<byte_t>;
|
|
|
|
}
|
2019-02-02 23:12:42 +00:00
|
|
|
|
2022-09-09 19:09:28 +00:00
|
|
|
struct ManagedBuffer;
|
|
|
|
|
2022-07-28 16:07:38 +00:00
|
|
|
/// TODO: replace usage of these with std::span (via a backport until we move to C++20). That's a
|
|
|
|
/// fairly big job, though, as llarp_buffer_t is currently used a bit differently (i.e. maintains
|
|
|
|
/// both start and current position, plus has some value reading/writing methods).
|
|
|
|
struct [[deprecated("this type is stupid, use something else")]] llarp_buffer_t
|
2018-12-12 00:33:54 +00:00
|
|
|
{
|
2019-02-02 23:12:42 +00:00
|
|
|
/// starting memory address
|
2020-04-07 18:38:56 +00:00
|
|
|
byte_t* base{nullptr};
|
2019-02-02 23:12:42 +00:00
|
|
|
/// memory address of stream position
|
2020-04-07 18:38:56 +00:00
|
|
|
byte_t* cur{nullptr};
|
2019-02-02 23:12:42 +00:00
|
|
|
/// max size of buffer
|
2019-07-30 23:42:13 +00:00
|
|
|
size_t sz{0};
|
2019-02-02 23:12:42 +00:00
|
|
|
|
2022-07-28 16:07:38 +00:00
|
|
|
byte_t operator[](size_t x)
|
2019-02-02 23:12:42 +00:00
|
|
|
{
|
|
|
|
return *(this->base + x);
|
|
|
|
}
|
|
|
|
|
2019-07-30 23:42:13 +00:00
|
|
|
llarp_buffer_t() = default;
|
2019-02-02 23:12:42 +00:00
|
|
|
|
2022-07-28 16:07:38 +00:00
|
|
|
llarp_buffer_t(byte_t * b, byte_t * c, size_t s) : base(b), cur(c), sz(s)
|
Config file improvements (#1397)
* 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>
2020-10-07 22:22:58 +00:00
|
|
|
{}
|
2019-02-02 23:12:42 +00:00
|
|
|
|
2022-09-09 19:09:28 +00:00
|
|
|
llarp_buffer_t(const ManagedBuffer&) = delete;
|
|
|
|
llarp_buffer_t(ManagedBuffer &&) = delete;
|
|
|
|
|
|
|
|
template <typename Byte>
|
|
|
|
static constexpr bool is_basic_byte = sizeof(Byte) == 1 and std::is_trivially_copyable_v<Byte>;
|
|
|
|
|
2021-03-02 02:06:20 +00:00
|
|
|
/// Construct referencing some 1-byte, trivially copyable (e.g. char, unsigned char, byte_t)
|
|
|
|
/// pointer type and a buffer size.
|
|
|
|
template <
|
2022-09-09 19:09:28 +00:00
|
|
|
typename Byte,
|
|
|
|
typename = std::enable_if_t<not std::is_const_v<Byte> && is_basic_byte<Byte>>>
|
|
|
|
llarp_buffer_t(Byte * buf, size_t sz) : base{reinterpret_cast<byte_t*>(buf)}, cur{base}, sz{sz}
|
|
|
|
{}
|
|
|
|
|
|
|
|
/// initialize llarp_buffer_t from vector or array of byte-like values
|
|
|
|
template <
|
|
|
|
typename Byte,
|
|
|
|
typename = std::enable_if_t<not std::is_const_v<Byte> && is_basic_byte<Byte>>>
|
|
|
|
llarp_buffer_t(std::vector<Byte> & b) : llarp_buffer_t{b.data(), b.size()}
|
Config file improvements (#1397)
* 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>
2020-10-07 22:22:58 +00:00
|
|
|
{}
|
2018-12-12 00:33:54 +00:00
|
|
|
|
2022-09-09 19:09:28 +00:00
|
|
|
template <
|
|
|
|
typename Byte,
|
|
|
|
size_t N,
|
|
|
|
typename = std::enable_if_t<not std::is_const_v<Byte> && is_basic_byte<Byte>>>
|
|
|
|
llarp_buffer_t(std::array<Byte, N> & b) : llarp_buffer_t{b.data(), b.size()}
|
|
|
|
{}
|
|
|
|
|
|
|
|
// These overloads, const_casting away the const, are not just gross but downright dangerous:
|
|
|
|
template <typename Byte, typename = std::enable_if_t<is_basic_byte<Byte>>>
|
|
|
|
[[deprecated("dangerous constructor that casts away constness, be very careful")]] llarp_buffer_t(
|
|
|
|
const Byte* buf, size_t sz)
|
|
|
|
: llarp_buffer_t{const_cast<Byte*>(buf), sz}
|
|
|
|
{}
|
|
|
|
|
|
|
|
template <typename Byte, typename = std::enable_if_t<is_basic_byte<Byte>>>
|
|
|
|
[[deprecated("dangerous constructor that casts away constness, be very careful")]] llarp_buffer_t(
|
|
|
|
const std::vector<Byte>& b)
|
|
|
|
: llarp_buffer_t{const_cast<Byte*>(b.data()), b.size()}
|
|
|
|
{}
|
|
|
|
|
|
|
|
template <typename Byte, size_t N, typename = std::enable_if_t<is_basic_byte<Byte>>>
|
|
|
|
[[deprecated("dangerous constructor that casts away constness, be very careful")]] llarp_buffer_t(
|
|
|
|
const std::array<Byte, N>& b)
|
|
|
|
: llarp_buffer_t{const_cast<Byte*>(b.data()), b.size()}
|
|
|
|
{}
|
|
|
|
|
|
|
|
/// Explicitly construct a llarp_buffer_t from anything with a `.data()` and a `.size()`. Cursed.
|
2021-03-02 02:06:20 +00:00
|
|
|
template <
|
|
|
|
typename T,
|
|
|
|
typename = std::void_t<decltype(std::declval<T>().data() + std::declval<T>().size())>>
|
2022-09-09 19:09:28 +00:00
|
|
|
explicit llarp_buffer_t(T && t) : llarp_buffer_t{t.data(), t.size()}
|
Config file improvements (#1397)
* 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>
2020-10-07 22:22:58 +00:00
|
|
|
{}
|
2018-12-12 00:33:54 +00:00
|
|
|
|
2022-07-28 16:07:38 +00:00
|
|
|
byte_t* begin()
|
2018-12-12 00:33:54 +00:00
|
|
|
{
|
2021-03-02 02:06:20 +00:00
|
|
|
return base;
|
|
|
|
}
|
2022-09-09 19:09:28 +00:00
|
|
|
const byte_t* begin() const
|
2021-03-02 02:06:20 +00:00
|
|
|
{
|
|
|
|
return base;
|
|
|
|
}
|
2022-07-28 16:07:38 +00:00
|
|
|
byte_t* end()
|
2021-03-02 02:06:20 +00:00
|
|
|
{
|
|
|
|
return base + sz;
|
|
|
|
}
|
2022-09-09 19:09:28 +00:00
|
|
|
const byte_t* end() const
|
2021-03-02 02:06:20 +00:00
|
|
|
{
|
|
|
|
return base + sz;
|
2018-12-12 00:33:54 +00:00
|
|
|
}
|
2019-05-28 00:19:25 +00:00
|
|
|
|
2022-09-09 21:48:38 +00:00
|
|
|
size_t size_left() const
|
|
|
|
{
|
|
|
|
size_t diff = cur - base;
|
|
|
|
assert(diff <= sz);
|
|
|
|
if (diff > sz)
|
|
|
|
return 0;
|
|
|
|
return sz - diff;
|
|
|
|
}
|
2019-02-17 12:13:34 +00:00
|
|
|
|
2020-04-07 18:38:56 +00:00
|
|
|
template <typename OutputIt>
|
2022-07-28 16:07:38 +00:00
|
|
|
bool read_into(OutputIt begin, OutputIt end);
|
2019-03-07 15:17:29 +00:00
|
|
|
|
2020-04-07 18:38:56 +00:00
|
|
|
template <typename InputIt>
|
2022-07-28 16:07:38 +00:00
|
|
|
bool write(InputIt begin, InputIt end);
|
2019-02-17 12:13:34 +00:00
|
|
|
|
2019-02-18 23:50:04 +00:00
|
|
|
#ifndef _WIN32
|
2022-07-28 16:07:38 +00:00
|
|
|
bool writef(const char* fmt, ...) __attribute__((format(printf, 2, 3)));
|
2019-04-22 12:25:25 +00:00
|
|
|
|
2019-04-19 18:24:33 +00:00
|
|
|
#elif defined(__MINGW64__) || defined(__MINGW32__)
|
2022-07-28 16:07:38 +00:00
|
|
|
bool writef(const char* fmt, ...) __attribute__((__format__(__MINGW_PRINTF_FORMAT, 2, 3)));
|
2019-04-19 18:24:33 +00:00
|
|
|
#else
|
2022-07-28 16:07:38 +00:00
|
|
|
bool writef(const char* fmt, ...);
|
2019-02-18 23:50:04 +00:00
|
|
|
#endif
|
2019-02-17 12:13:34 +00:00
|
|
|
|
2022-07-28 16:07:38 +00:00
|
|
|
bool put_uint16(uint16_t i);
|
|
|
|
bool put_uint32(uint32_t i);
|
2019-02-17 12:13:34 +00:00
|
|
|
|
2022-07-28 16:07:38 +00:00
|
|
|
bool put_uint64(uint64_t i);
|
2019-03-07 15:17:29 +00:00
|
|
|
|
2022-07-28 16:07:38 +00:00
|
|
|
bool read_uint16(uint16_t & i);
|
|
|
|
bool read_uint32(uint32_t & i);
|
2019-02-17 12:13:34 +00:00
|
|
|
|
2022-07-28 16:07:38 +00:00
|
|
|
bool read_uint64(uint64_t & i);
|
2019-03-07 15:17:29 +00:00
|
|
|
|
2022-07-28 16:07:38 +00:00
|
|
|
size_t read_until(char delim, byte_t* result, size_t resultlen);
|
2019-02-17 12:13:34 +00:00
|
|
|
|
2021-04-07 10:51:44 +00:00
|
|
|
/// make a copy of this buffer
|
2022-07-28 16:07:38 +00:00
|
|
|
std::vector<byte_t> copy() const;
|
|
|
|
|
2022-09-09 21:48:38 +00:00
|
|
|
/// get a read-only view over the entire region
|
|
|
|
llarp::byte_view_t view_all() const
|
|
|
|
{
|
|
|
|
return {base, sz};
|
|
|
|
}
|
|
|
|
|
|
|
|
/// get a read-only view over the remaining/unused region
|
|
|
|
llarp::byte_view_t view_remaining() const
|
|
|
|
{
|
|
|
|
return {cur, size_left()};
|
|
|
|
}
|
2022-07-28 16:07:38 +00:00
|
|
|
|
2022-09-10 01:33:47 +00:00
|
|
|
/// Part of the curse. Returns true if the remaining buffer space starts with the given string
|
|
|
|
/// view.
|
2022-09-09 21:48:38 +00:00
|
|
|
bool startswith(std::string_view prefix_str) const
|
2022-07-28 16:07:38 +00:00
|
|
|
{
|
2022-09-10 01:33:47 +00:00
|
|
|
llarp::byte_view_t prefix{
|
|
|
|
reinterpret_cast<const byte_t*>(prefix_str.data()), prefix_str.size()};
|
2022-09-09 21:48:38 +00:00
|
|
|
return view_remaining().substr(0, prefix.size()) == prefix;
|
2022-07-28 16:07:38 +00:00
|
|
|
}
|
2021-04-07 10:51:44 +00:00
|
|
|
|
2019-02-02 23:12:42 +00:00
|
|
|
private:
|
2019-02-03 00:48:10 +00:00
|
|
|
friend struct ManagedBuffer;
|
2020-04-07 18:38:56 +00:00
|
|
|
llarp_buffer_t(const llarp_buffer_t&) = default;
|
2022-07-28 16:07:38 +00:00
|
|
|
llarp_buffer_t(llarp_buffer_t &&) = default;
|
2019-02-02 23:12:42 +00:00
|
|
|
};
|
|
|
|
|
2020-04-07 18:38:56 +00:00
|
|
|
template <typename OutputIt>
|
2019-03-07 15:17:29 +00:00
|
|
|
bool
|
|
|
|
llarp_buffer_t::read_into(OutputIt begin, OutputIt end)
|
|
|
|
{
|
|
|
|
auto dist = std::distance(begin, end);
|
2020-04-07 18:38:56 +00:00
|
|
|
if (static_cast<decltype(dist)>(size_left()) >= dist)
|
2019-03-07 15:17:29 +00:00
|
|
|
{
|
|
|
|
std::copy_n(cur, dist, begin);
|
|
|
|
cur += dist;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2020-04-07 18:38:56 +00:00
|
|
|
template <typename InputIt>
|
2019-02-17 12:13:34 +00:00
|
|
|
bool
|
|
|
|
llarp_buffer_t::write(InputIt begin, InputIt end)
|
|
|
|
{
|
|
|
|
auto dist = std::distance(begin, end);
|
2020-04-07 18:38:56 +00:00
|
|
|
if (static_cast<decltype(dist)>(size_left()) >= dist)
|
2019-02-17 12:13:34 +00:00
|
|
|
{
|
|
|
|
cur = std::copy(begin, end, cur);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2019-02-03 01:44:09 +00:00
|
|
|
/**
|
|
|
|
Provide a copyable/moveable wrapper around `llarp_buffer_t`.
|
|
|
|
*/
|
2022-07-28 16:07:38 +00:00
|
|
|
struct [[deprecated("deprecated along with llarp_buffer_t")]] ManagedBuffer
|
2019-02-02 23:12:42 +00:00
|
|
|
{
|
|
|
|
llarp_buffer_t underlying;
|
|
|
|
|
2019-02-03 01:44:09 +00:00
|
|
|
ManagedBuffer() = delete;
|
|
|
|
|
2020-04-07 18:38:56 +00:00
|
|
|
explicit ManagedBuffer(const llarp_buffer_t& b) : underlying(b)
|
Config file improvements (#1397)
* 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>
2020-10-07 22:22:58 +00:00
|
|
|
{}
|
2018-12-12 00:33:54 +00:00
|
|
|
|
2022-07-28 16:07:38 +00:00
|
|
|
ManagedBuffer(ManagedBuffer &&) = default;
|
2020-04-07 18:38:56 +00:00
|
|
|
ManagedBuffer(const ManagedBuffer&) = default;
|
2019-02-03 01:44:09 +00:00
|
|
|
|
2020-04-07 18:38:56 +00:00
|
|
|
operator const llarp_buffer_t&() const
|
2019-02-03 01:44:09 +00:00
|
|
|
{
|
|
|
|
return underlying;
|
|
|
|
}
|
2019-02-02 23:12:42 +00:00
|
|
|
};
|
|
|
|
|
2021-03-02 02:06:20 +00:00
|
|
|
namespace llarp
|
|
|
|
{
|
2022-07-28 16:07:38 +00:00
|
|
|
using byte_view_t = std::basic_string_view<byte_t>;
|
|
|
|
|
2021-03-02 02:06:20 +00:00
|
|
|
// Wrapper around a std::unique_ptr<byte_t[]> that owns its own memory and is also implicitly
|
|
|
|
// convertible to a llarp_buffer_t.
|
|
|
|
struct OwnedBuffer
|
|
|
|
{
|
|
|
|
std::unique_ptr<byte_t[]> buf;
|
|
|
|
size_t sz;
|
|
|
|
|
|
|
|
template <typename T, typename = std::enable_if_t<sizeof(T) == 1>>
|
|
|
|
OwnedBuffer(std::unique_ptr<T[]> buf, size_t sz)
|
|
|
|
: buf{reinterpret_cast<byte_t*>(buf.release())}, sz{sz}
|
|
|
|
{}
|
|
|
|
|
|
|
|
// Create a new, uninitialized owned buffer of the given size.
|
|
|
|
explicit OwnedBuffer(size_t sz) : OwnedBuffer{std::make_unique<byte_t[]>(sz), sz}
|
|
|
|
{}
|
|
|
|
|
2022-04-07 20:44:23 +00:00
|
|
|
// copy content from existing memory
|
|
|
|
explicit OwnedBuffer(const byte_t* ptr, size_t sz) : OwnedBuffer{sz}
|
|
|
|
{
|
|
|
|
std::copy_n(ptr, sz, buf.get());
|
|
|
|
}
|
|
|
|
|
2021-03-02 02:06:20 +00:00
|
|
|
OwnedBuffer(const OwnedBuffer&) = delete;
|
|
|
|
OwnedBuffer&
|
|
|
|
operator=(const OwnedBuffer&) = delete;
|
|
|
|
OwnedBuffer(OwnedBuffer&&) = default;
|
|
|
|
OwnedBuffer&
|
|
|
|
operator=(OwnedBuffer&&) = delete;
|
|
|
|
|
|
|
|
// Implicit conversion so that this OwnedBuffer can be passed to anything taking a
|
|
|
|
// llarp_buffer_t
|
|
|
|
operator llarp_buffer_t()
|
|
|
|
{
|
|
|
|
return {buf.get(), sz};
|
|
|
|
}
|
|
|
|
|
|
|
|
// Creates an owned buffer by copying from a llarp_buffer_t. (Can also be used to copy from
|
|
|
|
// another OwnedBuffer via the implicit conversion operator above).
|
|
|
|
static OwnedBuffer
|
|
|
|
copy_from(const llarp_buffer_t& b);
|
|
|
|
|
|
|
|
// Creates an owned buffer by copying the used portion of a llarp_buffer_t (i.e. from base to
|
|
|
|
// cur), for when a llarp_buffer_t is used in write mode.
|
|
|
|
static OwnedBuffer
|
|
|
|
copy_used(const llarp_buffer_t& b);
|
2022-04-07 20:44:23 +00:00
|
|
|
|
|
|
|
/// copy everything in this owned buffer into a vector
|
|
|
|
std::vector<byte_t>
|
|
|
|
copy() const;
|
2021-03-02 02:06:20 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace llarp
|