X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=5bd4dc43514dee2079e247bf035049fd91d7df56;hp=4f5206adcdf64da78269d34d06d9c457831b1112;hb=7687144347370b830d3b8957bd223acb629fee83;hpb=c6fc5ae878a4f92b658c3da2861bcc7da9c2594f diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index 4f5206ad..5bd4dc43 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -23,9 +23,7 @@ #include "coresession.h" #include "coreirclisthelper.h" -#include "networkconnection.h" -#include "network.h" -#include "identity.h" +#include "coreidentity.h" #include "ctcphandler.h" #include "ircuser.h" @@ -34,7 +32,7 @@ #include -IrcServerHandler::IrcServerHandler(NetworkConnection *parent) +IrcServerHandler::IrcServerHandler(CoreNetwork *parent) : BasicHandler(parent), _whois(false) { @@ -45,64 +43,64 @@ IrcServerHandler::~IrcServerHandler() { /*! Handle a raw message string sent by the server. We try to find a suitable handler, otherwise we call a default handler. */ void IrcServerHandler::handleServerMsg(QByteArray msg) { - try { - if(msg.isEmpty()) { - qWarning() << "Received empty string from server!"; - return; - } + if(msg.isEmpty()) { + qWarning() << "Received empty string from server!"; + return; + } - // Now we split the raw message into its various parts... - QString prefix = ""; - QByteArray trailing; - QString cmd; - - // First, check for a trailing parameter introduced by " :", since this might screw up splitting the msg - // NOTE: This assumes that this is true in raw encoding, but well, hopefully there are no servers running in japanese on protocol level... - int idx = msg.indexOf(" :"); - if(idx >= 0) { - if(msg.length() > idx + 2) trailing = msg.mid(idx + 2); - msg = msg.left(idx); - } - // OK, now it is safe to split... - QList params = msg.split(' '); - if(!trailing.isEmpty()) params << trailing; + // Now we split the raw message into its various parts... + QString prefix = ""; + QByteArray trailing; + QString cmd; + + // First, check for a trailing parameter introduced by " :", since this might screw up splitting the msg + // NOTE: This assumes that this is true in raw encoding, but well, hopefully there are no servers running in japanese on protocol level... + int idx = msg.indexOf(" :"); + if(idx >= 0) { + if(msg.length() > idx + 2) trailing = msg.mid(idx + 2); + msg = msg.left(idx); + } + // OK, now it is safe to split... + QList params = msg.split(' '); + if(!trailing.isEmpty()) params << trailing; + if(params.count() < 1) { + qWarning() << "Received invalid string from server!"; + return; + } + + QString foo = serverDecode(params.takeFirst()); + + // a colon as the first chars indicates the existence of a prefix + if(foo[0] == ':') { + foo.remove(0, 1); + prefix = foo; if(params.count() < 1) { qWarning() << "Received invalid string from server!"; return; } + foo = serverDecode(params.takeFirst()); + } - QString foo = serverDecode(params.takeFirst()); + // next string without a whitespace is the command + cmd = foo.trimmed().toUpper(); - // a colon as the first chars indicates the existence of a prefix - if(foo[0] == ':') { - foo.remove(0, 1); - prefix = foo; - if(params.count() < 1) { - qWarning() << "Received invalid string from server!"; - return; - } - foo = serverDecode(params.takeFirst()); + // numeric replies have the target as first param (RFC 2812 - 2.4). this is usually our own nick. Remove this! + uint num = cmd.toUInt(); + if(num > 0) { + if(params.count() == 0) { + qWarning() << "Message received from server violates RFC and is ignored!" << msg; + return; } + _target = serverDecode(params.takeFirst()); + } else { + _target = QString(); + } - // next string without a whitespace is the command - cmd = foo.trimmed().toUpper(); - - // numeric replies have the target as first param (RFC 2812 - 2.4). this is usually our own nick. Remove this! - uint num = cmd.toUInt(); - if(num > 0) { - if(params.count() == 0) { - qWarning() << "Message received from server violates RFC and is ignored!"; - return; - } - params.removeFirst(); - } + // note that the IRC server is still alive + network()->resetPingTimeout(); - // Now we try to find a handler for this message. BTW, I do love the Trolltech guys ;-) - handle(cmd, Q_ARG(QString, prefix), Q_ARG(QList, params)); - //handle(cmd, Q_ARG(QString, prefix)); - } catch(Exception e) { - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", e.msg()); - } + // Now we try to find a handler for this message. BTW, I do love the Trolltech guys ;-) + handle(cmd, Q_ARG(QString, prefix), Q_ARG(QList, params)); } @@ -121,7 +119,7 @@ void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const // Server error messages without param, just display them case 409: case 411: case 412: case 422: case 424: case 445: case 446: case 451: case 462: case 463: case 464: case 465: case 466: case 472: case 481: case 483: case 485: case 491: case 501: case 502: - case 431: // ERR_NONICKNAMEGIVEN + case 431: // ERR_NONICKNAMEGIVEN emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", params.join(" "), prefix); break; // Server error messages, display them in red. First param will be appended. @@ -153,8 +151,8 @@ void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const // many nets define their own WHOIS fields. we fetch those not in need of special attention here: emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", "[Whois] " + params.join(" "), prefix); } else { - if(networkConnection()->coreSession()->ircListHelper()->requestInProgress(network()->networkId())) - networkConnection()->coreSession()->ircListHelper()->reportError(params.join(" ")); + if(coreSession()->ircListHelper()->requestInProgress(network()->networkId())) + coreSession()->ircListHelper()->reportError(params.join(" ")); else emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", cmd + " " + params.join(" "), prefix); } @@ -179,7 +177,7 @@ void IrcServerHandler::handleJoin(const QString &prefix, const QList //qDebug() << "IrcServerHandler::handleJoin()" << prefix << params; ircuser->joinChannel(channel); if(network()->isMe(ircuser)) { - networkConnection()->setChannelJoined(channel); + network()->setChannelJoined(channel); putCmd("MODE", params[0]); // we want to know the modes of the channel we just joined, so we ask politely } } @@ -192,7 +190,7 @@ void IrcServerHandler::handleKick(const QString &prefix, const QList IrcUser *victim = network()->ircUser(params[1]); if(!victim) return; - + QString channel = serverDecode(params[0]); victim->partChannel(channel); @@ -203,7 +201,7 @@ void IrcServerHandler::handleKick(const QString &prefix, const QList msg = victim->nick(); emit displayMsg(Message::Kick, BufferInfo::ChannelBuffer, channel, msg, prefix); - //if(network()->isMe(victim)) networkConnection()->setKickedFromChannel(channel); + //if(network()->isMe(victim)) network()->setKickedFromChannel(channel); } void IrcServerHandler::handleMode(const QString &prefix, const QList ¶ms) { @@ -258,14 +256,14 @@ void IrcServerHandler::handleMode(const QString &prefix, const QList } paramOffset++; } - + if(add) channel->addChannelMode(modes[c], value); else channel->removeChannelMode(modes[c], value); } } - + } else { // pure User Modes IrcUser *ircUser = network()->newIrcUser(params[0]); @@ -291,7 +289,7 @@ void IrcServerHandler::handleMode(const QString &prefix, const QList ircUser->addUserModes(addModes); if(!removeModes.isEmpty()) ircUser->removeUserModes(removeModes); - + // FIXME: redirect emit displayMsg(Message::Mode, BufferInfo::StatusBuffer, "", serverDecode(params).join(" "), prefix); } @@ -313,11 +311,15 @@ void IrcServerHandler::handleNick(const QString &prefix, const QList ? newnick : prefix; - emit nickChanged(newnick, oldnick); + + // the order is cruicial + // otherwise the client would rename the buffer, see that the assigned ircuser doesn't match anymore + // and remove the ircuser from the querybuffer leading to a wrong on/offline state + ircuser->setNick(newnick); + coreSession()->renameBuffer(network()->networkId(), newnick, oldnick); + foreach(QString channel, ircuser->channels()) emit displayMsg(Message::Nick, BufferInfo::ChannelBuffer, channel, newnick, sender); - - ircuser->setNick(newnick); } void IrcServerHandler::handleNotice(const QString &prefix, const QList ¶ms) { @@ -352,7 +354,7 @@ void IrcServerHandler::handleNotice(const QString &prefix, const QListctcpHandler()->parse(Message::Notice, prefix, target, params[1]); + network()->ctcpHandler()->parse(Message::Notice, prefix, target, params[1]); } void IrcServerHandler::handlePart(const QString &prefix, const QList ¶ms) { @@ -373,7 +375,7 @@ void IrcServerHandler::handlePart(const QString &prefix, const QList msg = userDecode(ircuser->nick(), params[1]); emit displayMsg(Message::Part, BufferInfo::ChannelBuffer, channel, msg, prefix); - if(network()->isMe(ircuser)) networkConnection()->setChannelParted(channel); + if(network()->isMe(ircuser)) network()->setChannelParted(channel); } void IrcServerHandler::handlePing(const QString &prefix, const QList ¶ms) { @@ -412,7 +414,7 @@ void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList we let the ctcpHandler do the work - networkConnection()->ctcpHandler()->parse(Message::Plain, prefix, target, msg); + network()->ctcpHandler()->parse(Message::Plain, prefix, target, msg); } void IrcServerHandler::handleQuit(const QString &prefix, const QList ¶ms) { @@ -452,7 +454,7 @@ void IrcServerHandler::handleTopic(const QString &prefix, const QListircChannel(serverDecode(params[0])); if(!channel) return; - + QString topic; if(params.count() > 1) topic = channelDecode(channel->name(), params[1]); @@ -533,8 +535,8 @@ void IrcServerHandler::handle266(const QString &prefix, const QList emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("%1").arg(serverDecode(params).join(" "))); } -/* -WHOIS-Message: +/* +WHOIS-Message: Replies 311 - 313, 317 - 319 are all replies generated in response to a WHOIS message. and 301 (RPL_AWAY) " :" @@ -654,7 +656,7 @@ void IrcServerHandler::handle311(const QString &prefix, const QList emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is %2 (%3)") .arg(serverDecode(params[1])).arg(serverDecode(params[2])).arg(serverDecode(params.last()))); } } - + /* RPL_WHOISSERVER - " :" */ void IrcServerHandler::handle312(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) @@ -706,14 +708,14 @@ void IrcServerHandler::handle315(const QString &prefix, const QList return; QStringList p = serverDecode(params); - if(networkConnection()->setAutoWhoDone(p[0])) { + if(network()->setAutoWhoDone(p[0])) { return; // stay silent } p.takeLast(); // should be "End of WHO list" emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] End of /WHO list for %1").arg(p.join(" "))); } -/* RPL_WHOISIDLE - " :seconds idle" +/* RPL_WHOISIDLE - " :seconds idle" (real life: " :seconds idle, signon time) */ void IrcServerHandler::handle317(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); @@ -733,7 +735,7 @@ void IrcServerHandler::handle317(const QString &prefix, const QList emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is logged in since %2").arg(ircuser->nick()).arg(ircuser->loginTime().toString())); } emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is idling for %2 (%3)").arg(ircuser->nick()).arg(secondsToString(ircuser->idleTime().secsTo(now))).arg(ircuser->idleTime().toString())); - + } else { emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] idle message: %1").arg(userDecode(nick, params).join(" "))); } @@ -766,11 +768,11 @@ void IrcServerHandler::handle319(const QString &prefix, const QList else user.append(channel); } - if(!user.isEmpty()) + if(!user.isEmpty()) emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is a user on channels: %2").arg(nick).arg(user.join(" "))); - if(!voice.isEmpty()) + if(!voice.isEmpty()) emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 has voice on channels: %2").arg(nick).arg(voice.join(" "))); - if(!op.isEmpty()) + if(!op.isEmpty()) emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Whois] %1 is an operator on channels: %2").arg(nick).arg(op.join(" "))); } @@ -786,7 +788,7 @@ void IrcServerHandler::handle322(const QString &prefix, const QList QString channelName; quint32 userCount = 0; QString topic; - + int paramCount = params.count(); switch(paramCount) { case 3: @@ -798,7 +800,7 @@ void IrcServerHandler::handle322(const QString &prefix, const QList default: break; } - if(!networkConnection()->coreSession()->ircListHelper()->addChannel(network()->networkId(), channelName, userCount, topic)) + if(!coreSession()->ircListHelper()->addChannel(network()->networkId(), channelName, userCount, topic)) emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Channel %1 has %2 users. Topic is: %3").arg(channelName).arg(userCount).arg(topic)); } @@ -807,10 +809,10 @@ void IrcServerHandler::handle323(const QString &prefix, const QList Q_UNUSED(prefix) Q_UNUSED(params) - if(!networkConnection()->coreSession()->ircListHelper()->endOfChannelList(network()->networkId())) + if(!coreSession()->ircListHelper()->endOfChannelList(network()->networkId())) emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("End of channel list")); } - + /* RPL_CHANNELMODEIS - " " */ void IrcServerHandler::handle324(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); @@ -824,7 +826,7 @@ void IrcServerHandler::handle329(const QString &prefix, const QList #ifdef __GNUC__ # warning "Implement handle329 (Channel creation time)" #endif - // FIXME implement this... + // FIXME implement this... } /* RPL_NOTOPIC */ @@ -867,7 +869,7 @@ void IrcServerHandler::handle333(const QString &prefix, const QList tr("Topic set by %1 on %2") .arg(serverDecode(params[1]), QDateTime::fromTime_t(channelDecode(channel, params[2]).toUInt()).toString())); } -/* RPL_WHOREPLY: " +/* RPL_WHOREPLY: " ( "H" / "G" > ["*"] [ ( "@" / "+" ) ] : " */ void IrcServerHandler::handle352(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix) @@ -882,11 +884,11 @@ void IrcServerHandler::handle352(const QString &prefix, const QList bool away = serverDecode(params[5]).startsWith("G") ? true : false; ircuser->setAway(away); - ircuser->setServer(serverDecode(params[3])); + ircuser->setServer(serverDecode(params[3])); ircuser->setRealName(serverDecode(params.last()).section(" ", 1)); } - if(!networkConnection()->isAutoWhoInProgress(channel)) { + if(!network()->isAutoWhoInProgress(channel)) { emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("[Who] %1").arg(serverDecode(params).join(" "))); } } @@ -896,7 +898,7 @@ void IrcServerHandler::handle353(const QString &prefix, const QList Q_UNUSED(prefix); if(!checkParamCount("IrcServerHandler::handle353()", params, 3)) return; - + // param[0] is either "=", "*" or "@" indicating a public, private or secret channel // we don't use this information at the time beeing QString channelname = serverDecode(params[1]); @@ -909,7 +911,7 @@ void IrcServerHandler::handle353(const QString &prefix, const QList QStringList nicks; QStringList modes; - + foreach(QString nick, serverDecode(params[2]).split(' ')) { QString mode = QString(); @@ -921,7 +923,7 @@ void IrcServerHandler::handle353(const QString &prefix, const QList nicks << nick; modes << mode; } - + channel->joinIrcUsers(nicks, modes); } @@ -935,20 +937,19 @@ void IrcServerHandler::handle369(const QString &prefix, const QList void IrcServerHandler::handle432(const QString &prefix, const QList ¶ms) { Q_UNUSED(prefix); + QString errnick; if(params.size() < 2) { // handle unreal-ircd bug, where unreal ircd doesnt supply a TARGET in ERR_ERRONEUSNICKNAME during registration phase: // nick @@@ // :irc.scortum.moep.net 432 @@@ :Erroneous Nickname: Illegal characters // correct server reply: // :irc.scortum.moep.net 432 * @@@ :Erroneous Nickname: Illegal characters - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("There is a nickname in your identity's nicklist which contains illegal characters")); - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Due to a bug in Unreal IRCd (and maybe other irc-servers too) we're unable to determine the erroneous nick")); - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Please use: /nick to continue or clean up your nicklist")); + errnick = target(); } else { - QString errnick = params[0]; - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick %1 contains illegal characters").arg(errnick)); - tryNextNick(errnick); + errnick = params[0]; } + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick %1 contains illegal characters").arg(errnick)); + tryNextNick(errnick, true /* erroneus */); } /* ERR_NICKNAMEINUSE */ @@ -956,7 +957,7 @@ void IrcServerHandler::handle433(const QString &prefix, const QList Q_UNUSED(prefix); if(!checkParamCount("IrcServerHandler::handle433()", params, 1)) return; - + QString errnick = serverDecode(params[0]); emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Nick already in use: %1").arg(errnick)); @@ -975,14 +976,21 @@ void IrcServerHandler::handle433(const QString &prefix, const QList /* */ -void IrcServerHandler::tryNextNick(const QString &errnick) { - QStringList desiredNicks = networkConnection()->coreSession()->identity(network()->identity())->nicks(); - int nextNick = desiredNicks.indexOf(errnick) + 1; - if(desiredNicks.size() > nextNick) { - putCmd("NICK", serverEncode(desiredNicks[nextNick])); +void IrcServerHandler::tryNextNick(const QString &errnick, bool erroneus) { + QStringList desiredNicks = coreSession()->identity(network()->identity())->nicks(); + int nextNickIdx = desiredNicks.indexOf(errnick) + 1; + QString nextNick; + if(nextNickIdx > 0 && desiredNicks.size() > nextNickIdx) { + nextNick = desiredNicks[nextNickIdx]; } else { - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("No free and valid nicks in nicklist found. use: /nick to continue")); + if(erroneus) { + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("No free and valid nicks in nicklist found. use: /nick to continue")); + return; + } else { + nextNick = errnick + "_"; + } } + putCmd("NICK", serverEncode(nextNick)); } bool IrcServerHandler::checkParamCount(const QString &methodName, const QList ¶ms, int minParams) {