mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-10-31 09:20:21 +00: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.
128 lines
2.9 KiB
C++
128 lines
2.9 KiB
C++
#pragma once
|
|
#include <vector>
|
|
#include <llarp/constants/link_layer.hpp>
|
|
#include <llarp/link/session.hpp>
|
|
#include <llarp/util/aligned.hpp>
|
|
#include <llarp/util/buffer.hpp>
|
|
#include <llarp/util/types.hpp>
|
|
|
|
namespace llarp
|
|
{
|
|
namespace iwp
|
|
{
|
|
enum Command
|
|
{
|
|
/// keep alive message
|
|
ePING = 0,
|
|
/// begin transission
|
|
eXMIT = 1,
|
|
/// fragment data
|
|
eDATA = 2,
|
|
/// acknolege fragments
|
|
eACKS = 3,
|
|
/// negative ack
|
|
eNACK = 4,
|
|
/// multiack
|
|
eMACK = 5,
|
|
/// close session
|
|
eCLOS = 0xff,
|
|
};
|
|
|
|
/// max size of data fragments
|
|
static constexpr size_t FragmentSize = 1024;
|
|
/// plaintext header overhead size
|
|
static constexpr size_t CommandOverhead = 2;
|
|
|
|
struct OutboundMessage
|
|
{
|
|
OutboundMessage() = default;
|
|
OutboundMessage(
|
|
uint64_t msgid,
|
|
ILinkSession::Message_t data,
|
|
llarp_time_t now,
|
|
ILinkSession::CompletionHandler handler,
|
|
uint16_t priority);
|
|
|
|
ILinkSession::Message_t m_Data;
|
|
uint64_t m_MsgID = 0;
|
|
std::bitset<MAX_LINK_MSG_SIZE / FragmentSize> m_Acks;
|
|
ILinkSession::CompletionHandler m_Completed;
|
|
llarp_time_t m_LastFlush = 0s;
|
|
ShortHash m_Digest;
|
|
llarp_time_t m_StartedAt = 0s;
|
|
uint16_t m_ResendPriority;
|
|
|
|
bool
|
|
operator<(const OutboundMessage& other) const
|
|
{
|
|
// yes, the first order is reversed as higher means more important
|
|
// second part is for queue order
|
|
int prioA = -m_ResendPriority, prioB = -other.m_ResendPriority;
|
|
return std::tie(prioA, m_MsgID) < std::tie(prioB, other.m_MsgID);
|
|
}
|
|
|
|
ILinkSession::Packet_t
|
|
XMIT() const;
|
|
|
|
void
|
|
Ack(byte_t bitmask);
|
|
|
|
void
|
|
FlushUnAcked(std::function<void(ILinkSession::Packet_t)> sendpkt, llarp_time_t now);
|
|
|
|
bool
|
|
ShouldFlush(llarp_time_t now) const;
|
|
|
|
void
|
|
Completed();
|
|
|
|
bool
|
|
IsTransmitted() const;
|
|
|
|
bool
|
|
IsTimedOut(llarp_time_t now) const;
|
|
|
|
void
|
|
InformTimeout();
|
|
};
|
|
|
|
struct InboundMessage
|
|
{
|
|
InboundMessage() = default;
|
|
InboundMessage(uint64_t msgid, uint16_t sz, ShortHash h, llarp_time_t now);
|
|
|
|
ILinkSession::Message_t m_Data;
|
|
ShortHash m_Digset;
|
|
uint64_t m_MsgID = 0;
|
|
llarp_time_t m_LastACKSent = 0s;
|
|
llarp_time_t m_LastActiveAt = 0s;
|
|
std::bitset<MAX_LINK_MSG_SIZE / FragmentSize> m_Acks;
|
|
|
|
void
|
|
HandleData(uint16_t idx, const llarp_buffer_t& buf, llarp_time_t now);
|
|
|
|
bool
|
|
IsCompleted() const;
|
|
|
|
bool
|
|
IsTimedOut(llarp_time_t now) const;
|
|
|
|
bool
|
|
Verify() const;
|
|
|
|
byte_t
|
|
AcksBitmask() const;
|
|
|
|
bool
|
|
ShouldSendACKS(llarp_time_t now) const;
|
|
|
|
void
|
|
SendACKS(std::function<void(ILinkSession::Packet_t)> sendpkt, llarp_time_t now);
|
|
|
|
ILinkSession::Packet_t
|
|
ACKS() const;
|
|
};
|
|
|
|
} // namespace iwp
|
|
} // namespace llarp
|