author | wimpie <wimpie> | 2005-01-08 15:16:37 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2005-01-08 15:16:37 (UTC) |
commit | 955213d274c2f0c11d0f153e2fed5df5170e50f6 (patch) (side-by-side diff) | |
tree | 5bf19444380a734ae5c184ba83aeb093e6ae4113 /noncore/net/opieirc/ircmessageparser.cpp | |
parent | 9acc68823f95f62367813dbb42387ad5ee094aae (diff) | |
download | opie-955213d274c2f0c11d0f153e2fed5df5170e50f6.zip opie-955213d274c2f0c11d0f153e2fed5df5170e50f6.tar.gz opie-955213d274c2f0c11d0f153e2fed5df5170e50f6.tar.bz2 |
Changes in this patch:
*Added some irc numerical codes (253, 422)
*Reordered codes
*Unified some functions which did exactly the same in two functions
*Changed nick ordering in channel list, now nicks get ordered first
by flags and then by name.
Diffstat (limited to 'noncore/net/opieirc/ircmessageparser.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opieirc/ircmessageparser.cpp | 61 |
1 files changed, 25 insertions, 36 deletions
diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp index ecc7e9a..f8ccbb6 100644 --- a/noncore/net/opieirc/ircmessageparser.cpp +++ b/noncore/net/opieirc/ircmessageparser.cpp @@ -20,52 +20,55 @@ IRCLiteralMessageParserStruct IRCMessageParser::literalParserProcTable[] = { }; /* Lookup table for literal commands */ IRCCTCPMessageParserStruct IRCMessageParser::ctcpParserProcTable[] = { { "PING", FUNC(parseCTCPPing) }, { "VERSION", FUNC(parseCTCPVersion) }, { "ACTION", FUNC(parseCTCPAction) }, { 0 , 0 } }; /* Lookup table for numerical commands */ IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = { - { 1, FUNC(parseNumerical001) }, // RPL_WELCOME - { 2, FUNC(parseNumerical002) }, // RPL_YOURHOST - { 3, FUNC(parseNumerical003) }, // RPL_CREATED - { 4, FUNC(parseNumerical004) }, // RPL_MYINFO - { 5, FUNC(parseNumerical005) }, // RPL_BOUNCE, RPL_PROTOCTL - { 251, FUNC(parseNumericalStats) }, // RPL_LUSERCLIENT - { 252, FUNC(parseNumericalStats) }, // RPL_LUSEROP - { 265, FUNC(parseNumericalStats) }, // RPL_LOCALUSERS - { 266, FUNC(parseNumericalStats) }, // RPL_GLOBALUSERS - { 250, FUNC(parseNumericalStats) }, // RPL_STATSCONN - { 254, FUNC(nullFunc)}, // RPL_LUSERCHANNELS - { 255, FUNC(parseNumericalStats) }, // RPL_LUSERNAME + { 1, FUNC(parseNumericalSecondParam) }, // RPL_WELCOME + { 2, FUNC(parseNumericalSecondParam) }, // RPL_YOURHOST + { 3, FUNC(parseNumericalSecondParam) }, // RPL_CREATED + { 4, FUNC(parseNumericalAllParams) }, // RPL_MYINFO + { 5, FUNC(parseNumericalSecondParam) }, // RPL_BOUNCE, RPL_PROTOCTL + { 250, FUNC(parseNumericalAllParams) }, // RPL_STATSCONN + { 251, FUNC(parseNumericalSecondParam) }, // RPL_LUSERCLIENT + { 252, FUNC(parseNumericalAllParams) }, // RPL_LUSEROP + { 253, FUNC(parseNumericalAllParams) }, // RPL_LUSERUNKNOWN + { 254, FUNC(parseNumericalAllParams) }, // RPL_LUSERCHANNELS + { 255, FUNC(parseNumericalSecondParam) }, // RPL_LUSERME + { 265, FUNC(parseNumericalAllParams) }, // RPL_LOCALUSERS + { 266, FUNC(parseNumericalAllParams) }, // RPL_GLOBALUSERS { 332, FUNC(parseNumericalTopic) }, // RPL_TOPIC { 333, FUNC(parseNumericalTopicWhoTime) }, // RPL_TOPICWHOTIME { 353, FUNC(parseNumericalNames) }, // RPL_NAMREPLY { 366, FUNC(parseNumericalEndOfNames) }, // RPL_ENDOFNAMES - { 375, FUNC(parseNumericalStats) }, // RPL_MOTDSTART - { 372, FUNC(parseNumericalStats) }, // RPL_MOTD - { 376, FUNC(parseNumericalStats) }, // RPL_ENDOFMOTD - { 377, FUNC(parseNumericalStats) }, // RPL_MOTD2 - { 378, FUNC(parseNumericalStats) }, // RPL_MOTD3 + { 372, FUNC(parseNumericalSecondParam) }, // RPL_MOTD + { 375, FUNC(parseNumericalSecondParam) }, // RPL_MOTDSTART + { 376, FUNC(parseNumericalSecondParam) }, // RPL_ENDOFMOTD + { 377, FUNC(parseNumericalSecondParam) }, // RPL_MOTD2 + { 378, FUNC(parseNumericalSecondParam) }, // RPL_MOTD3 { 401, FUNC(parseNumericalNoSuchNick) }, // ERR_NOSUCHNICK { 406, FUNC(parseNumericalNoSuchNick) }, // ERR_WASNOSUCHNICK - { 412, FUNC(parseNumericalStats) }, // ERR_NOTEXTTOSEND + { 412, FUNC(parseNumericalSecondParam) }, // ERR_NOTEXTTOSEND + { 422, FUNC(parseNumericalSecondParam) }, // ERR_NOMOTD { 433, FUNC(parseNumericalNicknameInUse) }, // ERR_NICKNAMEINUSE { 0, 0 } }; + IRCMessageParser::IRCMessageParser(IRCSession *session) { m_session = session; } void IRCMessageParser::parse(IRCMessage *message) { /* Find out what kind of message we have here and call the appropriate handler using the parser tables. If no handler can be found, print out an error message */ if (message->isNumerical()) { for (int i=0; i<numericalParserProcTable[i].commandNumber; i++) { if (message->commandNumber() == numericalParserProcTable[i].commandNumber) { (this->*(numericalParserProcTable[i].proc))(message); return; @@ -451,49 +454,33 @@ void IRCMessageParser::parseLiteralKick(IRCMessage *message) { output.addParam(channel); output.addParam(person); emit outputReady(output); } } else { emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown person kick - desynchronized?"))); } } else { emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown channel kick - desynchronized?"))); } } -void IRCMessageParser::parseNumerical001(IRCMessage *message) { - /* Welcome to IRC message, display */ - emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1))); -} -void IRCMessageParser::parseNumerical002(IRCMessage *message) { +void IRCMessageParser::parseNumericalSecondParam(IRCMessage *message) { emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1))); } -void IRCMessageParser::parseNumerical003(IRCMessage *message) { - emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1))); -} - -void IRCMessageParser::parseNumerical004(IRCMessage *message) { +void IRCMessageParser::parseNumericalAllParams(IRCMessage *message) { emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters())); } -void IRCMessageParser::parseNumerical005(IRCMessage *message) { - emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters())); -} - -void IRCMessageParser::parseNumericalStats(IRCMessage *message) { - emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1))); -} - void IRCMessageParser::parseNumericalNames(IRCMessage *message) { /* Name list sent when joining a channel */ IRCChannel *channel = m_session->getChannel(message->param(2).lower()); if (channel != 0) { QString people = message->param(3); QTextIStream stream(&people); QString temp; while (!stream.atEnd()) { stream >> temp; char flagch = temp.at(0).latin1(); @@ -559,12 +546,14 @@ void IRCMessageParser::parseNumericalTopic(IRCMessage *message) { IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + channel->channelname() + " is \"" + message->param(2) + "\"")); output.addParam(channel); emit outputReady(output); } else { IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + message->param(1) + " is \"" + message->param(2) + "\"")); output.addParam(0); emit outputReady(output); } } void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) { } + + |