don't register a CC with itself; be more clear in the config YAML that the controlChannel block should be left at defaults for dedicated control channels;

pull/59/head
Bryan Biedenkapp 2 years ago
parent c249ee5803
commit e4aca9fc4f

@ -360,6 +360,7 @@ system:
# Control Channel
# Note: These parameters are used by a voice channel to communicate back to a
# control channel to give the control channel "real time" traffic channel updates.
# These parameters should be left default for dedicated control channels.
#
controlCh:
# REST API IP Address for control channel. (If blank, notifications are disabled.)

@ -921,7 +921,8 @@ int Host::run()
presenceNotifyTimer.clock(ms);
// VC -> CC presence registration
if (!m_controlChData.address().empty() && m_controlChData.port() != 0 && m_network != nullptr && m_RESTAPI != nullptr) {
if (!m_controlChData.address().empty() && m_controlChData.port() != 0 && m_network != nullptr && m_RESTAPI != nullptr &&
!m_dmrCtrlChannel && !m_p25CtrlChannel && !m_nxdnCtrlChannel) {
if ((presenceNotifyTimer.isRunning() && presenceNotifyTimer.hasExpired()) || !hasInitialRegistered) {
LogMessage(LOG_HOST, "CC %s:%u, notifying CC of VC registration, peerId = %u", m_controlChData.address().c_str(), m_controlChData.port(), m_network->getPeerId());
hasInitialRegistered = true;

Loading…
Cancel
Save

Powered by TurnKey Linux.