mirror of
https://github.com/oxen-io/lokinet
synced 2023-12-14 06:53:00 +01:00
36792d4337
Lots and lots of places in the code had broken < operators because they
are returning something like:
foo < other.foo or bar < other.bar;
but this breaks both the strict weak ordering requirements that are
required for the "Compare" requirement for things like
std::map/set/priority_queue.
For example:
a = {.foo=1, .bar=3}
b = {.foo=3, .bar=1}
does not have an ordering over a and b (both `a < b` and `b < a` are
satisfied at the same time).
This needs to be instead something like:
foo < other.foo or (foo == other.foo and bar < other.bar)
but that's a bit clunkier, and it is easier to use std::tie for tuple's
built-in < comparison which does the right thing:
std::tie(foo, bar) < std::tie(other.foo, other.bar)
(Initially I noticed this in SockAddr/sockaddr_in6, but upon further
investigation this extends to the major of multi-field `operator<`'s.)
This fixes it by using std::tie (or something similar) everywhere we are
doing multi-field inequalities.
67 lines
1.4 KiB
C++
67 lines
1.4 KiB
C++
#pragma once
|
|
|
|
#include "ip_range.hpp"
|
|
#include "ip_packet.hpp"
|
|
#include "llarp/util/status.hpp"
|
|
|
|
#include <set>
|
|
|
|
namespace llarp::net
|
|
{
|
|
/// information about an IP protocol
|
|
struct ProtocolInfo
|
|
{
|
|
/// ip protocol byte of this protocol
|
|
IPProtocol protocol;
|
|
/// the layer 3 port if applicable
|
|
std::optional<nuint16_t> port;
|
|
|
|
bool
|
|
BEncode(llarp_buffer_t* buf) const;
|
|
|
|
bool
|
|
BDecode(llarp_buffer_t* buf);
|
|
|
|
util::StatusObject
|
|
ExtractStatus() const;
|
|
|
|
/// returns true if an ip packet looks like it matches this protocol info
|
|
/// returns false otherwise
|
|
bool
|
|
MatchesPacket(const IPPacket& pkt) const;
|
|
|
|
bool
|
|
operator<(const ProtocolInfo& other) const
|
|
{
|
|
return std::tie(protocol, port) < std::tie(other.protocol, other.port);
|
|
}
|
|
|
|
ProtocolInfo() = default;
|
|
|
|
explicit ProtocolInfo(std::string_view spec);
|
|
};
|
|
|
|
/// information about what traffic an endpoint will carry
|
|
struct TrafficPolicy
|
|
{
|
|
/// ranges that are explicitly allowed
|
|
std::set<IPRange> ranges;
|
|
|
|
/// protocols that are explicity allowed
|
|
std::set<ProtocolInfo> protocols;
|
|
|
|
bool
|
|
BEncode(llarp_buffer_t* buf) const;
|
|
|
|
bool
|
|
BDecode(llarp_buffer_t* buf);
|
|
util::StatusObject
|
|
ExtractStatus() const;
|
|
|
|
/// returns true if we allow the traffic in this ip packet
|
|
/// returns false otherwise
|
|
bool
|
|
AllowsTraffic(const IPPacket& pkt) const;
|
|
};
|
|
} // namespace llarp::net
|