jessequ
/
qamqp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove QAmqpSslClient 

Since you can provide amqps endpoints, it makes no sense to have a
separate class for SSL client support. This functionality will be
merged directly into QAmqpClient
This commit is contained in:
Matt Broadstone 2015-01-31 12:57:26 -05:00
parent 009c3131f5
commit e6b69010e4
2 changed files with 0 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/qamqpclient.cpp
View File

@ -803,60 +803,4 @@ void QAmqpClient::disconnectFromHost()
d->_q_disconnect(); d->_q_disconnect();
} }
//////////////////////////////////////////////////////////////////////////
#ifndef QT_NO_SSL
#include <QSslSocket>
QAmqpSslClientPrivate::QAmqpSslClientPrivate(QAmqpSslClient *q)
: QAmqpClientPrivate(q)
{
}
void QAmqpSslClientPrivate::initSocket()
{
Q_Q(QAmqpClient);
QSslSocket *sslSocket = new QSslSocket(q);
QObject::connect(sslSocket, SIGNAL(connected()), q, SLOT(_q_socketConnected()));
QObject::connect(sslSocket, SIGNAL(disconnected()), q, SLOT(_q_socketDisconnected()));
QObject::connect(sslSocket, SIGNAL(readyRead()), q, SLOT(_q_readyRead()));
QObject::connect(sslSocket, SIGNAL(error(QAbstractSocket::SocketError)),
q, SLOT(_q_socketError(QAbstractSocket::SocketError)));
QObject::connect(sslSocket, SIGNAL(sslErrors(QList<QSslError>)),
q, SLOT(_q_sslErrors(QList<QSslError>)));
socket = sslSocket;
}
void QAmqpSslClientPrivate::_q_connect()
{
if (socket->state() != QAbstractSocket::UnconnectedState) {
qAmqpDebug() << Q_FUNC_INFO << "socket already connected, disconnecting..";
_q_disconnect();
}
QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket);
if (!sslConfiguration.isNull())
sslSocket->setSslConfiguration(sslConfiguration);
sslSocket->connectToHostEncrypted(host, port);
}
void QAmqpSslClientPrivate::_q_sslErrors(const QList<QSslError> &errors)
{
// TODO: these need to be passed on to the user potentially, this is
// very unsafe
QSslSocket *sslSocket = qobject_cast<QSslSocket*>(socket);
sslSocket->ignoreSslErrors(errors);
}
QAmqpSslClient::QAmqpSslClient(QObject *parent)
: QAmqpClient(new QAmqpSslClientPrivate(this), parent)
{
}
QAmqpSslClient::~QAmqpSslClient()
{
}
#endif
#include "moc_qamqpclient.cpp" #include "moc_qamqpclient.cpp"

27
src/qamqpclient.h
View File

@ -5,11 +5,6 @@
#include <QUrl> #include <QUrl>
#include <QHostAddress> #include <QHostAddress>
#ifndef QT_NO_SSL
#include <QSslConfiguration>
#include <QSslError>
#endif
#include "qamqpglobal.h" #include "qamqpglobal.h"
class QAmqpExchange; class QAmqpExchange;
@ -111,26 +106,4 @@ private:
}; };
#ifndef QT_NO_SSL
class QAmqpSslClientPrivate;
class QAmqpSslClient : public QAmqpClient
{
Q_OBJECT
public:
QAmqpSslClient(QObject *parent = 0);
QAmqpSslClient(const QUrl &connectionString, QObject *parent = 0);
~QAmqpSslClient();
QSslConfiguration sslConfiguration() const;
void setSslConfiguration(const QSslConfiguration &config);
private:
Q_DISABLE_COPY(QAmqpSslClient)
Q_DECLARE_PRIVATE(QAmqpSslClient)
Q_PRIVATE_SLOT(d_func(), void _q_sslErrors(const QList<QSslError> &errors))
};
#endif
#endif // QAMQPCLIENT_H #endif // QAMQPCLIENT_H