projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
introducing query merging (per drag & drop). needs a core update
[quassel.git]
/
src
/
core
/
corenetwork.cpp
diff --git
a/src/core/corenetwork.cpp
b/src/core/corenetwork.cpp
index
b3cbfc0
..
0fd68b1
100644
(file)
--- a/
src/core/corenetwork.cpp
+++ b/
src/core/corenetwork.cpp
@@
-23,7
+23,7
@@
#include "core.h"
#include "coresession.h"
#include "core.h"
#include "coresession.h"
-#include "identity.h"
+#include "
core
identity.h"
#include "ircserverhandler.h"
#include "userinputhandler.h"
#include "ircserverhandler.h"
#include "userinputhandler.h"
@@
-133,7
+133,7
@@
void CoreNetwork::connectToIrc(bool reconnecting) {
qWarning() << "Server list empty, ignoring connect request!";
return;
}
qWarning() << "Server list empty, ignoring connect request!";
return;
}
- Identity *identity = identityPtr();
+
Core
Identity *identity = identityPtr();
if(!identity) {
qWarning() << "Invalid identity configures, ignoring connect request!";
return;
if(!identity) {
qWarning() << "Invalid identity configures, ignoring connect request!";
return;
@@
-163,10
+163,16
@@
void CoreNetwork::connectToIrc(bool reconnecting) {
#ifdef HAVE_SSL
socket.setProtocol((QSsl::SslProtocol)server.sslVersion);
#ifdef HAVE_SSL
socket.setProtocol((QSsl::SslProtocol)server.sslVersion);
- if(server.useSsl)
+ if(server.useSsl) {
+ CoreIdentity *identity = identityPtr();
+ if(identity) {
+ socket.setLocalCertificate(identity->sslCert());
+ socket.setPrivateKey(identity->sslKey());
+ }
socket.connectToHostEncrypted(server.host, server.port);
socket.connectToHostEncrypted(server.host, server.port);
- else
+ } else {
socket.connectToHost(server.host, server.port);
socket.connectToHost(server.host, server.port);
+ }
#else
socket.connectToHost(server.host, server.port);
#endif
#else
socket.connectToHost(server.host, server.port);
#endif
@@
-285,7
+291,7
@@
void CoreNetwork::socketInitialized() {
return;
#endif
return;
#endif
- Identity *identity = identityPtr();
+
Core
Identity *identity = identityPtr();
if(!identity) {
qCritical() << "Identity invalid!";
disconnectFromIrc();
if(!identity) {
qCritical() << "Identity invalid!";
disconnectFromIrc();