projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ssl: Use QSslSocket directly to avoid redundant qobject_casts
[quassel.git]
/
src
/
core
/
core.cpp
diff --git
a/src/core/core.cpp
b/src/core/core.cpp
index
66e2e62
..
11563fd
100644
(file)
--- a/
src/core/core.cpp
+++ b/
src/core/core.cpp
@@
-572,17
+572,13
@@
bool Core::initAuthenticator(
bool Core::sslSupported()
{
bool Core::sslSupported()
{
- auto* sslServer = qobject_cast<SslServer*>(&instance()->_server);
- return sslServer && sslServer->isCertValid();
+ return instance()->_server.isCertValid() && instance()->_v6server.isCertValid();
}
bool Core::reloadCerts()
{
}
bool Core::reloadCerts()
{
- auto* sslServerv4 = qobject_cast<SslServer*>(&_server);
- bool retv4 = sslServerv4->reloadCerts();
-
- auto* sslServerv6 = qobject_cast<SslServer*>(&_v6server);
- bool retv6 = sslServerv6->reloadCerts();
+ bool retv4 = _server.reloadCerts();
+ bool retv6 = _v6server.reloadCerts();
return retv4 && retv6;
}
return retv4 && retv6;
}
@@
-707,10
+703,11
@@
void Core::stopListening(const QString& reason)
void Core::incomingConnection()
{
void Core::incomingConnection()
{
- auto* server = qobject_cast<
QTcp
Server*>(sender());
+ auto* server = qobject_cast<
Ssl
Server*>(sender());
Q_ASSERT(server);
while (server->hasPendingConnections()) {
Q_ASSERT(server);
while (server->hasPendingConnections()) {
- QTcpSocket* socket = server->nextPendingConnection();
+ auto socket = qobject_cast<QSslSocket*>(server->nextPendingConnection());
+ Q_ASSERT(socket);
auto* handler = new CoreAuthHandler(socket, this);
_connectingClients.insert(handler);
auto* handler = new CoreAuthHandler(socket, this);
_connectingClients.insert(handler);