blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 08:20:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore empty messages for clutter filter bypass map and VCP data

Browse source
This commit is contained in:
Dan Paulat 2024-01-23 23:26:06 -06:00
parent 2fd7dca8a4
commit af1b42e7b0
2 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
wxdata/source/scwx/wsr88d/rda/clutter_filter_bypass_map.cpp
View file

@ -78,19 +78,22 @@ bool ClutterFilterBypassMap::Parse(std::istream& is)
if (p->mapGenerationDate_ < 1)
{
logger_->warn("Invalid date: {}", p->mapGenerationDate_);
logger_->trace("Ignoring empty message");
messageValid = false;
}
if (p->mapGenerationTime_ > 1440)
else
{
logger_->warn("Invalid time: {}", p->mapGenerationTime_);
messageValid = false;
}
if (numElevationSegments < 1 || numElevationSegments > 5)
{
logger_->warn("Invalid number of elevation segments: {}",
numElevationSegments);
messageValid = false;
if (p->mapGenerationTime_ > 1440)
{
logger_->warn("Invalid time: {}", p->mapGenerationTime_);
messageValid = false;
}
if (numElevationSegments < 1 || numElevationSegments > 5)
{
logger_->warn("Invalid number of elevation segments: {}",
numElevationSegments);
messageValid = false;
}
}
if (!messageValid)

22
wxdata/source/scwx/wsr88d/rda/volume_coverage_pattern_data.cpp
View file

@ -102,7 +102,7 @@ VolumeCoveragePatternData::VolumeCoveragePatternData() :
VolumeCoveragePatternData::~VolumeCoveragePatternData() = default;
VolumeCoveragePatternData::VolumeCoveragePatternData(
VolumeCoveragePatternData&&) noexcept = default;
VolumeCoveragePatternData&&) noexcept = default;
VolumeCoveragePatternData& VolumeCoveragePatternData::operator=(
VolumeCoveragePatternData&&) noexcept = default;
@ -419,16 +419,24 @@ bool VolumeCoveragePatternData::Parse(std::istream& is)
p->vcpSequencing_ = ntohs(p->vcpSequencing_);
p->vcpSupplementalData_ = ntohs(p->vcpSupplementalData_);
if (messageSize < 34 || messageSize > 747)
if (messageSize == 0)
{
logger_->warn("Invalid message size: {}", messageSize);
logger_->trace("Ignoring empty message");
messageValid = false;
}
if (numberOfElevationCuts < 1 || numberOfElevationCuts > 32)
else
{
logger_->warn("Invalid number of elevation cuts: {}",
numberOfElevationCuts);
messageValid = false;
if (messageSize < 34 || messageSize > 747)
{
logger_->warn("Invalid message size: {}", messageSize);
messageValid = false;
}
if (numberOfElevationCuts < 1 || numberOfElevationCuts > 32)
{
logger_->warn("Invalid number of elevation cuts: {}",
numberOfElevationCuts);
messageValid = false;
}
}
if (!messageValid)