_lag(0)
{
socket->setParent(this);
- connect(socket, SIGNAL(disconnected()), SIGNAL(disconnected()));
- connect(socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), SIGNAL(socketStateChanged(QAbstractSocket::SocketState)));
+ connect(socket, SIGNAL(readyRead()), SLOT(onSocketDataAvailable()));
+ connect(socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), SLOT(onSocketStateChanged(QAbstractSocket::SocketState)));
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(onSocketError(QAbstractSocket::SocketError)));
+ connect(socket, SIGNAL(disconnected()), SIGNAL(disconnected()));
#ifdef HAVE_SSL
QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
#endif
connect(_heartBeatTimer, SIGNAL(timeout()), SLOT(sendHeartBeat()));
+
+ // It's possible that more data has already arrived during the handshake, so readyRead() wouldn't be triggered.
+ // However, we can't call a virtual function from the ctor, so let's do it asynchronously.
+ if (socket->bytesAvailable())
+ QTimer::singleShot(0, this, SLOT(onSocketDataAvailable()));
+}
+
+
+void RemotePeer::onSocketStateChanged(QAbstractSocket::SocketState state)
+{
+ if (state == QAbstractSocket::ClosingState) {
+ emit statusMessage(tr("Disconnecting..."));
+ }
}
void RemotePeer::handle(const HeartBeatReply &heartBeatReply)
{
_heartBeatCount = 0;
-#if QT_VERSION >= 0x040900
+#if QT_VERSION >= 0x040700
emit lagUpdated(heartBeatReply.timestamp.msecsTo(QDateTime::currentDateTime().toUTC()) / 2);
#else
emit lagUpdated(heartBeatReply.timestamp.time().msecsTo(QDateTime::currentDateTime().toUTC().time()) / 2);