}
void NetworkConnection::disconnectFromIrc(bool requested) {
+ _quitRequested = requested; // see socketDisconnected();
_autoReconnectTimer.stop();
- _autoReconnectCount = 0;
+ _autoReconnectCount = 0; // prohibiting auto reconnect
displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Disconnecting."));
- if(socket.state() < QAbstractSocket::ConnectedState) {
- setConnectionState(Network::Disconnected);
+ if(socket.state() == QAbstractSocket::UnconnectedState) {
+ socketDisconnected();
+ } else if(socket.state() < QAbstractSocket::ConnectedState) {
+ 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
}
-
- // this flag triggers quitRequested() once the socket is closed
- // it is needed to determine whether or not the connection needs to be
- // in the automatic session restore.
- _quitRequested = requested;
}
void NetworkConnection::socketHasData() {
emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Connection failure: %1").arg(socket.errorString()));
network()->emitConnectionError(socket.errorString());
if(socket.state() < QAbstractSocket::ConnectedState) {
- setConnectionState(Network::Disconnected);
socketDisconnected();
}
// mark last connection attempt as failed
network()->setConnected(false);
emit disconnected(networkId());
- if(_autoReconnectCount != 0) {
- setConnectionState(Network::Reconnecting);
- if(_autoReconnectCount == network()->autoReconnectRetries()) doAutoReconnect(); // first try is immediate
- else _autoReconnectTimer.start();
- } else if(_quitRequested) {
+ if(_quitRequested) {
+ setConnectionState(Network::Disconnected);
emit quitRequested(networkId());
+ } else if(_autoReconnectCount != 0) {
+ setConnectionState(Network::Reconnecting);
+ if(_autoReconnectCount == network()->autoReconnectRetries())
+ doAutoReconnect(); // first try is immediate
+ else
+ _autoReconnectTimer.start();
}
}
// that means that the last message can be as long as:
// 512 - nicklen - userlen - hostlen - commandlen - sum(param[0]..param[n-1])) - 2 (for CRLF) - 4 (":!@" + 1space between prefix and command) - max(paramcount - 1, 0) (space for simple params) - 2 (space and colon for last param)
IrcUser *me = network()->me();
- int maxLen = 512 - serverEncode(me->nick()).count() - serverEncode(me->user()).count() - serverEncode(me->host()).count() - cmd.toAscii().count() - 6;
+ int maxLen = 480 - cmd.toAscii().count(); // educated guess in case we don't know us (yet?)
+
+ if(me)
+ maxLen = 512 - serverEncode(me->nick()).count() - serverEncode(me->user()).count() - serverEncode(me->host()).count() - cmd.toAscii().count() - 6;
if(!params.isEmpty()) {
for(int i = 0; i < params.count() - 1; i++) {