#include "clientsyncer.h"
-#include <QNetworkProxy>
+#ifndef QT_NO_NETWORKPROXY
+# include <QNetworkProxy>
+#endif
#include "client.h"
#include "global.h"
#include "signalproxy.h"
-ClientSyncer::ClientSyncer(QObject *parent) : QObject(parent) {
+ClientSyncer::ClientSyncer(QObject *parent)
+ : QObject(parent)
+{
socket = 0;
blockSize = 0;
connect(Client::signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
-
}
ClientSyncer::~ClientSyncer() {
-
-
}
void ClientSyncer::coreHasData() {
#ifndef QT_NO_OPENSSL
QSslSocket *sock = new QSslSocket(Client::instance());
#else
+ if(conn["useSsl"].toBool()) {
+ emit connectionError(tr("<b>This client is built without SSL Support!</b><br />Disable the usage of SSL in the account settings."));
+ emit encrypted(false);
+ return;
+ }
QTcpSocket *sock = new QTcpSocket(Client::instance());
#endif
-
+#ifndef QT_NO_NETWORKPROXY
if(conn.contains("useProxy") && conn["useProxy"].toBool()) {
QNetworkProxy proxy((QNetworkProxy::ProxyType)conn["proxyType"].toInt(), conn["proxyHost"].toString(), conn["proxyPort"].toUInt(), conn["proxyUser"].toString(), conn["proxyPassword"].toString());
sock->setProxy(proxy);
}
+#endif
socket = sock;
connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
return;
}
emit connectionMsg(msg["CoreInfo"].toString());
+
+#ifndef QT_NO_OPENSSL
if(coreConnectionInfo["useSsl"].toBool()) {
if(msg["SupportSsl"].toBool()) {
QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
- if(sslSocket) {
- connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
- sslSocket->startClientEncryption();
- emit encrypted(true);
- } else {
- emit connectionError(tr("<b>This client is built without SSL Support!</b><br />Disable the usage of SSL in the account settings."));
- emit encrypted(false);
- disconnectFromCore();
- return;
- }
+ Q_ASSERT(sslSocket);
+ connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
+ sslSocket->startClientEncryption();
+ emit encrypted(true);
+ Client::instance()->setSecuredConnection();
} else {
emit connectionError(tr("<b>The Quassel Core you are trying to connect to does not support SSL!</b><br />If you want to connect anyways, disable the usage of SSL in the account settings."));
emit encrypted(false);
return;
}
}
+#endif
if(!msg["Configured"].toBool()) {
// start wizard
}
}
+#ifndef QT_NO_OPENSSL
void ClientSyncer::sslErrors(const QList<QSslError> &errors) {
qDebug() << "SSL Errors:";
foreach(QSslError err, errors)
if(socket)
socket->ignoreSslErrors();
}
+#endif