connect(network, SIGNAL(autoReconnectIntervalSet(quint32)), this, SLOT(autoReconnectSettingsChanged()));
connect(network, SIGNAL(autoReconnectRetriesSet(quint16)), this, SLOT(autoReconnectSettingsChanged()));
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
connect(&socket, SIGNAL(encrypted()), this, SLOT(socketEncrypted()));
connect(&socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
#endif
QVariantList serverList = network()->serverList();
Identity *identity = coreSession()->identity(network()->identity());
if(!serverList.count()) {
- quWarning() << "Server list empty, ignoring connect request!";
+ qWarning() << "Server list empty, ignoring connect request!";
return;
}
if(!identity) {
- quWarning() << "Invalid identity configures, ignoring connect request!";
+ qWarning() << "Invalid identity configures, ignoring connect request!";
return;
}
// use a random server?
if(!joinString.isEmpty()) userInputHandler()->handleJoin(statusBuf, joinString);
}
-void NetworkConnection::disconnectFromIrc(bool requested) {
+void NetworkConnection::disconnectFromIrc(bool requested, const QString &reason) {
_quitRequested = requested; // see socketDisconnected();
_autoReconnectTimer.stop();
_autoReconnectCount = 0; // prohibiting auto reconnect
displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Disconnecting."));
if(socket.state() == QAbstractSocket::UnconnectedState) {
socketDisconnected();
- } else if(socket.state() < QAbstractSocket::ConnectedState) {
+ } else if(socket.state() < QAbstractSocket::ConnectedState || !requested) {
+ // we might be in a state waiting for a timeout...
+ // or (!requested) this is a core shutdown...
+ // in both cases we don't really care... set a disconnected state
socket.close();
- // we might be in a state waiting for a timeout... we don't care... set a disconnected state
socketDisconnected();
} else {
- _socketCloseTimer.start(10000); // the irc server has 10 seconds to close the socket
+ // quit gracefully if it's user requested quit
+ userInputHandler()->issueQuit(reason);
+ // the irc server has 10 seconds to close the socket
+ _socketCloseTimer.start(10000);
}
}
void NetworkConnection::socketError(QAbstractSocket::SocketError) {
_previousConnectionAttemptFailed = true;
- quWarning() << qPrintable(tr("Could not connect to %1 (%2)").arg(network()->networkName(), socket.errorString()));
+ qWarning() << qPrintable(tr("Could not connect to %1 (%2)").arg(network()->networkName(), socket.errorString()));
emit connectionError(socket.errorString());
emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Connection failure: %1").arg(socket.errorString()));
network()->emitConnectionError(socket.errorString());
//exit(1);
}
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
void NetworkConnection::sslErrors(const QList<QSslError> &sslErrors) {
Q_UNUSED(sslErrors)
socketInitialized();
}
-#endif // QT_NO_OPENSSL
+#endif // HAVE_SSL
void NetworkConnection::socketConnected() {
-#ifdef QT_NO_OPENSSL
+#ifndef HAVE_SSL
socketInitialized();
return;
#else
//emit connected(networkId()); initialize first!
Identity *identity = coreSession()->identity(network()->identity());
if(!identity) {
- quError() << "Identity invalid!";
+ qCritical() << "Identity invalid!";
disconnectFromIrc();
return;
}
_autoWhoInProgress.clear();
_socketCloseTimer.stop();
-
+
+ IrcUser *me = network()->me();
+ if(me) {
+ foreach(QString channel, me->channels())
+ emit displayMsg(Message::Quit, BufferInfo::ChannelBuffer, channel, "", me->hostmask());
+ }
+
network()->setConnected(false);
emit disconnected(networkId());
if(_quitRequested) {
void NetworkConnection::doAutoReconnect() {
if(connectionState() != Network::Disconnected && connectionState() != Network::Reconnecting) {
- quWarning() << "NetworkConnection::doAutoReconnect(): Cannot reconnect while not being disconnected!";
+ qWarning() << "NetworkConnection::doAutoReconnect(): Cannot reconnect while not being disconnected!";
return;
}
if(_autoReconnectCount > 0) _autoReconnectCount--;