Keep the colleague's microbu-esp32c5 tree in this repository
obu-firmware builds against vanetza-idf from microbu-esp32c5/external, but that tree was gitignored, so a clone of this repository could not build the firmware it ships. It is now committed here as ordinary files in its own folder, microbu-esp32c5/: the colleague's commit cf4b99f plus the V2X2MAP bridge's signature verification (--trust) used on the bench. Nothing is fetched from or pushed to the colleague's repository; this repository and its remotes carry everything. The folder's own .gitignore keeps build output, downloaded components and private key material out, as it did there; the committed file set is identical to that repository's tracked files. The ESP32-C5 is still flashed from obu-firmware/, which only takes vanetza-idf from microbu-esp32c5/, so the two stay separate folders. FLASHING.md says how to take a newer version of the colleague's tree (copy it over the folder, rebuild, test, commit).
This commit is contained in:
@@ -0,0 +1,190 @@
|
||||
#include "tcp_link.hpp"
|
||||
#include <vanetza/access/data_request.hpp>
|
||||
#include <vanetza/net/ethernet_header.hpp>
|
||||
#include <boost/asio/write.hpp>
|
||||
#include <boost/bind/bind.hpp>
|
||||
#include <boost/bind/placeholders.hpp>
|
||||
#include <iostream>
|
||||
#include <utility>
|
||||
|
||||
namespace ip = boost::asio::ip;
|
||||
using namespace vanetza;
|
||||
|
||||
TcpLink::TcpLink(boost::asio::io_context& io_context) :
|
||||
io_context_(&io_context)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void TcpLink::indicate(IndicationCallback cb)
|
||||
{
|
||||
callback_ = cb;
|
||||
for (auto& ep : waiting_endpoints_) {
|
||||
connect(ep);
|
||||
}
|
||||
}
|
||||
|
||||
void TcpLink::request(const access::DataRequest& request, std::unique_ptr<ChunkPacket> packet)
|
||||
{
|
||||
// create ethernet header
|
||||
vanetza::ByteBuffer eth = create_ethernet_header(request.destination_addr, request.source_addr, request.ether_type);
|
||||
packet->layer(OsiLayer::Link) = std::move(eth);
|
||||
|
||||
// insert packet size as frame delimiter
|
||||
uint16_t packet_size = packet->size(OsiLayer::Link, OsiLayer::Application);
|
||||
vanetza::ByteBuffer frame_delimiter { uint8_t(packet_size >> 8), uint8_t(packet_size) };
|
||||
packet->layer(OsiLayer::Physical) = std::move(frame_delimiter);
|
||||
|
||||
std::array<boost::asio::const_buffer, layers_> const_buffers;
|
||||
for (auto& layer : osi_layer_range<OsiLayer::Physical, OsiLayer::Application>()) {
|
||||
const auto index = distance(OsiLayer::Physical, layer);
|
||||
packet->layer(layer).convert(tx_buffers_[index]);
|
||||
const_buffers[index] = boost::asio::buffer(tx_buffers_[index]);
|
||||
}
|
||||
|
||||
for (auto it = sockets_.begin(); it != sockets_.end();) {
|
||||
if (it->status() == TcpSocket::CONNECTED) {
|
||||
it->request(const_buffers);
|
||||
++it;
|
||||
} else if (it->status() == TcpSocket::ERROR) {
|
||||
it = sockets_.erase(it);
|
||||
std::cerr << "Socket removed" << std::endl;
|
||||
} else {
|
||||
++it;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void TcpLink::connect(ip::tcp::endpoint ep)
|
||||
{
|
||||
if (callback_) {
|
||||
sockets_.emplace_back(*io_context_, &callback_);
|
||||
auto& sock = sockets_.back();
|
||||
sock.connect(ep);
|
||||
} else {
|
||||
waiting_endpoints_.push_back(ep);
|
||||
}
|
||||
}
|
||||
|
||||
void TcpLink::accept(ip::tcp::endpoint ep)
|
||||
{
|
||||
if (acceptors_.count(ep) == 0) {
|
||||
acceptors_.insert(std::make_pair(ep, ip::tcp::acceptor(*io_context_, ep)));
|
||||
}
|
||||
|
||||
sockets_.emplace_back(*io_context_, &callback_);
|
||||
auto& sock = sockets_.back();
|
||||
sock.status(TcpSocket::ACCEPTING);
|
||||
|
||||
boost::system::error_code ec;
|
||||
std::cout << "Accept connetions at " << ep.address().to_string() << ":" << ep.port() << std::endl;
|
||||
|
||||
acceptors_.find(ep)->second.async_accept(
|
||||
sock.socket(),
|
||||
boost::bind(
|
||||
&TcpLink::accept_handler,
|
||||
this,
|
||||
ec,
|
||||
ep,
|
||||
&sock
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
void TcpLink::accept_handler(boost::system::error_code& ec, ip::tcp::endpoint ep, TcpSocket* sock)
|
||||
{
|
||||
if (!ec) {
|
||||
sock->status(TcpSocket::CONNECTED);
|
||||
sock->do_receive();
|
||||
accept(ep);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* TcpSocket
|
||||
*/
|
||||
|
||||
TcpSocket::TcpSocket(boost::asio::io_context& io_context, IndicationCallback* cb) :
|
||||
socket_(io_context),
|
||||
rx_buffer_(2560, 0x00),
|
||||
callback_(cb)
|
||||
{
|
||||
}
|
||||
|
||||
void TcpSocket::connect(ip::tcp::endpoint ep)
|
||||
{
|
||||
boost::system::error_code ec;
|
||||
socket_.connect(ep, ec);
|
||||
if (!ec) {
|
||||
status_ = CONNECTED;
|
||||
do_receive();
|
||||
}
|
||||
}
|
||||
|
||||
void TcpSocket::request(std::array<boost::asio::const_buffer, layers_> const_buffers)
|
||||
{
|
||||
boost::system::error_code ec;
|
||||
boost::asio::write(socket_, const_buffers, ec);
|
||||
|
||||
if (ec) {
|
||||
status_ = ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
void TcpSocket::do_receive()
|
||||
{
|
||||
socket_.async_read_some(
|
||||
boost::asio::buffer(rx_buffer_),
|
||||
boost::bind(
|
||||
&TcpSocket::receive_handler,
|
||||
this,
|
||||
boost::placeholders::_1,
|
||||
boost::placeholders::_2
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
void TcpSocket::receive_handler(boost::system::error_code ec, std::size_t length) {
|
||||
if (!ec) {
|
||||
status_ = CONNECTED;
|
||||
rx_store_.insert(rx_store_.end(), rx_buffer_.begin(), rx_buffer_.begin() + length);
|
||||
|
||||
// While we have enough bytes stored to construct a packet, pass it up
|
||||
while (rx_store_.size() >= get_next_packet_size() + 2)
|
||||
{
|
||||
auto packet_length = get_next_packet_size() + 2;
|
||||
ByteBuffer packet_buffer(rx_store_.begin() + 2, rx_store_.begin() + packet_length);
|
||||
pass_up(std::move(packet_buffer));
|
||||
rx_store_.erase(rx_store_.begin(), rx_store_.begin() + packet_length);
|
||||
}
|
||||
|
||||
do_receive();
|
||||
} else {
|
||||
status_ = ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
void TcpSocket::pass_up(ByteBuffer&& packet_buffer)
|
||||
{
|
||||
CohesivePacket packet(std::move(packet_buffer), OsiLayer::Link);
|
||||
if (packet.size(OsiLayer::Link) < EthernetHeader::length_bytes) {
|
||||
std::cerr << "Dropped TCP packet too short to contain Ethernet header\n";
|
||||
} else {
|
||||
packet.set_boundary(OsiLayer::Link, EthernetHeader::length_bytes);
|
||||
auto link_range = packet[OsiLayer::Link];
|
||||
EthernetHeader eth = decode_ethernet_header(link_range.begin(), link_range.end());
|
||||
if (*callback_) {
|
||||
(*callback_)(std::move(packet), eth);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
std::size_t TcpSocket::get_next_packet_size()
|
||||
{
|
||||
if (rx_store_.size() >= 2) {
|
||||
return (rx_store_[0] << 8) + rx_store_[1];
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user