Ref T730, style

This commit is contained in:
Klaus Basan
2019-10-05 01:38:55 +02:00
committed by Mat Sutcliffe
parent 027dc50b69
commit d1006160f8
2 changed files with 15 additions and 11 deletions

View File

@@ -24,7 +24,7 @@ namespace BlackCore
bool CClientConnectionData::isVoiceServerAlive() const
{
return m_lastVoiceServerHeartbeatAckUtc.secsTo(QDateTime::currentDateTimeUtc()) > serverTimeout;
return m_lastVoiceServerHeartbeatAckUtc.secsTo(QDateTime::currentDateTimeUtc()) > ServerTimeoutSecs;
}
void CClientConnectionData::createCryptoChannels()
@@ -39,8 +39,8 @@ namespace BlackCore
bool CClientConnectionData::voiceServerAlive() const
{
return timeSinceAuthentication() < serverTimeout ||
m_lastVoiceServerHeartbeatAckUtc.secsTo(QDateTime::currentDateTimeUtc()) < serverTimeout;
return timeSinceAuthentication() < ServerTimeoutSecs ||
m_lastVoiceServerHeartbeatAckUtc.secsTo(QDateTime::currentDateTimeUtc()) < ServerTimeoutSecs;
}
} // ns
} // ns

View File

@@ -29,12 +29,16 @@ namespace BlackCore
//! Client connection data
struct CClientConnectionData
{
//! Ctor
CClientConnectionData() = default;
//! Time since authentication
qint64 secondsSinceAuthentication() const;
//! Servers alive @{
bool isVoiceServerAlive() const;
bool isDataServerAlive() const;
//! @}
/* TODO
public long VoiceServerBytesSent { get; set; }
@@ -43,25 +47,25 @@ namespace BlackCore
public long DataServerBytesReceived { get; set; }
*/
//! Crypto channels for voice and data
void createCryptoChannels();
qint64 timeSinceAuthentication() const { return m_authenticatedDateTimeUtc.secsTo(QDateTime::currentDateTimeUtc()); }
bool voiceServerAlive() const;
QString m_userName;
QString m_callsign;
QString m_userName; //!< user name
QString m_callsign; //!< callsign
PostCallsignResponseDto m_tokens;
QScopedPointer<Crypto::CCryptoDtoChannel> voiceCryptoChannel;
PostCallsignResponseDto m_tokens; //!< tokens
QScopedPointer<Crypto::CCryptoDtoChannel> voiceCryptoChannel; //!< used crypto channel
QDateTime m_authenticatedDateTimeUtc;
QDateTime m_lastVoiceServerHeartbeatAckUtc;
bool m_receiveAudio = true;
bool m_connected = false;
bool m_receiveAudio = true; //!< audio?
bool m_connected = false; //!< connected?
static constexpr qint64 serverTimeout = 10;
static constexpr qint64 ServerTimeoutSecs = 10; //!< timeout
};
} // ns
} // ns