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>
97 lines
2.3 KiB
C++
97 lines
2.3 KiB
C++
#include <router_version.hpp>
|
|
#include <constants/version.hpp>
|
|
#include <constants/proto.hpp>
|
|
|
|
#include <algorithm>
|
|
#include <cassert>
|
|
|
|
namespace llarp
|
|
{
|
|
RouterVersion::RouterVersion(const Version_t& router, uint64_t proto)
|
|
: m_Version(router), m_ProtoVersion(proto)
|
|
{}
|
|
|
|
bool
|
|
RouterVersion::IsCompatableWith(const RouterVersion& other) const
|
|
{
|
|
return m_ProtoVersion == other.m_ProtoVersion;
|
|
}
|
|
|
|
bool
|
|
RouterVersion::BEncode(llarp_buffer_t* buf) const
|
|
{
|
|
if (not bencode_start_list(buf))
|
|
return false;
|
|
if (not IsEmpty())
|
|
{
|
|
if (not bencode_write_uint64(buf, m_ProtoVersion))
|
|
return false;
|
|
for (const auto& i : m_Version)
|
|
{
|
|
if (not bencode_write_uint64(buf, i))
|
|
return false;
|
|
}
|
|
}
|
|
return bencode_end(buf);
|
|
}
|
|
|
|
void
|
|
RouterVersion::Clear()
|
|
{
|
|
m_Version.fill(0);
|
|
m_ProtoVersion = INVALID_VERSION;
|
|
assert(IsEmpty());
|
|
}
|
|
|
|
bool
|
|
RouterVersion::IsEmpty() const
|
|
{
|
|
return *this == emptyRouterVersion;
|
|
}
|
|
|
|
bool
|
|
RouterVersion::BDecode(llarp_buffer_t* buf)
|
|
{
|
|
// clear before hand
|
|
Clear();
|
|
size_t idx = 0;
|
|
if (not bencode_read_list(
|
|
[self = this, &idx](llarp_buffer_t* buffer, bool has) {
|
|
if (has)
|
|
{
|
|
uint64_t i;
|
|
if (idx == 0)
|
|
{
|
|
uint64_t val = -1;
|
|
if (not bencode_read_integer(buffer, &val))
|
|
return false;
|
|
self->m_ProtoVersion = val;
|
|
}
|
|
else if (bencode_read_integer(buffer, &i))
|
|
{
|
|
// prevent overflow (note that idx includes version too)
|
|
if (idx > self->m_Version.max_size())
|
|
return false;
|
|
self->m_Version[idx - 1] = i;
|
|
}
|
|
else
|
|
return false;
|
|
++idx;
|
|
}
|
|
return true;
|
|
},
|
|
buf))
|
|
return false;
|
|
// either full list or empty list is valid
|
|
return idx == 4 || idx == 0;
|
|
}
|
|
|
|
std::string
|
|
RouterVersion::ToString() const
|
|
{
|
|
return std::to_string(m_Version.at(0)) + "." + std::to_string(m_Version.at(1)) + "."
|
|
+ std::to_string(m_Version.at(2)) + " protocol version " + std::to_string(m_ProtoVersion);
|
|
}
|
|
|
|
} // namespace llarp
|