Keep vanetza-idf in obu-firmware, so a plain clone builds the firmware
obu-firmware builds against the vanetza-idf C-ITS library, which until now came from the colleague's microbu-esp32c5 tree beside the repository and was not tracked here, so a clone of this repository could not build the firmware it ships. The library alone is now part of obu-firmware, as obu-firmware/external/vanetza-idf: their external/vanetza-idf at commit cf4b99f, unchanged (9775 files; see its PROVENANCE.md). CMake takes it from there by default; -DVANETZA_IDF_DIR still points the build elsewhere. The rest of the colleague's tree (their own VAM firmware, PKI tooling, station-link Python tools, the V2X2MAP bridge) stays out of this repository and gitignored; nothing is pushed to their repository. NOTES.md, docs/06, TODO.md and the pcap verifier's usage line point at the new location.
This commit is contained in:
@@ -0,0 +1,134 @@
|
||||
#ifndef PACKET_BUFFER_HPP_U97KIBQC
|
||||
#define PACKET_BUFFER_HPP_U97KIBQC
|
||||
|
||||
#include <vanetza/common/clock.hpp>
|
||||
#include <vanetza/geonet/packet.hpp>
|
||||
#include <vanetza/geonet/pdu.hpp>
|
||||
#include <vanetza/geonet/timestamp.hpp>
|
||||
#include <vanetza/net/mac_address.hpp>
|
||||
#include <functional>
|
||||
#include <list>
|
||||
#include <memory>
|
||||
|
||||
namespace vanetza
|
||||
{
|
||||
namespace geonet
|
||||
{
|
||||
namespace packet_buffer
|
||||
{
|
||||
|
||||
class Expiry
|
||||
{
|
||||
public:
|
||||
Expiry(Clock::time_point now, Clock::duration lifetime);
|
||||
bool is_expired(Clock::time_point now) const;
|
||||
Clock::time_point buffered_since() const { return m_buffered_since; }
|
||||
Clock::time_point expires_at() const { return m_expires_at; }
|
||||
|
||||
private:
|
||||
Clock::time_point m_buffered_since;
|
||||
Clock::time_point m_expires_at;
|
||||
};
|
||||
|
||||
class Data
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* Length of packet data
|
||||
* \return length in bytes
|
||||
*/
|
||||
virtual std::size_t length() const = 0;
|
||||
|
||||
/**
|
||||
* Reduce lifetime associated with data
|
||||
* \param d reduce lifetime by given duration
|
||||
* \return remaining lifetime (never negative)
|
||||
*/
|
||||
virtual Clock::duration reduce_lifetime(Clock::duration d) = 0;
|
||||
|
||||
/**
|
||||
* Flush data
|
||||
* \note length() and lifetime() should not be called afterwards!
|
||||
*/
|
||||
virtual void flush() = 0;
|
||||
|
||||
virtual ~Data() {}
|
||||
};
|
||||
|
||||
} // namespace packet_buffer
|
||||
|
||||
|
||||
/**
|
||||
* PacketBuffer with bounded capacity, packet expiry and head-drop
|
||||
*/
|
||||
class PacketBuffer
|
||||
{
|
||||
public:
|
||||
typedef std::unique_ptr<packet_buffer::Data> data_ptr;
|
||||
|
||||
/**
|
||||
* Create PacketBuffer with given capacity
|
||||
* \param capacity Buffer can store this many bytes
|
||||
*/
|
||||
PacketBuffer(std::size_t capacity);
|
||||
|
||||
/**
|
||||
* Push one packet into buffer
|
||||
* \param packet Packet data
|
||||
* \param t Current time
|
||||
* \return true if packet has been pushed successfully
|
||||
*/
|
||||
bool push(data_ptr packet, Clock::time_point t);
|
||||
|
||||
/**
|
||||
* Flush packets from buffer. Expired packets are dropped.
|
||||
* \note Some packets might remain in buffer (re-added during flushing)
|
||||
* \param t Current time
|
||||
*/
|
||||
void flush(Clock::time_point t);
|
||||
|
||||
private:
|
||||
typedef packet_buffer::Expiry expiry_type;
|
||||
typedef std::tuple<expiry_type, data_ptr> node_type;
|
||||
|
||||
std::size_t free() const { return m_capacity - m_stored; }
|
||||
std::size_t capacity() const { return m_capacity; }
|
||||
|
||||
/**
|
||||
* Push one new element into buffer list
|
||||
* \note capacity is not checked by this method, has to be done manually
|
||||
* \param expiry Expiry data
|
||||
* \param packet Packet data
|
||||
*/
|
||||
void push(expiry_type&& expiry, data_ptr packet);
|
||||
|
||||
/**
|
||||
* Drop current head element
|
||||
* \return true if head element was dropped
|
||||
*/
|
||||
bool drop_head();
|
||||
|
||||
/**
|
||||
* Drop all packets with expired timestamp
|
||||
* \param t current time
|
||||
*/
|
||||
void drop_expired(Clock::time_point t);
|
||||
|
||||
/**
|
||||
* Drop as many packets as required to store given number of bytes.
|
||||
* Packets at the head of the list are dropped first.
|
||||
* \param bytes require #bytes free capacity
|
||||
* \return true if there is enough capacity left for #bytes
|
||||
*/
|
||||
bool drop(std::size_t bytes);
|
||||
|
||||
std::list<node_type> m_nodes;
|
||||
std::size_t m_capacity;
|
||||
std::size_t m_stored;
|
||||
};
|
||||
|
||||
} // namespace geonet
|
||||
} // namespace vanetza
|
||||
|
||||
#endif /* PACKET_BUFFER_HPP_U97KIBQC */
|
||||
|
||||
Reference in New Issue
Block a user