aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2021-06-15 10:48:19 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2021-06-15 10:48:19 +0200
commita6e0b800dc0c3db0e71ed4be3102959e2ef12d8f (patch)
tree9f1fe0c9a60e90b508bebc0b41721acff66555b0
parent7c5f2676c228b7ad92916bfc6866a1c782284503 (diff)
downloaddabmod-a6e0b800dc0c3db0e71ed4be3102959e2ef12d8f.tar.gz
dabmod-a6e0b800dc0c3db0e71ed4be3102959e2ef12d8f.tar.bz2
dabmod-a6e0b800dc0c3db0e71ed4be3102959e2ef12d8f.zip
Common e8d7277, bf60e06: EDI PFT input CRC and ClockTAI string copy
-rw-r--r--lib/edi/PFT.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/edi/PFT.cpp b/lib/edi/PFT.cpp
index 25f2d1f..2877aa5 100644
--- a/lib/edi/PFT.cpp
+++ b/lib/edi/PFT.cpp
@@ -453,11 +453,11 @@ std::vector<uint8_t> AFBuilder::extractAF()
}
// EDI specific, must have a CRC.
- if( _af_packet.size() >= 12 ) {
+ if (_af_packet.size() >= 12) {
ok = checkCRC(_af_packet.data(), _af_packet.size());
if (not ok) {
- etiLog.log(debug, "Too many errors to reconstruct AF from %zu/%u"
+ etiLog.log(debug, "CRC error after AF reconstruction from %zu/%u"
" PFT fragments\n", _fragments.size(), _Fcount);
}
}
@@ -570,7 +570,7 @@ afpacket_pft_t PFT::getNextAFPacket()
if (builder.canAttemptToDecode() == dar_t::yes) {
auto afpacket = builder.extractAF();
- assert(not afpacket.empty());
+ // Empty AF Packet can happen if CRC is wrong
if (m_verbose) {
etiLog.level(debug) << "Fragment origin stats: " << builder.visualise_fragment_origins();
}
@@ -588,7 +588,7 @@ afpacket_pft_t PFT::getNextAFPacket()
auto afpacket = builder.extractAF();
if (afpacket.empty()) {
- etiLog.log(debug,"pseq %d timed out after RS", m_next_pseq);
+ etiLog.log(debug, "pseq %d timed out after RS", m_next_pseq);
}
if (m_verbose) {
etiLog.level(debug) << "Fragment origin stats: " << builder.visualise_fragment_origins();