mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 04:00:34 +00:00
Code Issues Releases Wiki Activity

Fix defects detected by clang-tidy

Browse Source
This commit is contained in:
Carles Fernandez 2024-07-22 08:24:12 +02:00
parent 2378fb4fbc
commit c5c58c8d1d
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/libs/osnma_msg_receiver.cc
View File

@ -137,8 +137,10 @@ void osnma_msg_receiver::msg_handler_osnma(const pmt::pmt_t& msg)
d_satellite_nav_data[PRNa][TOW].utc_vector_2 = nav_data; d_satellite_nav_data[PRNa][TOW].utc_vector_2 = nav_data;
} }
else else
{
LOG(WARNING) << "Galileo OSNMA: osnma_msg_receiver incorrect navData parsing!"; LOG(WARNING) << "Galileo OSNMA: osnma_msg_receiver incorrect navData parsing!";
} }
}
else else
{ {
LOG(WARNING) << "Galileo OSNMA: osnma_msg_receiver received an unknown object type!"; LOG(WARNING) << "Galileo OSNMA: osnma_msg_receiver received an unknown object type!";
@ -276,7 +278,7 @@ void osnma_msg_receiver::read_dsm_block(const std::shared_ptr<OSNMA_msg>& osnma_
} }
else else
{ {
for (uint8_t k = 0; k < d_number_of_blocks[d_osnma_data.d_dsm_header.dsm_id]; k++) for (uint16_t k = 0; k < d_number_of_blocks[d_osnma_data.d_dsm_header.dsm_id]; k++)
{ {
if (d_dsm_id_received[d_osnma_data.d_dsm_header.dsm_id][k] == 0) if (d_dsm_id_received[d_osnma_data.d_dsm_header.dsm_id][k] == 0)
{ {
@ -926,10 +928,9 @@ void osnma_msg_receiver::process_mack_message()
d_tags_awaiting_verify.insert(std::pair<uint32_t, Tag>(mack->TOW, tag0)); d_tags_awaiting_verify.insert(std::pair<uint32_t, Tag>(mack->TOW, tag0));
// bool ret = verify_macseq(*mack); // bool ret = verify_macseq(*mack);
std::vector<MACK_tag_and_info> macseq_verified_tags = verify_macseq_new(*mack); std::vector<MACK_tag_and_info> macseq_verified_tags = verify_macseq_new(*mack);
for (std::size_t i = 0; i < macseq_verified_tags.size(); ++i) for (auto & tag_and_info : macseq_verified_tags)
{ {
// add tags of current mack to the verification queue // add tags of current mack to the verification queue
auto& tag_and_info = macseq_verified_tags[i];
Tag t(tag_and_info, mack->TOW, mack->WN, mack->PRNa, tag_and_info.counter); Tag t(tag_and_info, mack->TOW, mack->WN, mack->PRNa, tag_and_info.counter);
d_tags_awaiting_verify.insert(std::pair<uint32_t, Tag>(mack->TOW, t)); d_tags_awaiting_verify.insert(std::pair<uint32_t, Tag>(mack->TOW, t));
LOG(INFO) << "Galileo OSNMA: Add Tag Id= " LOG(INFO) << "Galileo OSNMA: Add Tag Id= "
@ -1080,7 +1081,8 @@ bool osnma_msg_receiver::verify_dsm_pkr(const DSM_PKR_message& message) const
std::vector<uint8_t> osnma_msg_receiver::compute_merkle_root(const DSM_PKR_message& dsm_pkr_message, const std::vector<uint8_t>& m_i) const std::vector<uint8_t> osnma_msg_receiver::compute_merkle_root(const DSM_PKR_message& dsm_pkr_message, const std::vector<uint8_t>& m_i) const
{ {
std::vector<uint8_t> x_next, x_current = d_crypto->compute_SHA_256(m_i); std::vector<uint8_t> x_next;
std::vector<uint8_t> x_current = d_crypto->compute_SHA_256(m_i);
for (size_t i = 0; i < 4; i++) for (size_t i = 0; i < 4; i++)
{ {
x_next.clear(); x_next.clear();
@ -1345,7 +1347,7 @@ bool osnma_msg_receiver::verify_tesla_key(std::vector<uint8_t>& key, uint32_t TO
// truncate hash // truncate hash
std::vector<uint8_t> computed_key; std::vector<uint8_t> computed_key;
computed_key.reserve(key.size()); computed_key.reserve(key.size());
for (uint16_t i = 0; i < key.size(); i++) for (size_t i = 0; i < key.size(); i++)
{ {
computed_key.push_back(hash[i]); computed_key.push_back(hash[i]);
} }
@ -1520,7 +1522,7 @@ bool osnma_msg_receiver::verify_macseq(const MACK_message& mack)
m[3] = static_cast<uint8_t>((d_GST_Sf & 0x0000FF00) >> 8); m[3] = static_cast<uint8_t>((d_GST_Sf & 0x0000FF00) >> 8);
m[4] = static_cast<uint8_t>(d_GST_Sf & 0x000000FF); m[4] = static_cast<uint8_t>(d_GST_Sf & 0x000000FF);
// Case tags flexible - Eq. 21 ICD // Case tags flexible - Eq. 21 ICD
for (uint8_t i = 0; i < flxTags.size(); i++) for (size_t i = 0; i < flxTags.size(); i++)
{ {
m[2 * i + 5] = mack.tag_and_info[flxTags[i]].tag_info.PRN_d; m[2 * i + 5] = mack.tag_and_info[flxTags[i]].tag_info.PRN_d;
m[2 * i + 6] = mack.tag_and_info[flxTags[i]].tag_info.ADKD << 4 | m[2 * i + 6] = mack.tag_and_info[flxTags[i]].tag_info.ADKD << 4 |
@ -1548,7 +1550,6 @@ bool osnma_msg_receiver::verify_macseq(const MACK_message& mack)
LOG(INFO) << "Galileo OSNMA: MACSEQ verification :: SUCCESS :: FLX tags verification OK"; LOG(INFO) << "Galileo OSNMA: MACSEQ verification :: SUCCESS :: FLX tags verification OK";
return true; return true;
} }
else else
{ {
LOG(WARNING) << "Galileo OSNMA: MACSEQ verification :: FAILURE :: FLX tags verification failed"; LOG(WARNING) << "Galileo OSNMA: MACSEQ verification :: FAILURE :: FLX tags verification failed";
@ -1616,7 +1617,7 @@ bool osnma_msg_receiver::tag_has_key_available(const Tag& t)
} }
std::vector<uint8_t> osnma_msg_receiver::hash_chain(uint32_t num_of_hashes_needed, std::vector<uint8_t> key, uint32_t GST_SFi, const uint8_t lk_bytes) std::vector<uint8_t> osnma_msg_receiver::hash_chain(uint32_t num_of_hashes_needed, const std::vector<uint8_t>& key, uint32_t GST_SFi, const uint8_t lk_bytes)
{ {
std::vector<uint8_t> K_II = key; std::vector<uint8_t> K_II = key;
std::vector<uint8_t> K_I; // result of the recursive hash operations std::vector<uint8_t> K_I; // result of the recursive hash operations
@ -1796,9 +1797,9 @@ std::vector<MACK_tag_and_info> osnma_msg_receiver::verify_macseq_new(const MACK_
if (computed_macseq == mack.header.macseq) if (computed_macseq == mack.header.macseq)
{ {
LOG(INFO) << "Galileo OSNMA: MACSEQ verification :: SUCCESS :: FLX tags verification OK"; LOG(INFO) << "Galileo OSNMA: MACSEQ verification :: SUCCESS :: FLX tags verification OK";
for (uint8_t i = 0; i < flxTags.size(); i++) for (uint8_t flxTag : flxTags)
{ {
verified_tags.push_back(mack.tag_and_info[flxTags[i]]); verified_tags.push_back(mack.tag_and_info[flxTag]);
} }
return verified_tags; return verified_tags;
} }

2
src/core/libs/osnma_msg_receiver.h
View File

@ -94,7 +94,7 @@ private:
std::vector<uint8_t> get_merkle_tree_leaves(const DSM_PKR_message& dsm_pkr_message) const; std::vector<uint8_t> get_merkle_tree_leaves(const DSM_PKR_message& dsm_pkr_message) const;
std::vector<uint8_t> compute_merkle_root(const DSM_PKR_message& dsm_pkr_message, const std::vector<uint8_t>& m_i) const; std::vector<uint8_t> compute_merkle_root(const DSM_PKR_message& dsm_pkr_message, const std::vector<uint8_t>& m_i) const;
std::vector<uint8_t> build_message(const Tag& tag); std::vector<uint8_t> build_message(const Tag& tag);
std::vector<uint8_t> hash_chain(uint32_t num_of_hashes_needed, std::vector<uint8_t> key, uint32_t GST_SFi, const uint8_t lk_bytes); std::vector<uint8_t> hash_chain(uint32_t num_of_hashes_needed, const std::vector<uint8_t>& key, uint32_t GST_SFi, const uint8_t lk_bytes);
std::vector<MACK_tag_and_info> verify_macseq_new(const MACK_message& mack); std::vector<MACK_tag_and_info> verify_macseq_new(const MACK_message& mack);
std::map<uint32_t, std::map<uint32_t, NavData>> d_satellite_nav_data; // map holding NavData sorted by SVID (first key) and TOW (second key). std::map<uint32_t, std::map<uint32_t, NavData>> d_satellite_nav_data; // map holding NavData sorted by SVID (first key) and TOW (second key).