mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-17 15:25:35 +00:00
b81f7025c9
Replaces custom logging system with spdlog-based oxen logging. This
commit mainly replaces the backend logging with the spdlog-based system,
but doesn't (yet) convert all the existing LogWarn, etc. to use the new
format-based logging.
New logging statements will look like:
llarp::log::warning(cat, "blah: {}", val);
where `cat` should be set up in each .cpp or cluster of .cpp files, as
described in the oxen-logging README.
As part of spdlog we get fmt, which gives us nice format strings, where
are applied generously in this commit.
Making types printable now requires two steps:
- add a ToString() method
- add this specialization:
template <>
constexpr inline bool llarp::IsToStringFormattable<llarp::Whatever> = true;
This will then allow the type to be printed as a "{}" value in a
fmt::format string. This is applied to all our printable types here,
and all of the `operator<<` are removed.
This commit also:
- replaces various uses of `operator<<` to ToString()
- replaces various uses of std::stringstream with either fmt::format or
plain std::string
- Rename some to_string and toString() methods to ToString() for
consistency (and to work with fmt)
- Replace `stringify(...)` and `make_exception` usage with fmt::format
(and remove stringify/make_exception from util/str.hpp).
73 lines
1.9 KiB
C++
73 lines
1.9 KiB
C++
#include "server.hpp"
|
|
#include <llarp/util/logging.hpp>
|
|
#include <llarp/util/logging/buffer.hpp>
|
|
|
|
#include <oxenc/variant.h>
|
|
#include <uvw/loop.h>
|
|
|
|
#include <stdexcept>
|
|
#include <tuple>
|
|
#include <variant>
|
|
|
|
namespace llarp::quic
|
|
{
|
|
std::shared_ptr<Connection>
|
|
Server::accept_initial_connection(const Packet& p)
|
|
{
|
|
LogDebug("Accepting new connection");
|
|
|
|
// This is a new incoming connection
|
|
ngtcp2_pkt_hd hd;
|
|
auto rv = ngtcp2_accept(&hd, u8data(p.data), p.data.size());
|
|
|
|
if (rv == -1)
|
|
{ // Invalid packet
|
|
LogWarn("Invalid packet received, length=", p.data.size());
|
|
LogTrace("packet body: ", buffer_printer{p.data});
|
|
return nullptr;
|
|
}
|
|
|
|
if (rv == 1)
|
|
{ // Invalid/unexpected version, send a version negotiation
|
|
LogDebug("Invalid/unsupported version; sending version negotiation");
|
|
send_version_negotiation(
|
|
version_info{hd.version, hd.dcid.data, hd.dcid.datalen, hd.scid.data, hd.scid.datalen},
|
|
p.path.remote);
|
|
return nullptr;
|
|
}
|
|
|
|
if (hd.type == NGTCP2_PKT_0RTT)
|
|
{
|
|
LogWarn("Received 0-RTT packet, which shouldn't happen in our implementation; dropping");
|
|
return nullptr;
|
|
}
|
|
|
|
if (hd.type == NGTCP2_PKT_INITIAL && hd.token.len)
|
|
{
|
|
// This is a normal QUIC thing, but we don't do it:
|
|
LogWarn("Unexpected token in initial packet");
|
|
}
|
|
|
|
// create and store Connection
|
|
for (;;)
|
|
{
|
|
if (auto [it, ins] = conns.emplace(ConnectionID::random(), primary_conn_ptr{}); ins)
|
|
{
|
|
auto connptr = std::make_shared<Connection>(*this, it->first, hd, p.path);
|
|
it->second = connptr;
|
|
return connptr;
|
|
}
|
|
}
|
|
}
|
|
|
|
size_t
|
|
Server::write_packet_header(nuint16_t pport, uint8_t ecn)
|
|
{
|
|
buf_[0] = SERVER_TO_CLIENT;
|
|
std::memcpy(&buf_[1], &pport.n, 2); // remote quic pseudo-port (network order u16)
|
|
buf_[3] = std::byte{ecn};
|
|
return 4;
|
|
}
|
|
|
|
} // namespace llarp::quic
|