projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake: avoid de-duplication of user's CXXFLAGS
[quassel.git]
/
src
/
core
/
core.cpp
diff --git
a/src/core/core.cpp
b/src/core/core.cpp
index
a2b7283
..
be2f33e
100644
(file)
--- a/
src/core/core.cpp
+++ b/
src/core/core.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-202
0
by the Quassel Project *
+ * Copyright (C) 2005-202
2
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-215,10
+215,8
@@
void Core::init()
if (Quassel::isOptionSet("metrics-daemon")) {
_metricsServer = new MetricsServer(this);
if (Quassel::isOptionSet("metrics-daemon")) {
_metricsServer = new MetricsServer(this);
-#ifdef HAVE_SSL
_server.setMetricsServer(_metricsServer);
_v6server.setMetricsServer(_metricsServer);
_server.setMetricsServer(_metricsServer);
_v6server.setMetricsServer(_metricsServer);
-#endif
}
Quassel::registerReloadHandler([]() {
}
Quassel::registerReloadHandler([]() {
@@
-574,28
+572,15
@@
bool Core::initAuthenticator(
bool Core::sslSupported()
{
bool Core::sslSupported()
{
-#ifdef HAVE_SSL
- auto* sslServer = qobject_cast<SslServer*>(&instance()->_server);
- return sslServer && sslServer->isCertValid();
-#else
- return false;
-#endif
+ return instance()->_server.isCertValid() && instance()->_v6server.isCertValid();
}
bool Core::reloadCerts()
{
}
bool Core::reloadCerts()
{
-#ifdef HAVE_SSL
- 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;
-#else
- // SSL not supported, don't mark configuration reload as failed
- return true;
-#endif
}
void Core::cacheSysIdent()
}
void Core::cacheSysIdent()
@@
-718,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);