Commit 3ff53b8d authored by Joaquin Muguerza's avatar Joaquin Muguerza

Fix bugs on BlockDvbSat when using regenerative and attenuation

Remove test on tal_id since GWs can use terminal id 0
handleCorrupted on BlockDvbSatRegen now deletes the frame and returns true
parent 5f048d1a
......@@ -559,21 +559,11 @@ bool SatGw::updateFmt(DvbFrame *dvb_frame,
{
Sac *sac = (Sac *)dvb_frame;
src_tal_id = sac->getTerminalId();
if(!src_tal_id)
{
LOG(this->log_receive, LEVEL_ERROR,
"unable to read source terminal ID in "
"frame, won't be able to update C/N "
"value\n");
}
else
{
cn = dvb_frame->getCn();
LOG(this->log_receive, LEVEL_INFO,
"Uplink CNI for terminal %u = %f\n",
src_tal_id, cn);
this->setRequiredCniInput(src_tal_id, cn);
}
cn = dvb_frame->getCn();
LOG(this->log_receive, LEVEL_INFO,
"Uplink CNI for terminal %u = %f\n",
src_tal_id, cn);
this->setRequiredCniInput(src_tal_id, cn);
break;
}
case MSG_TYPE_DVB_BURST:
......
......@@ -624,11 +624,12 @@ bool BlockDvbSatRegen::UpwardRegen::addSt(SatGw *current_gw,
return true;
}
bool BlockDvbSatRegen::UpwardRegen::handleCorrupted(DvbFrame *UNUSED(dvb_frame))
bool BlockDvbSatRegen::UpwardRegen::handleCorrupted(DvbFrame *dvb_frame)
{
// in regenerative case we need to handle the corrupted frame in order
// to get statistics
return false;
LOG(this->log_receive, LEVEL_INFO,
"frame was corrupted by physical layer, drop it.");
delete dvb_frame;
return true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment