fix potential issue with full group affiliation update;

pull/51/head
Bryan Biedenkapp 2 years ago
parent 0f7eabff82
commit f5a5d83f4b

@ -503,8 +503,12 @@ void Slot::clock()
if (m_adjSiteUpdateTimer.isRunning() && m_adjSiteUpdateTimer.hasExpired()) {
if (m_rfState == RS_RF_LISTENING && m_netState == RS_NET_IDLE) {
m_control->writeAdjSSNetwork();
if (m_network != nullptr)
m_network->announceAffiliationUpdate(m_affiliations->grpAffTable());
if (m_network != nullptr) {
if (m_affiliations->grpAffSize() > 0) {
auto affs = m_affiliations->grpAffTable();
m_network->announceAffiliationUpdate(affs);
}
}
m_adjSiteUpdateTimer.start();
}
}

@ -567,8 +567,12 @@ void Control::clock(uint32_t ms)
m_adjSiteUpdate.clock(ms);
if (m_adjSiteUpdate.isRunning() && m_adjSiteUpdate.hasExpired()) {
if (m_rfState == RS_RF_LISTENING && m_netState == RS_NET_IDLE) {
if (m_network != nullptr)
m_network->announceAffiliationUpdate(m_affiliations.grpAffTable());
if (m_network != nullptr) {
if (m_affiliations.grpAffSize() > 0) {
auto affs = m_affiliations.grpAffTable();
m_network->announceAffiliationUpdate(affs);
}
}
m_adjSiteUpdate.start();
}
}

@ -821,8 +821,12 @@ void Control::clock(uint32_t ms)
if (m_adjSiteUpdate.isRunning() && m_adjSiteUpdate.hasExpired()) {
if (m_rfState == RS_RF_LISTENING && m_netState == RS_NET_IDLE) {
m_control->writeAdjSSNetwork();
if (m_network != nullptr)
m_network->announceAffiliationUpdate(m_affiliations.grpAffTable());
if (m_network != nullptr) {
if (m_affiliations.grpAffSize() > 0) {
auto affs = m_affiliations.grpAffTable();
m_network->announceAffiliationUpdate(affs);
}
}
m_adjSiteUpdate.start();
}
}

Loading…
Cancel
Save

Powered by TurnKey Linux.