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,129 @@
|
||||
#include "parser.hpp"
|
||||
#include "basic_header.hpp"
|
||||
#include "common_header.hpp"
|
||||
#include <vanetza/security/exception.hpp>
|
||||
#include <vanetza/security/secured_message.hpp>
|
||||
|
||||
namespace vanetza
|
||||
{
|
||||
namespace geonet
|
||||
{
|
||||
|
||||
Parser::Parser(ByteBuffer::const_iterator begin, ByteBuffer::const_iterator end) :
|
||||
m_byte_buffer_source(begin, end),
|
||||
m_stream(m_byte_buffer_source),
|
||||
m_archive(m_stream),
|
||||
m_read_bytes(0)
|
||||
{
|
||||
}
|
||||
|
||||
Parser::Parser(boost::iterator_range<ByteBuffer::const_iterator> range) :
|
||||
Parser(range.begin(), range.end())
|
||||
{
|
||||
}
|
||||
|
||||
std::size_t Parser::parse_basic(BasicHeader& basic)
|
||||
{
|
||||
std::size_t bytes = 0;
|
||||
try {
|
||||
deserialize(basic, m_archive);
|
||||
bytes = BasicHeader::length_bytes;
|
||||
} catch (InputArchive::Exception&) {
|
||||
}
|
||||
|
||||
m_read_bytes += bytes;
|
||||
return bytes;
|
||||
}
|
||||
|
||||
std::size_t Parser::parse_common(CommonHeader& common)
|
||||
{
|
||||
std::size_t bytes = 0;
|
||||
try {
|
||||
deserialize(common, m_archive);
|
||||
bytes = CommonHeader::length_bytes;
|
||||
} catch (InputArchive::Exception&) {
|
||||
}
|
||||
|
||||
m_read_bytes += bytes;
|
||||
return bytes;
|
||||
}
|
||||
|
||||
std::size_t Parser::parse_secured(security::SecuredMessage& secured)
|
||||
{
|
||||
std::size_t bytes = 0;
|
||||
if (m_archive.is_good()) {
|
||||
try {
|
||||
std::uint8_t sec_first_byte = m_archive.peek_byte();
|
||||
if (sec_first_byte < 3) {
|
||||
security::v2::SecuredMessage msg;
|
||||
bytes = security::v2::deserialize(m_archive, msg);
|
||||
secured = std::move(msg);
|
||||
} else if (sec_first_byte == 3) {
|
||||
security::v3::SecuredMessage msg;
|
||||
bytes = security::v3::deserialize(m_archive, msg);
|
||||
secured = std::move(msg);
|
||||
}
|
||||
} catch (...) {
|
||||
}
|
||||
m_read_bytes += bytes;
|
||||
}
|
||||
|
||||
return bytes;
|
||||
}
|
||||
|
||||
template<typename EXTENDED>
|
||||
std::size_t deserialize_extended(InputArchive& archive, HeaderVariant& extended)
|
||||
{
|
||||
EXTENDED header;
|
||||
deserialize(header, archive);
|
||||
extended = std::move(header);
|
||||
return EXTENDED::length_bytes;
|
||||
}
|
||||
|
||||
std::size_t Parser::parse_extended(HeaderVariant& extended, HeaderType ht)
|
||||
{
|
||||
std::size_t bytes = 0;
|
||||
|
||||
try {
|
||||
switch (ht) {
|
||||
case HeaderType::TSB_Single_Hop:
|
||||
bytes = deserialize_extended<ShbHeader>(m_archive, extended);
|
||||
break;
|
||||
case HeaderType::TSB_Multi_Hop:
|
||||
bytes = deserialize_extended<TsbHeader>(m_archive, extended);
|
||||
break;
|
||||
case HeaderType::GeoBroadcast_Circle:
|
||||
case HeaderType::GeoBroadcast_Rect:
|
||||
case HeaderType::GeoBroadcast_Elip:
|
||||
bytes = deserialize_extended<GeoBroadcastHeader>(m_archive, extended);
|
||||
break;
|
||||
case HeaderType::Beacon:
|
||||
bytes = deserialize_extended<BeaconHeader>(m_archive, extended);
|
||||
break;
|
||||
case HeaderType::Any:
|
||||
case HeaderType::GeoUnicast:
|
||||
case HeaderType::GeoAnycast_Circle:
|
||||
case HeaderType::GeoAnycast_Rect:
|
||||
case HeaderType::GeoAnycast_Elip:
|
||||
case HeaderType::LS_Request:
|
||||
case HeaderType::LS_Reply:
|
||||
// unimplemented types
|
||||
break;
|
||||
default:
|
||||
// invalid types
|
||||
break;
|
||||
}
|
||||
} catch (InputArchive::Exception&) {
|
||||
}
|
||||
|
||||
m_read_bytes += bytes;
|
||||
return bytes;
|
||||
}
|
||||
|
||||
std::size_t Parser::parsed_bytes() const
|
||||
{
|
||||
return m_read_bytes;
|
||||
}
|
||||
|
||||
} // namespace geonet
|
||||
} // namespace vanetza
|
||||
Reference in New Issue
Block a user