summaryrefslogtreecommitdiff
path: root/noncore/net/opieirc/ircmessageparser.cpp
Unidiff
Diffstat (limited to 'noncore/net/opieirc/ircmessageparser.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieirc/ircmessageparser.cpp61
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
@@ -26,40 +26,43 @@ IRCCTCPMessageParserStruct IRCMessageParser::ctcpParserProcTable[] = {
26 { "ACTION", FUNC(parseCTCPAction) }, 26 { "ACTION", FUNC(parseCTCPAction) },
27 { 0 , 0 } 27 { 0 , 0 }
28}; 28};
29 29
30/* Lookup table for numerical commands */ 30/* Lookup table for numerical commands */
31IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = { 31IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = {
32 { 1, FUNC(parseNumerical001) }, // RPL_WELCOME 32 { 1, FUNC(parseNumericalSecondParam) }, // RPL_WELCOME
33 { 2, FUNC(parseNumerical002) }, // RPL_YOURHOST 33 { 2, FUNC(parseNumericalSecondParam) }, // RPL_YOURHOST
34 { 3, FUNC(parseNumerical003) }, // RPL_CREATED 34 { 3, FUNC(parseNumericalSecondParam) }, // RPL_CREATED
35 { 4, FUNC(parseNumerical004) }, // RPL_MYINFO 35 { 4, FUNC(parseNumericalAllParams) }, // RPL_MYINFO
36 { 5, FUNC(parseNumerical005) }, // RPL_BOUNCE, RPL_PROTOCTL 36 { 5, FUNC(parseNumericalSecondParam) }, // RPL_BOUNCE, RPL_PROTOCTL
37 { 251, FUNC(parseNumericalStats) }, // RPL_LUSERCLIENT 37 { 250, FUNC(parseNumericalAllParams) }, // RPL_STATSCONN
38 { 252, FUNC(parseNumericalStats) }, // RPL_LUSEROP 38 { 251, FUNC(parseNumericalSecondParam) }, // RPL_LUSERCLIENT
39 { 265, FUNC(parseNumericalStats) }, // RPL_LOCALUSERS 39 { 252, FUNC(parseNumericalAllParams) }, // RPL_LUSEROP
40 { 266, FUNC(parseNumericalStats) }, // RPL_GLOBALUSERS 40 { 253, FUNC(parseNumericalAllParams) }, // RPL_LUSERUNKNOWN
41 { 250, FUNC(parseNumericalStats) }, // RPL_STATSCONN 41 { 254, FUNC(parseNumericalAllParams) }, // RPL_LUSERCHANNELS
42 { 254, FUNC(nullFunc)}, // RPL_LUSERCHANNELS 42 { 255, FUNC(parseNumericalSecondParam) }, // RPL_LUSERME
43 { 255, FUNC(parseNumericalStats) }, // RPL_LUSERNAME 43 { 265, FUNC(parseNumericalAllParams) }, // RPL_LOCALUSERS
44 { 266, FUNC(parseNumericalAllParams) }, // RPL_GLOBALUSERS
44 { 332, FUNC(parseNumericalTopic) }, // RPL_TOPIC 45 { 332, FUNC(parseNumericalTopic) }, // RPL_TOPIC
45 { 333, FUNC(parseNumericalTopicWhoTime) }, // RPL_TOPICWHOTIME 46 { 333, FUNC(parseNumericalTopicWhoTime) }, // RPL_TOPICWHOTIME
46 { 353, FUNC(parseNumericalNames) }, // RPL_NAMREPLY 47 { 353, FUNC(parseNumericalNames) }, // RPL_NAMREPLY
47 { 366, FUNC(parseNumericalEndOfNames) }, // RPL_ENDOFNAMES 48 { 366, FUNC(parseNumericalEndOfNames) }, // RPL_ENDOFNAMES
48 { 375, FUNC(parseNumericalStats) }, // RPL_MOTDSTART 49 { 372, FUNC(parseNumericalSecondParam) }, // RPL_MOTD
49 { 372, FUNC(parseNumericalStats) }, // RPL_MOTD 50 { 375, FUNC(parseNumericalSecondParam) }, // RPL_MOTDSTART
50 { 376, FUNC(parseNumericalStats) }, // RPL_ENDOFMOTD 51 { 376, FUNC(parseNumericalSecondParam) }, // RPL_ENDOFMOTD
51 { 377, FUNC(parseNumericalStats) }, // RPL_MOTD2 52 { 377, FUNC(parseNumericalSecondParam) }, // RPL_MOTD2
52 { 378, FUNC(parseNumericalStats) }, // RPL_MOTD3 53 { 378, FUNC(parseNumericalSecondParam) }, // RPL_MOTD3
53 { 401, FUNC(parseNumericalNoSuchNick) }, // ERR_NOSUCHNICK 54 { 401, FUNC(parseNumericalNoSuchNick) }, // ERR_NOSUCHNICK
54 { 406, FUNC(parseNumericalNoSuchNick) }, // ERR_WASNOSUCHNICK 55 { 406, FUNC(parseNumericalNoSuchNick) }, // ERR_WASNOSUCHNICK
55 { 412, FUNC(parseNumericalStats) }, // ERR_NOTEXTTOSEND 56 { 412, FUNC(parseNumericalSecondParam) }, // ERR_NOTEXTTOSEND
57 { 422, FUNC(parseNumericalSecondParam) }, // ERR_NOMOTD
56 { 433, FUNC(parseNumericalNicknameInUse) }, // ERR_NICKNAMEINUSE 58 { 433, FUNC(parseNumericalNicknameInUse) }, // ERR_NICKNAMEINUSE
57 { 0, 0 } 59 { 0, 0 }
58}; 60};
59 61
62
60IRCMessageParser::IRCMessageParser(IRCSession *session) { 63IRCMessageParser::IRCMessageParser(IRCSession *session) {
61 m_session = session; 64 m_session = session;
62} 65}
63 66
64void IRCMessageParser::parse(IRCMessage *message) { 67void IRCMessageParser::parse(IRCMessage *message) {
65 /* Find out what kind of message we have here and call the appropriate handler using 68 /* Find out what kind of message we have here and call the appropriate handler using
@@ -457,37 +460,21 @@ void IRCMessageParser::parseLiteralKick(IRCMessage *message) {
457 } 460 }
458 } else { 461 } else {
459 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown channel kick - desynchronized?"))); 462 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown channel kick - desynchronized?")));
460 } 463 }
461} 464}
462 465
463void IRCMessageParser::parseNumerical001(IRCMessage *message) {
464 /* Welcome to IRC message, display */
465 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1)));
466}
467 466
468void IRCMessageParser::parseNumerical002(IRCMessage *message) { 467void IRCMessageParser::parseNumericalSecondParam(IRCMessage *message) {
469 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1))); 468 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1)));
470} 469}
471 470
472void IRCMessageParser::parseNumerical003(IRCMessage *message) { 471void IRCMessageParser::parseNumericalAllParams(IRCMessage *message) {
473 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1)));
474}
475
476void IRCMessageParser::parseNumerical004(IRCMessage *message) {
477 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters())); 472 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters()));
478} 473}
479 474
480void IRCMessageParser::parseNumerical005(IRCMessage *message) {
481 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->allParameters()));
482}
483
484void IRCMessageParser::parseNumericalStats(IRCMessage *message) {
485 emit outputReady(IRCOutput(OUTPUT_SERVERMESSAGE, message->param(1)));
486}
487
488void IRCMessageParser::parseNumericalNames(IRCMessage *message) { 475void IRCMessageParser::parseNumericalNames(IRCMessage *message) {
489 /* Name list sent when joining a channel */ 476 /* Name list sent when joining a channel */
490 IRCChannel *channel = m_session->getChannel(message->param(2).lower()); 477 IRCChannel *channel = m_session->getChannel(message->param(2).lower());
491 if (channel != 0) { 478 if (channel != 0) {
492 QString people = message->param(3); 479 QString people = message->param(3);
493 QTextIStream stream(&people); 480 QTextIStream stream(&people);
@@ -565,6 +552,8 @@ void IRCMessageParser::parseNumericalTopic(IRCMessage *message) {
565 emit outputReady(output); 552 emit outputReady(output);
566 } 553 }
567} 554}
568 555
569void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) { 556void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) {
570} 557}
558
559