/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2014 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#ifdef HAVE_SSL
# include <QSslSocket>
+#else
+# include <QTcpSocket>
#endif
#include "remotepeer.h"
using namespace Protocol;
-RemotePeer::RemotePeer(QTcpSocket *socket, QObject *parent)
- : Peer(parent),
+RemotePeer::RemotePeer(::AuthHandler *authHandler, QTcpSocket *socket, QObject *parent)
+ : Peer(authHandler, parent),
_socket(socket),
_signalProxy(0),
_heartBeatTimer(new QTimer(this)),
{
socket->setParent(this);
connect(socket, SIGNAL(disconnected()), SIGNAL(disconnected()));
- connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SIGNAL(error(QAbstractSocket::SocketError)));
+ connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(onSocketError(QAbstractSocket::SocketError)));
#ifdef HAVE_SSL
QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
}
+void RemotePeer::onSocketStateChanged(QAbstractSocket::SocketState state)
+{
+ if (state == QAbstractSocket::ClosingState) {
+ emit statusMessage(tr("Disconnecting..."));
+ }
+}
+
+
+void RemotePeer::onSocketError(QAbstractSocket::SocketError error)
+{
+ emit socketError(error, socket()->errorString());
+}
+
+
QString RemotePeer::description() const
{
if (socket())
void RemotePeer::handle(const HeartBeat &heartBeat)
{
- dispatch(HeartBeatReply(heartBeat.timestamp()));
+ dispatch(HeartBeatReply(heartBeat.timestamp));
}
void RemotePeer::handle(const HeartBeatReply &heartBeatReply)
{
_heartBeatCount = 0;
-#if QT_VERSION < 0x040700
- emit lagUpdated(heartBeatReply.timestamp().time().msecsTo(QTime::currentTime()) / 2);
+#if QT_VERSION >= 0x040900
+ emit lagUpdated(heartBeatReply.timestamp.msecsTo(QDateTime::currentDateTime().toUTC()) / 2);
#else
- emit lagUpdated(heartBeatReply.timestamp().msecsTo(QDateTime::currentDateTime()) / 2);
+ emit lagUpdated(heartBeatReply.timestamp.time().msecsTo(QDateTime::currentDateTime().toUTC().time()) / 2);
#endif
}
emit lagUpdated(_lag);
}
- dispatch(HeartBeat(QDateTime::currentDateTime()));
+ dispatch(HeartBeat(QDateTime::currentDateTime().toUTC()));
++_heartBeatCount;
}
-
-