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

use sslConfiguration on socket 

A public accessor and mutator was provided for using a QSslConfiguration
with a QAmqpClient, however the configuration was never actually assigned
to the internal socket. This patch fixes that, and removes the needless
storage of a copy of the QSslConfiguration as well
This commit is contained in:
Matt Broadstone 2015-02-09 21:30:23 -05:00
parent c4524b5204
commit 99b0d32f3f
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qamqpclient.cpp
View File

@ -789,17 +789,16 @@ QString QAmqpClient::errorString() const
QSslConfiguration QAmqpClient::sslConfiguration() const QSslConfiguration QAmqpClient::sslConfiguration() const
{ {
Q_D(const QAmqpClient); Q_D(const QAmqpClient);
return d->sslConfiguration; return d->socket->sslConfiguration();
} }
void QAmqpClient::setSslConfiguration(const QSslConfiguration &config) void QAmqpClient::setSslConfiguration(const QSslConfiguration &config)
{ {
Q_D(QAmqpClient); Q_D(QAmqpClient);
d->sslConfiguration = config;
if (!config.isNull()) { if (!config.isNull()) {
d->useSsl = true; d->useSsl = true;
d->port = AMQP_SSL_PORT; d->port = AMQP_SSL_PORT;
d->socket->setSslConfiguration(config);
} }
} }

3
src/qamqpclient_p.h
View File

@ -5,7 +5,6 @@
#include <QSharedPointer> #include <QSharedPointer>
#include <QPointer> #include <QPointer>
#include <QAbstractSocket> #include <QAbstractSocket>
#include <QSslConfiguration>
#include <QSslError> #include <QSslError>
#include "qamqpglobal.h" #include "qamqpglobal.h"
@ -101,8 +100,6 @@ public:
QAMQP::Error error; QAMQP::Error error;
QString errorString; QString errorString;
QSslConfiguration sslConfiguration;
QAmqpClient * const q_ptr; QAmqpClient * const q_ptr;
Q_DECLARE_PUBLIC(QAmqpClient) Q_DECLARE_PUBLIC(QAmqpClient)