From: <mm...@us...> - 2007-10-23 07:11:50
|
Revision: 296 http://libirc.svn.sourceforge.net/libirc/?rev=296&view=rev Author: mm_202 Date: 2007-10-23 00:11:48 -0700 (Tue, 23 Oct 2007) Log Message: ----------- Fixed a stupid spelling mistake, Permisions -> Permissions. Modified Paths: -------------- trunk/libirc/examples/stupidBot/src/stupidBot.cpp trunk/libirc/include/IRCClient.h trunk/libirc/include/IRCUserManager.h trunk/libirc/src/IRCClient.cpp trunk/libirc/src/IRCUserManager.cpp Modified: trunk/libirc/examples/stupidBot/src/stupidBot.cpp =================================================================== --- trunk/libirc/examples/stupidBot/src/stupidBot.cpp 2007-10-23 06:58:03 UTC (rev 295) +++ trunk/libirc/examples/stupidBot/src/stupidBot.cpp 2007-10-23 07:11:48 UTC (rev 296) @@ -1145,7 +1145,7 @@ if (channel.size()) { - trIRCChannelPermisions perms = client.getChanPerms(channel); + trIRCChannelPermissions perms = client.getChanPerms(channel); std::string message = from + ", " +channel + " mode is " + perms.mode; client.sendMessage(respondTo,message); @@ -1211,7 +1211,7 @@ if ( userManager.userIsIdentified(userID) ) client.sendMessage(respondTo,"and is identified"); - trIRCUserPermisions perms = userManager.getUserPerms(userID); + trIRCUserPermissions perms = userManager.getUserPerms(userID); if (perms.mode.size()) client.sendMessage(respondTo,std::string("MODE is set to \"") + perms.mode + "\""); @@ -1276,7 +1276,7 @@ message += std::string(" ") + *(itr++); client.sendMessage(respondTo,message); - trIRCChannelPermisions perms = userManager.getChannelPerms(chanID); + trIRCChannelPermissions perms = userManager.getChannelPerms(chanID); if (perms.mode.size()) client.sendMessage(respondTo,std::string("MODE is set to \"") + perms.mode + "\""); Modified: trunk/libirc/include/IRCClient.h =================================================================== --- trunk/libirc/include/IRCClient.h 2007-10-23 06:58:03 UTC (rev 295) +++ trunk/libirc/include/IRCClient.h 2007-10-23 07:11:48 UTC (rev 296) @@ -162,7 +162,7 @@ virtual string_list listChannels ( void ); virtual string_list listChanOps ( std::string channel ); - virtual trIRCChannelPermisions getChanPerms ( std::string channel ); + virtual trIRCChannelPermissions getChanPerms ( std::string channel ); IRCUserManager& getUserManager ( void ){return userManager;} Modified: trunk/libirc/include/IRCUserManager.h =================================================================== --- trunk/libirc/include/IRCUserManager.h 2007-10-23 06:58:03 UTC (rev 295) +++ trunk/libirc/include/IRCUserManager.h 2007-10-23 07:11:48 UTC (rev 296) @@ -39,7 +39,7 @@ bool ctcpReceipt; bool away; bool idle; -}trIRCUserPermisions; +}trIRCUserPermissions; typedef struct { @@ -47,7 +47,7 @@ bool chanOp; bool voice; bool quieted; -}trIRCChannelUserPermisions; +}trIRCChannelUserPermissions; typedef struct { @@ -65,14 +65,14 @@ bool regOnly; bool secret; bool reducedModeraton; -}trIRCChannelPermisions; +}trIRCChannelPermissions; typedef struct { int id; std::string name; - trIRCChannelPermisions perms; - std::map<int,trIRCChannelUserPermisions>userPerms; + trIRCChannelPermissions perms; + std::map<int,trIRCChannelUserPermissions>userPerms; std::string lastMessage; int lastMessageUser; std::string topic; @@ -88,7 +88,7 @@ int lastMessageChannel; std::string lastMessage; - trIRCUserPermisions perms; + trIRCUserPermissions perms; std::vector<int> channels; }trIRCUserRecord; @@ -116,8 +116,8 @@ std::string getUserLastMessageChannelName ( int id ); std::string getUserLastMessageChannelName ( std::string &name ); - trIRCUserPermisions getUserPerms ( int id ); - trIRCUserPermisions getUserPerms ( std::string &name ); + trIRCUserPermissions getUserPerms ( int id ); + trIRCUserPermissions getUserPerms ( std::string &name ); std::vector<int> listUsers ( void ); std::vector<std::string> listUserNames ( void ); @@ -131,10 +131,10 @@ bool userInChannel ( std::string &name, int channel ); bool userInChannel ( std::string &name, std::string& channel ); - trIRCChannelUserPermisions getUserChannelPerms ( int id, int channel ); - trIRCChannelUserPermisions getUserChannelPerms ( int id, std::string& channel ); - trIRCChannelUserPermisions getUserChannelPerms ( std::string &name, int channel ); - trIRCChannelUserPermisions getUserChannelPerms ( std::string &name, std::string& channel ); + trIRCChannelUserPermissions getUserChannelPerms ( int id, int channel ); + trIRCChannelUserPermissions getUserChannelPerms ( int id, std::string& channel ); + trIRCChannelUserPermissions getUserChannelPerms ( std::string &name, int channel ); + trIRCChannelUserPermissions getUserChannelPerms ( std::string &name, std::string& channel ); bool userIsIdentified ( int id ); bool userIsIdentified ( std::string &name ); @@ -161,8 +161,8 @@ int getChannelID ( std::string &channel ); std::string getChannelName ( int id ); - trIRCChannelPermisions getChannelPerms ( int id ); - trIRCChannelPermisions getChannelPerms ( std::string &channel ); + trIRCChannelPermissions getChannelPerms ( int id ); + trIRCChannelPermissions getChannelPerms ( std::string &channel ); std::string getChannelTopic ( int id ); std::string getChannelTopic( std::string &channel ); @@ -231,13 +231,13 @@ std::string getCleanNick ( std::string &nick ); std::string getCleanChanName ( std::string &name ); - void setDefaultUserPerms ( trIRCUserPermisions &perms ); - void setDefaultChannelPerms ( trIRCChannelPermisions &perms ); - void setDefaultChannelUserPerms ( trIRCChannelUserPermisions &perms ); + void setDefaultUserPerms ( trIRCUserPermissions &perms ); + void setDefaultChannelPerms ( trIRCChannelPermissions &perms ); + void setDefaultChannelUserPerms ( trIRCChannelUserPermissions &perms ); - void parseUserPerms ( std::string mode, trIRCUserPermisions &perms ); - void parseChannelPerms ( std::string mode, trIRCChannelPermisions &perms ); - void parseChannelUserPerms ( std::string mode, trIRCChannelUserPermisions &perms ); + void parseUserPerms ( std::string mode, trIRCUserPermissions &perms ); + void parseChannelPerms ( std::string mode, trIRCChannelPermissions &perms ); + void parseChannelUserPerms ( std::string mode, trIRCChannelUserPermissions &perms ); void removeChannelFromUser ( int user, int channel ); Modified: trunk/libirc/src/IRCClient.cpp =================================================================== --- trunk/libirc/src/IRCClient.cpp 2007-10-23 06:58:03 UTC (rev 295) +++ trunk/libirc/src/IRCClient.cpp 2007-10-23 07:11:48 UTC (rev 296) @@ -704,7 +704,7 @@ return userManager.listChannelNames(); } -trIRCChannelPermisions IRCClient::getChanPerms ( std::string channel ) +trIRCChannelPermissions IRCClient::getChanPerms ( std::string channel ) { return userManager.getChannelPerms(channel); } Modified: trunk/libirc/src/IRCUserManager.cpp =================================================================== --- trunk/libirc/src/IRCUserManager.cpp 2007-10-23 06:58:03 UTC (rev 295) +++ trunk/libirc/src/IRCUserManager.cpp 2007-10-23 07:11:48 UTC (rev 296) @@ -142,9 +142,9 @@ return std::string(""); } -trIRCUserPermisions IRCUserManager::getUserPerms ( int id ) +trIRCUserPermissions IRCUserManager::getUserPerms ( int id ) { - trIRCUserPermisions perms; + trIRCUserPermissions perms; trIRCUserRecord &info = getUserInfo(id); if (info.lastMessage.size()) @@ -153,9 +153,9 @@ return perms; } -trIRCUserPermisions IRCUserManager::getUserPerms ( std::string &name ) +trIRCUserPermissions IRCUserManager::getUserPerms ( std::string &name ) { - trIRCUserPermisions perms; + trIRCUserPermissions perms; trIRCUserRecord &info = getUserInfo(name); if (info.lastMessage.size()) @@ -229,25 +229,25 @@ return channelRecord.userPerms.find(getUserID(name)) != channelRecord.userPerms.end(); } -trIRCChannelUserPermisions IRCUserManager::getUserChannelPerms ( int id, int channel ) +trIRCChannelUserPermissions IRCUserManager::getUserChannelPerms ( int id, int channel ) { trIRCChannelRecord &channelRecord = getChannelInfo(channel); return channelRecord.userPerms.find(id)->second; } -trIRCChannelUserPermisions IRCUserManager::getUserChannelPerms ( int id, std::string& channel ) +trIRCChannelUserPermissions IRCUserManager::getUserChannelPerms ( int id, std::string& channel ) { trIRCChannelRecord &channelRecord = getChannelInfo(channel); return channelRecord.userPerms.find(id)->second; } -trIRCChannelUserPermisions IRCUserManager::getUserChannelPerms ( std::string &name, int channel ) +trIRCChannelUserPermissions IRCUserManager::getUserChannelPerms ( std::string &name, int channel ) { trIRCChannelRecord &channelRecord = getChannelInfo(channel); return channelRecord.userPerms.find(getUserID(name))->second; } -trIRCChannelUserPermisions IRCUserManager::getUserChannelPerms ( std::string &name, std::string& channel ) +trIRCChannelUserPermissions IRCUserManager::getUserChannelPerms ( std::string &name, std::string& channel ) { trIRCChannelRecord &channelRecord = getChannelInfo(channel); return channelRecord.userPerms.find(getUserID(name))->second; @@ -395,12 +395,12 @@ return getChannelInfo(id).name; } -trIRCChannelPermisions IRCUserManager::getChannelPerms ( int id ) +trIRCChannelPermissions IRCUserManager::getChannelPerms ( int id ) { return getChannelInfo(id).perms; } -trIRCChannelPermisions IRCUserManager::getChannelPerms ( std::string &channel ) +trIRCChannelPermissions IRCUserManager::getChannelPerms ( std::string &channel ) { return getChannelInfo(channel).perms; } @@ -450,7 +450,7 @@ trIRCChannelRecord &channel = getChannelInfo(id); std::vector<int> userList; - std::map<int,trIRCChannelUserPermisions>::iterator itr = channel.userPerms.begin(); + std::map<int,trIRCChannelUserPermissions>::iterator itr = channel.userPerms.begin(); while ( itr != channel.userPerms.end() ) userList.push_back((itr++)->first); @@ -462,7 +462,7 @@ trIRCChannelRecord &channel = getChannelInfo(name); std::vector<int> userList; - std::map<int,trIRCChannelUserPermisions>::iterator itr = channel.userPerms.begin(); + std::map<int,trIRCChannelUserPermissions>::iterator itr = channel.userPerms.begin(); while ( itr != channel.userPerms.end() ) userList.push_back((itr++)->first); @@ -474,7 +474,7 @@ trIRCChannelRecord &channel = getChannelInfo(id); std::vector<std::string> userList; - std::map<int,trIRCChannelUserPermisions>::iterator itr = channel.userPerms.begin(); + std::map<int,trIRCChannelUserPermissions>::iterator itr = channel.userPerms.begin(); while ( itr != channel.userPerms.end() ) userList.push_back(getUserNick((itr++)->first)); @@ -486,7 +486,7 @@ trIRCChannelRecord &channel = getChannelInfo(name); std::vector<std::string> userList; - std::map<int,trIRCChannelUserPermisions>::iterator itr = channel.userPerms.begin(); + std::map<int,trIRCChannelUserPermissions>::iterator itr = channel.userPerms.begin(); while ( itr != channel.userPerms.end() ) userList.push_back(getUserNick((itr++)->first)); @@ -510,7 +510,7 @@ trIRCChannelRecord &channelRecord = getChannelInfo(channel); trIRCUserRecord &userRecord = getUserInfo(user); - trIRCChannelUserPermisions perms; + trIRCChannelUserPermissions perms; setDefaultChannelUserPerms(perms); channelRecord.userPerms[userRecord.id] = perms; @@ -524,7 +524,7 @@ std::string nick = getUserNick(user); trIRCUserRecord &userRecord = getUserInfo(nick); - trIRCChannelUserPermisions perms; + trIRCChannelUserPermissions perms; setDefaultChannelUserPerms(perms); channelRecord.userPerms[userRecord.id] = perms; @@ -538,7 +538,7 @@ std::string nick = getCleanNick(user); trIRCUserRecord &userRecord = getUserInfo(nick); - trIRCChannelUserPermisions perms; + trIRCChannelUserPermissions perms; setDefaultChannelUserPerms(perms); if ( user[0] == '@') @@ -558,7 +558,7 @@ std::string nick = getCleanNick(user); trIRCUserRecord &userRecord = getUserInfo(nick); - trIRCChannelUserPermisions perms; + trIRCChannelUserPermissions perms; setDefaultChannelUserPerms(perms); if ( user[0] == '@' ) @@ -923,7 +923,7 @@ return string_util::tolower(name); } -void IRCUserManager::setDefaultUserPerms ( trIRCUserPermisions &perms ) +void IRCUserManager::setDefaultUserPerms ( trIRCUserPermissions &perms ) { perms.mode = ""; perms.ircOp = false; @@ -937,7 +937,7 @@ perms.idle = false; } -void IRCUserManager::setDefaultChannelPerms ( trIRCChannelPermisions &perms ) +void IRCUserManager::setDefaultChannelPerms ( trIRCChannelPermissions &perms ) { perms.mode = ""; perms.allowColors = true; @@ -955,7 +955,7 @@ perms.reducedModeraton = false; } -void IRCUserManager::setDefaultChannelUserPerms ( trIRCChannelUserPermisions &perms ) +void IRCUserManager::setDefaultChannelUserPerms ( trIRCChannelUserPermissions &perms ) { perms.mode = ""; perms.chanOp = false; @@ -963,7 +963,7 @@ perms.quieted= false; } -void IRCUserManager::parseUserPerms ( std::string mode, trIRCUserPermisions &perms ) +void IRCUserManager::parseUserPerms ( std::string mode, trIRCUserPermissions &perms ) { perms.mode = mode; perms.ircOp = false; @@ -973,7 +973,7 @@ perms.inviteable = !string_util::charExists(mode,'I'); } -void IRCUserManager::parseChannelPerms ( std::string mode, trIRCChannelPermisions &perms ) +void IRCUserManager::parseChannelPerms ( std::string mode, trIRCChannelPermissions &perms ) { perms.mode = mode; perms.allowColors = string_util::charExists(mode,'c'); @@ -990,7 +990,7 @@ perms.reducedModeraton = string_util::charExists(mode,'z'); } -void IRCUserManager::parseChannelUserPerms ( std::string mode, trIRCChannelUserPermisions &perms ) +void IRCUserManager::parseChannelUserPerms ( std::string mode, trIRCChannelUserPermissions &perms ) { perms.mode = mode; perms.chanOp = string_util::charExists(mode,'o'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2007-11-16 01:15:58
|
Revision: 323 http://libirc.svn.sourceforge.net/libirc/?rev=323&view=rev Author: brlcad Date: 2007-11-15 17:15:52 -0800 (Thu, 15 Nov 2007) Log Message: ----------- test Modified Paths: -------------- trunk/libirc/README trunk/libirc/examples/Makefile.am trunk/libirc/examples/stupidBot/sample.cfg trunk/libirc/src/ircBasicCommands.cpp Modified: trunk/libirc/README =================================================================== --- trunk/libirc/README 2007-11-16 01:10:02 UTC (rev 322) +++ trunk/libirc/README 2007-11-16 01:15:52 UTC (rev 323) @@ -59,3 +59,4 @@ For more immediate and interactive communication, please visit the developers on the Freenode IRC network (irc.freenode.net, port 6667) in #brlcad. See http://irchelp.org/ if you're new to IRC. + Modified: trunk/libirc/examples/Makefile.am =================================================================== --- trunk/libirc/examples/Makefile.am 2007-11-16 01:10:02 UTC (rev 322) +++ trunk/libirc/examples/Makefile.am 2007-11-16 01:15:52 UTC (rev 323) @@ -3,10 +3,12 @@ SUBDIRS = \ simpleIRCConnect \ simpleTCPConnect \ - spamBot \ stupidBot \ stupidServer +EXTRA_DIST = \ + spamBot + MAINTAINERCLEANFILES = Makefile.in include $(top_srcdir)/misc/Makefile.defs Modified: trunk/libirc/examples/stupidBot/sample.cfg =================================================================== --- trunk/libirc/examples/stupidBot/sample.cfg 2007-11-16 01:10:02 UTC (rev 322) +++ trunk/libirc/examples/stupidBot/sample.cfg 2007-11-16 01:15:52 UTC (rev 323) @@ -1,25 +1,26 @@ -nick:stupidBot -nick:stupiderBot -nick:stupiderBot2 +nick:CIA-MIA +nick:CIA-DOA +nick:CIA-NOHUG server:irc.freenode.net port:6667 -username: libirc +username:relay host:localhost -realname:"a lib irc sample" +realname:"a libIRC CIA relay bot" -channel:#libirc +channel:#libIRC +channel:#bzflag +//channel:#emesene +//channel:#norganna +channel:#commits -master:YOUR_USERNAME - -joinmessage:#libirc "Yet another StupidBot reporting for duty" - -dontknow:"huh?" - -part:"bye" -quit: "quiting" - -action:dance "waves it like it just don't care" -factoid:status "online" -factoid:ping "pong" +ciaecho:#commits libirc #libirc +ciaecho:#commits libirc #bzflag +ciaecho:#commits bzflag #bzflag +ciaecho:#commits gplib #bzflag +ciaecho:#commits opencombat #bzflag +//ciaecho:#commits emesene #emesene +//ciaecho:#commits auctioneer #norganna +//ciaecho:#commits gatherer #norganna +//ciaecho:#commits norganna-libs #norganna Modified: trunk/libirc/src/ircBasicCommands.cpp =================================================================== --- trunk/libirc/src/ircBasicCommands.cpp 2007-11-16 01:10:02 UTC (rev 322) +++ trunk/libirc/src/ircBasicCommands.cpp 2007-11-16 01:15:52 UTC (rev 323) @@ -261,7 +261,7 @@ bool IRCClientPrivMsgCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { - client.privMessage(info); + // client.privMessage(info); return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Jef...@us...> - 2007-11-16 03:08:21
|
Revision: 329 http://libirc.svn.sourceforge.net/libirc/?rev=329&view=rev Author: JeffM2501 Date: 2007-11-15 19:08:18 -0800 (Thu, 15 Nov 2007) Log Message: ----------- send the connection event when we first get some data, not when the MOTD is done. This gives us the best possible state as early as possible. Modified Paths: -------------- trunk/libirc/include/IRCClient.h trunk/libirc/src/IRCClient.cpp trunk/libirc/src/irClientEvents.cpp Modified: trunk/libirc/include/IRCClient.h =================================================================== --- trunk/libirc/include/IRCClient.h 2007-11-16 01:52:22 UTC (rev 328) +++ trunk/libirc/include/IRCClient.h 2007-11-16 03:08:18 UTC (rev 329) @@ -269,6 +269,7 @@ teIRCConnectionState ircConnectionState; bool registered; + bool connected; virtual teIRCConnectionState getConnectionState ( void ){return ircConnectionState;} virtual void setConnectionState ( teIRCConnectionState state ){ircConnectionState = state;} Modified: trunk/libirc/src/IRCClient.cpp =================================================================== --- trunk/libirc/src/IRCClient.cpp 2007-11-16 01:52:22 UTC (rev 328) +++ trunk/libirc/src/IRCClient.cpp 2007-11-16 03:08:18 UTC (rev 329) @@ -65,6 +65,7 @@ ircServerPort = _DEFAULT_IRC_PORT; ircConnectionState = eNotConnected; logHandler = &defaultLogger; + connected = false; } // irc client @@ -85,6 +86,7 @@ { minCycleTime = 0.1f; registered = false; + connected = false; nickname = ""; // if any old conenctions are around, kill em if (netHandler) @@ -112,6 +114,7 @@ if (!netHandler && (!tcpClient || !server.size())) return false; + connected = false; reportedServerHost = ircServerName = server; ircServerPort = _DEFAULT_IRC_PORT; if ( port > 0 ) @@ -130,6 +133,7 @@ bool IRCClient::disconnect ( std::string reason ) { + connected = false; if (ircConnectionState >= eLoggedIn) { if (!reason.size()) @@ -214,6 +218,18 @@ std::string theLine = lastRecevedData; tvPacketList &packets = connection->getPackets(); + if (!connected) + { + // we know we are connected here cus we have data pending + if (getConnectionState() < eTCPConenct) + setConnectionState(eTCPConenct); + + trBaseEventInfo info; // no info + callEventHandler(eIRCConnectedEvent,info); + + connected = false; + } + while(packets.size()) { TCPPacket &packet = *(packets.begin()); Modified: trunk/libirc/src/irClientEvents.cpp =================================================================== --- trunk/libirc/src/irClientEvents.cpp 2007-11-16 01:52:22 UTC (rev 328) +++ trunk/libirc/src/irClientEvents.cpp 2007-11-16 03:08:18 UTC (rev 329) @@ -46,13 +46,8 @@ void IRCClient::endMOTD ( void ) { - // we know we are conencted here - if (getConnectionState() < eTCPConenct) - setConnectionState(eTCPConenct); - trBaseEventInfo info; // no info callEventHandler(eIRCEndMOTDEvent,info); - callEventHandler(eIRCConnectedEvent,info); } void IRCClient::joinMessage ( BaseIRCCommandInfo &info ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2007-11-16 06:58:57
|
Revision: 333 http://libirc.svn.sourceforge.net/libirc/?rev=333&view=rev Author: brlcad Date: 2007-11-15 22:58:55 -0800 (Thu, 15 Nov 2007) Log Message: ----------- s/receve/receive/g Modified Paths: -------------- trunk/libirc/examples/simpleIRCConnect/src/simpleIRCConnect.cpp trunk/libirc/examples/simpleTCPConnect/readme.txt trunk/libirc/examples/spamBot/src/spamBot.cpp trunk/libirc/examples/stupidServer/src/stupidServer.cpp trunk/libirc/include/IRCClient.h trunk/libirc/include/IRCServer.h trunk/libirc/include/TCPConnection.h trunk/libirc/src/IRCClient.cpp trunk/libirc/src/IRCServer.cpp trunk/libirc/src/ircBasicCommands.cpp trunk/libirc/src/ircBasicCommands.h Modified: trunk/libirc/examples/simpleIRCConnect/src/simpleIRCConnect.cpp =================================================================== --- trunk/libirc/examples/simpleIRCConnect/src/simpleIRCConnect.cpp 2007-11-16 06:58:05 UTC (rev 332) +++ trunk/libirc/examples/simpleIRCConnect/src/simpleIRCConnect.cpp 2007-11-16 06:58:55 UTC (rev 333) @@ -32,7 +32,7 @@ { name = "ALL"; } - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { std::string line = info.raw; FILE *fp = fopen("botlog.log","at"); Modified: trunk/libirc/examples/simpleTCPConnect/readme.txt =================================================================== --- trunk/libirc/examples/simpleTCPConnect/readme.txt 2007-11-16 06:58:05 UTC (rev 332) +++ trunk/libirc/examples/simpleTCPConnect/readme.txt 2007-11-16 06:58:55 UTC (rev 333) @@ -1,5 +1,5 @@ SimpleTCPConnect -Simple example of using the low level TCP/IP connection class to connect to an IRC server, send a login, join a channel, and receve data. +Simple example of using the low level TCP/IP connection class to connect to an IRC server, send a login, join a channel, and receive data. Not the best way to do it, the full libIRC handles it better, but this is a good test of the TCP/IP classes. \ No newline at end of file Modified: trunk/libirc/examples/spamBot/src/spamBot.cpp =================================================================== --- trunk/libirc/examples/spamBot/src/spamBot.cpp 2007-11-16 06:58:05 UTC (rev 332) +++ trunk/libirc/examples/spamBot/src/spamBot.cpp 2007-11-16 06:58:55 UTC (rev 333) @@ -93,7 +93,7 @@ { public: BotNumericsHandler(); - virtual bool receve ( IRCClient &client, std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, std::string &command, BaseIRCCommandInfo &info ); }; typedef struct Modified: trunk/libirc/examples/stupidServer/src/stupidServer.cpp =================================================================== --- trunk/libirc/examples/stupidServer/src/stupidServer.cpp 2007-11-16 06:58:05 UTC (rev 332) +++ trunk/libirc/examples/stupidServer/src/stupidServer.cpp 2007-11-16 06:58:55 UTC (rev 333) @@ -40,7 +40,7 @@ { name = "ALL"; } - virtual bool receve ( IRCServer *server, IRCServerConnectedClient *client, const std::string &command, const BaseIRCCommandInfo &info ); + virtual bool receive ( IRCServer *server, IRCServerConnectedClient *client, const std::string &command, const BaseIRCCommandInfo &info ); }; MyCommandHandler allHandler; @@ -98,7 +98,7 @@ } -bool MyCommandHandler::receve ( IRCServer *server, IRCServerConnectedClient *client, const std::string &command, const BaseIRCCommandInfo &info ) +bool MyCommandHandler::receive ( IRCServer *server, IRCServerConnectedClient *client, const std::string &command, const BaseIRCCommandInfo &info ) { if ( info.raw.size() ) { Modified: trunk/libirc/include/IRCClient.h =================================================================== --- trunk/libirc/include/IRCClient.h 2007-11-16 06:58:05 UTC (rev 332) +++ trunk/libirc/include/IRCClient.h 2007-11-16 06:58:55 UTC (rev 333) @@ -68,11 +68,11 @@ // called when the system wishes to know the name of this command virtual std::string getCommandName ( void ){return name;} - // the send and receve methods return true if the default handler is to be called + // the send and receive methods return true if the default handler is to be called // it is recomended that the default ALWAYS be called, as it often sets internal data for other mesages - // called when the client receves a command of this type - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ){return true;} + // called when the client receives a command of this type + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ){return true;} // called when the user wishes to send a command of this type virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ){return true;} @@ -183,9 +183,9 @@ virtual bool sendIRCCommand ( teIRCCommands command, IRCCommandInfo &info ); virtual bool sendCTMPCommand ( teCTCPCommands command, CTCPCommandINfo &info ); - virtual bool receveCommand ( const std::string &commandName, BaseIRCCommandInfo &info ); - virtual bool receveIRCCommand ( teIRCCommands command, IRCCommandInfo &info ); - virtual bool receveCTMPCommand ( teCTCPCommands command, CTCPCommandINfo &info ); + virtual bool receiveCommand ( const std::string &commandName, BaseIRCCommandInfo &info ); + virtual bool receiveIRCCommand ( teIRCCommands command, IRCCommandInfo &info ); + virtual bool receiveCTMPCommand ( teCTCPCommands command, CTCPCommandINfo &info ); // -------------------------------------------------------------------------------------- // generaly not called by the client app @@ -274,7 +274,7 @@ virtual teIRCConnectionState getConnectionState ( void ){return ircConnectionState;} virtual void setConnectionState ( teIRCConnectionState state ){ircConnectionState = state;} - // receved data processing + // received data processing void processIRCLine ( std::string line ); void addDataToLine ( std::string &line, unsigned int len, const char *data ); Modified: trunk/libirc/include/IRCServer.h =================================================================== --- trunk/libirc/include/IRCServer.h 2007-11-16 06:58:05 UTC (rev 332) +++ trunk/libirc/include/IRCServer.h 2007-11-16 06:58:55 UTC (rev 333) @@ -113,11 +113,11 @@ // called when the system wishes to know the name of this command virtual std::string getCommandName ( void ){return name;} - // the send and receve methods return true if the default handler is to be called + // the send and receive methods return true if the default handler is to be called // it is recomended that the default ALWAYS be called, as it often sets internal data for other mesages - // called when the client receves a command of this type - virtual bool receve ( IRCServer *server, IRCServerConnectedClient *client, const std::string &command, const BaseIRCCommandInfo &info ){return true;} + // called when the client receives a command of this type + virtual bool receive ( IRCServer *server, IRCServerConnectedClient *client, const std::string &command, const BaseIRCCommandInfo &info ){return true;} // called when the user wishes to send a command of this type virtual bool send ( IRCServer *server, IRCServerConnectedClient *client, const std::string &command, const BaseIRCCommandInfo &info ){return true;} @@ -172,7 +172,7 @@ IRCServerChannel *getChannel ( const std::string& name ); // commands - virtual bool receveCommand ( const std::string &commandName, IRCServerConnectedClient *client, const BaseIRCCommandInfo &info ); + virtual bool receiveCommand ( const std::string &commandName, IRCServerConnectedClient *client, const BaseIRCCommandInfo &info ); //command handler methods... for lower level API virtual bool registerCommandHandler ( IRCServerCommandHandler *handler ); Modified: trunk/libirc/include/TCPConnection.h =================================================================== --- trunk/libirc/include/TCPConnection.h 2007-11-16 06:58:05 UTC (rev 332) +++ trunk/libirc/include/TCPConnection.h 2007-11-16 06:58:55 UTC (rev 333) @@ -113,7 +113,7 @@ unsigned int getReadChunkSize ( void ); // data pending listeners - // let the people register a callback class to be called when data is receved + // let the people register a callback class to be called when data is received void addListener ( TCPClientDataPendingListener* listener ); void removeListener ( TCPClientDataPendingListener* listener ); @@ -232,7 +232,7 @@ teTCPError setError ( teTCPError error ); // data pending listeners - // let the people register a callback class to be called when data is receved + // let the people register a callback class to be called when data is received void addListener ( TCPServerDataPendingListener* listener ); void removeListener ( TCPServerDataPendingListener* listener ); Modified: trunk/libirc/src/IRCClient.cpp =================================================================== --- trunk/libirc/src/IRCClient.cpp 2007-11-16 06:58:05 UTC (rev 332) +++ trunk/libirc/src/IRCClient.cpp 2007-11-16 06:58:55 UTC (rev 333) @@ -261,13 +261,13 @@ commandInfo.source = getServerHost(); // call the "ALL" handler special if there is one - receveCommand(std::string("ALL"),commandInfo); + receiveCommand(std::string("ALL"),commandInfo); if (atoi(commandInfo.command.c_str()) != 0) - receveCommand(std::string("NUMERIC"),commandInfo); + receiveCommand(std::string("NUMERIC"),commandInfo); // notify any handlers for this specific command - receveCommand(commandInfo.command,commandInfo); + receiveCommand(commandInfo.command,commandInfo); } bool IRCClient::sendIRCCommandToServer ( teIRCCommands command, std::string &data) @@ -418,7 +418,7 @@ return sendCommand(info.command,info); } -bool IRCClient::receveCommand ( const std::string &commandName, BaseIRCCommandInfo &info ) +bool IRCClient::receiveCommand ( const std::string &commandName, BaseIRCCommandInfo &info ) { tmUserCommandHandlersMap::iterator commandListItr = userCommandHandlers.find(commandName); @@ -433,7 +433,7 @@ std::vector<IRCClientCommandHandler*>::iterator itr = commandListItr->second.begin(); while (itr != commandListItr->second.end()) { - if ( (*itr)->receve(*this,commandName,info)) + if ( (*itr)->receive(*this,commandName,info)) callDefault = true; itr++; } @@ -446,25 +446,25 @@ tmCommandHandlerMap::iterator itr = defaultCommandHandlers.find(commandName); if (itr != defaultCommandHandlers.end()) { - itr->second->receve(*this,commandName,info); + itr->second->receive(*this,commandName,info); return true; } } return false; } -bool IRCClient::receveIRCCommand ( teIRCCommands command, IRCCommandInfo &info ) +bool IRCClient::receiveIRCCommand ( teIRCCommands command, IRCCommandInfo &info ) { info.type = eIRCCommand; info.ircCommand = command; - return receveCommand(info.command,info); + return receiveCommand(info.command,info); } -bool IRCClient::receveCTMPCommand ( teCTCPCommands command, CTCPCommandINfo &info ) +bool IRCClient::receiveCTMPCommand ( teCTCPCommands command, CTCPCommandINfo &info ) { info.type = eCTCPCommand; info.ctcpCommand = command; - return receveCommand(info.command,info); + return receiveCommand(info.command,info); } bool IRCClient::registerCommandHandler ( IRCClientCommandHandler *handler ) Modified: trunk/libirc/src/IRCServer.cpp =================================================================== --- trunk/libirc/src/IRCServer.cpp 2007-11-16 06:58:05 UTC (rev 332) +++ trunk/libirc/src/IRCServer.cpp 2007-11-16 06:58:55 UTC (rev 333) @@ -447,16 +447,16 @@ void IRCServer::clientIRCCommand ( const BaseIRCCommandInfo &command, IRCServerConnectedClient *client ) { - receveCommand(std::string("ALL"),client,command); + receiveCommand(std::string("ALL"),client,command); if (atoi(command.command.c_str()) != 0) - receveCommand( std::string("NUMERIC"),client,command); + receiveCommand( std::string("NUMERIC"),client,command); // notify any handlers for this specific command - receveCommand(command.command,client,command); + receiveCommand(command.command,client,command); } -bool IRCServer::receveCommand ( const std::string &commandName, IRCServerConnectedClient *client, const BaseIRCCommandInfo &info ) +bool IRCServer::receiveCommand ( const std::string &commandName, IRCServerConnectedClient *client, const BaseIRCCommandInfo &info ) { tmCommandHandlerListMap::iterator itr = userCommandHandlers.find(commandName); if ( itr != userCommandHandlers.end() ) @@ -464,7 +464,7 @@ bool callDefault = false; for ( unsigned int i = 0; i < (unsigned int) itr->second.size(); i++ ) { - if ( itr->second[i]->receve(this,client,commandName,info)) + if ( itr->second[i]->receive(this,client,commandName,info)) callDefault = true; } if (!callDefault) @@ -473,7 +473,7 @@ tmCommandHandlerMap::iterator defaultIter = defaultCommandHandlers.find(commandName); if ( defaultIter != defaultCommandHandlers.end() && defaultIter->second ) - return defaultIter->second->receve(this,client,commandName,info); + return defaultIter->second->receive(this,client,commandName,info); return false; } Modified: trunk/libirc/src/ircBasicCommands.cpp =================================================================== --- trunk/libirc/src/ircBasicCommands.cpp 2007-11-16 06:58:05 UTC (rev 332) +++ trunk/libirc/src/ircBasicCommands.cpp 2007-11-16 06:58:55 UTC (rev 333) @@ -25,7 +25,7 @@ name = "NICK"; } -bool IRCClientNickCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientNickCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { client.nickCommand(info); return true; @@ -51,7 +51,7 @@ name = "USER"; } -bool IRCClientUserCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientUserCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { return true; } @@ -75,7 +75,7 @@ name = "PING"; } -bool IRCClientPingCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientPingCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { IRCCommandInfo ircInfo; ircInfo.command = eCMD_PONG; @@ -99,7 +99,7 @@ name = "PONG"; } -bool IRCClientPongCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientPongCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { // we do nothing on a pong return true; @@ -121,7 +121,7 @@ name = "NOTICE"; } -bool IRCClientNoticeCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientNoticeCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { trClientMessageEventInfo messageInfo; @@ -145,7 +145,7 @@ name = "JOIN"; } -bool IRCClientJoinCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientJoinCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { client.joinMessage(info); return true; @@ -182,7 +182,7 @@ name = "PART"; } -bool IRCClientPartCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientPartCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { client.partMessage(info); return true; @@ -206,7 +206,7 @@ name = "QUIT"; } -bool IRCClientQuitCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientQuitCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { client.QuitMessage(info); return true; @@ -230,7 +230,7 @@ name = "MODE"; } -bool IRCClientModeCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientModeCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { // we got a mode message, see what the deal is client.modeCommand(info); @@ -259,7 +259,7 @@ name = "PRIVMSG"; } -bool IRCClientPrivMsgCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientPrivMsgCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { client.privMessage(info); return true; @@ -284,7 +284,7 @@ name = "KICK"; } -bool IRCClientKickCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientKickCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { client.kickCommand(info); return true; @@ -311,7 +311,7 @@ name = "ALL"; } -bool IRCClientALLCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientALLCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { // just log it out client.log(string_util::format("ALL::command %s from %s for %s containing %s",info.command.c_str(),info.source.c_str(),info.target.c_str(),info.getAsString().c_str()),4); @@ -334,7 +334,7 @@ name = "NUMERIC"; } -bool IRCClientNumericCommand::receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) +bool IRCClientNumericCommand::receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ) { int numeric = atoi(info.command.c_str()); Modified: trunk/libirc/src/ircBasicCommands.h =================================================================== --- trunk/libirc/src/ircBasicCommands.h 2007-11-16 06:58:05 UTC (rev 332) +++ trunk/libirc/src/ircBasicCommands.h 2007-11-16 06:58:55 UTC (rev 333) @@ -23,7 +23,7 @@ { public: IRCClientALLCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; @@ -32,7 +32,7 @@ { public: IRCClientNumericCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; // Text based IRC commands @@ -43,7 +43,7 @@ { public: IRCClientNickCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; @@ -53,7 +53,7 @@ { public: IRCClientUserCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; @@ -63,7 +63,7 @@ { public: IRCClientPingCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; @@ -73,7 +73,7 @@ { public: IRCClientPongCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; @@ -83,7 +83,7 @@ { public: IRCClientNoticeCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; @@ -93,7 +93,7 @@ { public: IRCClientJoinCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; @@ -103,7 +103,7 @@ { public: IRCClientPartCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; @@ -113,7 +113,7 @@ { public: IRCClientQuitCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; @@ -123,7 +123,7 @@ { public: IRCClientModeCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; @@ -133,7 +133,7 @@ { public: IRCClientPrivMsgCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; @@ -143,7 +143,7 @@ { public: IRCClientKickCommand(); - virtual bool receve ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); + virtual bool receive ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); virtual bool send ( IRCClient &client, const std::string &command, BaseIRCCommandInfo &info ); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Jef...@us...> - 2007-11-16 23:16:44
|
Revision: 335 http://libirc.svn.sourceforge.net/libirc/?rev=335&view=rev Author: JeffM2501 Date: 2007-11-16 15:16:40 -0800 (Fri, 16 Nov 2007) Log Message: ----------- start a static lib to consolidate the IRC bot logic into a more manageable class. Modified Paths: -------------- trunk/libirc/Makefile.am trunk/libirc/examples/stupidBot/sample.cfg Added Paths: ----------- trunk/libirc/botlib/ trunk/libirc/botlib/Makefile.am trunk/libirc/botlib/inc/ trunk/libirc/botlib/inc/botlib.h trunk/libirc/botlib/src/ trunk/libirc/botlib/src/botlib.cpp trunk/libirc/botlib/vc7.1/ trunk/libirc/botlib/vc7.1/botlib.sln trunk/libirc/botlib/vc7.1/botlib.vcproj trunk/libirc/botlib/vc8/ Modified: trunk/libirc/Makefile.am =================================================================== --- trunk/libirc/Makefile.am 2007-11-16 22:24:20 UTC (rev 334) +++ trunk/libirc/Makefile.am 2007-11-16 23:16:40 UTC (rev 335) @@ -9,15 +9,18 @@ EXAMPLES= endif + SUBDIRS = \ include \ m4 \ misc \ src \ + botlib \ $(EXAMPLES) DIST_SUBDIRS = \ examples \ + botlib \ include \ m4 \ misc \ Added: trunk/libirc/botlib/Makefile.am =================================================================== --- trunk/libirc/botlib/Makefile.am (rev 0) +++ trunk/libirc/botlib/Makefile.am 2007-11-16 23:16:40 UTC (rev 335) @@ -0,0 +1,13 @@ +# $Id: Makefile.am 234 2007-07-31 09:07:21Z brlcad $ + +SUBDIRS = \ + src \ + inc + +EXTRA_DIST = \ + vc7.1 \ + vc8 + +MAINTAINERCLEANFILES = Makefile.in + +include $(top_srcdir)/misc/Makefile.defs Added: trunk/libirc/botlib/inc/botlib.h =================================================================== --- trunk/libirc/botlib/inc/botlib.h (rev 0) +++ trunk/libirc/botlib/inc/botlib.h 2007-11-16 23:16:40 UTC (rev 335) @@ -0,0 +1,158 @@ +/* libIRC +* Copyright (c) 2007 Christopher Sean Morrison +* +* This package is free software; you can redistribute it and/or +* modify it under the terms of the license found in the file +* named LICENSE that should have accompanied this file. +* +* THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR +* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED +* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. +*/ + +#ifndef _LIBIRC_BOTLIB_H_ +#define _LIBIRC_BOTLIB_H_ + +#include "libIRC.h" +#include "IRCTextUtils.h" + +class LibIRCBotConfigDataValue +{ +public: + LibIRCBotConfigDataValue(const char* data = NULL ); + LibIRCBotConfigDataValue ( const std::string &data ); + + std::vector<std::string> params ( void ); + std::string param ( unsigned int index ); + + std::string value; +}; + +typedef std::vector<LibIRCBotConfigDataValue> LibIRCBotConfigDataValueList; + +class LibIRCBotConfigItem +{ +public: + void set ( const char *data ); + + bool write ( std::string &config ); + + std::string key; + LibIRCBotConfigDataValueList values; +}; + +typedef std::map<std::string,LibIRCBotConfigItem> LibIRCBotConfigItemMap; + +class LibIRCBotConfig +{ +public: + LibIRCBotConfig( const char* file = NULL ); + ~LibIRCBotConfig(); + + bool read ( const char * file ); + bool write ( const char * file ); + + LibIRCBotConfigDataValueList& getKeyItems( const char* key ); + LibIRCBotConfigDataValueList& getKeyItems( const std::string &key ); + + void addItem ( const char* key, const char* value ); + void addItem ( const std::string &key, const std::string &value ); + +protected: + LibIRCBotConfigItemMap items; +}; + +typedef struct +{ + std::string server; + int port; + + std::string hostmask; + std::string username; + + std::vector<std::string> nicks; + std::vector<std::string> channels; + + std::string serverPassword; + std::string nickservPassword; +}trLibIRCConnectionRecord; + +class LibIRCBot +{ +public: + LibIRCBot(); + virtual ~LibIRCBot(); + + // called before connection to set the connection info for the bot + virtual void init ( trLibIRCConnectionRecord &conRec ) = 0; + + // called before run and the main update loop + // when using the built in main + // return true if you want to quit out after + // parsing the command line options + virtual bool prerun ( int argc, char *argv[] ) { return false; } + + // called to start the server run the vents + // will be blocking untill quit is called. + // will sleep for the sleepTime each loop + int run ( void ); + + // called once for each update loop + // called internaly buy run, but can be called + // manualy if not using run and you want to + // mix the bot into your own code + bool runOneLoop ( void ); + +protected: + float sleepTime; + +public: + trLibIRCConnectionRecord connectionRecord; + + bool connect ( void ); +}; + +#ifndef _LIBIRC_NO_BOTMAIN +extern LibIRCBot *theBot; +#endif + +#ifdef _WIN32 +#ifndef _NO_WINMAIN +#define _USE_WINMAIN +#endif +#endif + +#ifdef _USE_WINMAIN +#include <windows.h> +int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) +{ + std::vector<std::string> cliParams = string_util::tokenize(std::string(lpCmdLine),std::string(" ")); + int argc = (int)cliParams.size(); + char** argv = (char**)malloc(sizeof(char*) * argc); + for ( int i = 0; i < argc; i++ ) + argv[i] = (char*)cliParams[i].c_str(); +#else +int main ( int argc, char *argv[] ) +{ +#endif + LibIRCBot *bot = theBot; + if (!bot || bot->prerun(argc,argv)) + return -1; + bot->run(); + +#ifdef _USE_WINMAIN + free(argv); +#endif + return 0; +} + +#endif //_LIBIRC_BOTLIB_H_ + + +// Local Variables: *** +// mode:C++ *** +// tab-width: 8 *** +// c-basic-offset: 2 *** +// indent-tabs-mode: t *** +// End: *** +// ex: shiftwidth=2 tabstop=8 Property changes on: trunk/libirc/botlib/inc/botlib.h ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/libirc/botlib/src/botlib.cpp =================================================================== --- trunk/libirc/botlib/src/botlib.cpp (rev 0) +++ trunk/libirc/botlib/src/botlib.cpp 2007-11-16 23:16:40 UTC (rev 335) @@ -0,0 +1,115 @@ +/* libIRC +* Copyright (c) 2007 Christopher Sean Morrison +* +* This package is free software; you can redistribute it and/or +* modify it under the terms of the license found in the file +* named LICENSE that should have accompanied this file. +* +* THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR +* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED +* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. +*/ + +#include "botlib.h" + +#ifndef _LIBIRC_NO_BOTMAIN +LibIRCBot *theBot = NULL; +#endif + +LibIRCBot::LibIRCBot() +{ +#ifndef _LIBIRC_NO_BOTMAIN + theBot = this; +#endif + + sleepTime = 1; +} + +LibIRCBot::~LibIRCBot() +{ +#ifndef _LIBIRC_NO_BOTMAIN + theBot = NULL; +#endif +} + + +int LibIRCBot::run ( void ) +{ + init(connectionRecord); + if (!connect()) + return -1; + + while (!runOneLoop()) + IRCOSSleep(sleepTime) +} + +bool LibIRCBot::runOneLoop ( void ) +{ + return true; +} + +bool LibIRCBot::connect ( void ) +{ + return true; +} + + +//----------------LibIRCBotConfigItem +void LibIRCBotConfigItem::set( const char *data ) +{ +} + +bool LibIRCBotConfigItem::write( std::string &config ) +{ +} + +//----------------LibIRCBotConfig +LibIRCBotConfig::LibIRCBotConfig( const char* file ) +{ + if (file) + read(file); +} + +LibIRCBotConfig::~LibIRCBotConfig() +{ +} + +bool LibIRCBotConfig::read ( const char * file ) +{ + return false; +} + +bool LibIRCBotConfig::write ( const char * file ) +{ + return false; +} + +LibIRCBotConfigDataValueList& LibIRCBotConfig::getKeyItems( const char* key ) +{ + static LibIRCBotConfigDataValueList list; + return list; +} + +LibIRCBotConfigDataValueList& LibIRCBotConfig::getKeyItems( const std::string &key ) +{ + static LibIRCBotConfigDataValueList list; + return list; +} + +void LibIRCBotConfig::addItem ( const char* key, const char* value ) +{ +} + +void LibIRCBotConfig::addItem ( const std::string &key, const std::string &value ) +{ +} + + + +// Local Variables: *** +// mode:C++ *** +// tab-width: 8 *** +// c-basic-offset: 2 *** +// indent-tabs-mode: t *** +// End: *** +// ex: shiftwidth=2 tabstop=8 Property changes on: trunk/libirc/botlib/src/botlib.cpp ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/libirc/botlib/vc7.1/botlib.sln =================================================================== --- trunk/libirc/botlib/vc7.1/botlib.sln (rev 0) +++ trunk/libirc/botlib/vc7.1/botlib.sln 2007-11-16 23:16:40 UTC (rev 335) @@ -0,0 +1,32 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "botlib", "botlib.vcproj", "{860D2857-1DC9-4284-8004-568C5A3942F3}" + ProjectSection(ProjectDependencies) = postProject + {C5D9B854-BC07-48F5-8E51-16A4B23D60FF} = {C5D9B854-BC07-48F5-8E51-16A4B23D60FF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libirc", "..\..\vc7.1\libirc.vcproj", "{C5D9B854-BC07-48F5-8E51-16A4B23D60FF}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {860D2857-1DC9-4284-8004-568C5A3942F3}.Debug.ActiveCfg = Debug|Win32 + {860D2857-1DC9-4284-8004-568C5A3942F3}.Debug.Build.0 = Debug|Win32 + {860D2857-1DC9-4284-8004-568C5A3942F3}.Release.ActiveCfg = Release|Win32 + {860D2857-1DC9-4284-8004-568C5A3942F3}.Release.Build.0 = Release|Win32 + {C5D9B854-BC07-48F5-8E51-16A4B23D60FF}.Debug.ActiveCfg = Debug|Win32 + {C5D9B854-BC07-48F5-8E51-16A4B23D60FF}.Debug.Build.0 = Debug|Win32 + {C5D9B854-BC07-48F5-8E51-16A4B23D60FF}.Release.ActiveCfg = Release|Win32 + {C5D9B854-BC07-48F5-8E51-16A4B23D60FF}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal Added: trunk/libirc/botlib/vc7.1/botlib.vcproj =================================================================== --- trunk/libirc/botlib/vc7.1/botlib.vcproj (rev 0) +++ trunk/libirc/botlib/vc7.1/botlib.vcproj 2007-11-16 23:16:40 UTC (rev 335) @@ -0,0 +1,125 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="botlib" + ProjectGUID="{860D2857-1DC9-4284-8004-568C5A3942F3}" + Keyword="Win32Proj"> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="Debug" + IntermediateDirectory="Debug" + ConfigurationType="4" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../inc;../../include" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="TRUE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="4"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/botlib.lib"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="Release" + IntermediateDirectory="Release" + ConfigurationType="4" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="../inc;../../include" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/botlib.lib"/> + <Tool + Name="VCMIDLTool"/> + <Tool + Name="VCPostBuildEventTool"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> + <File + RelativePath="..\src\botlib.cpp"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> + <File + RelativePath="..\inc\botlib.h"> + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> + </Filter> + <File + RelativePath=".\ReadMe.txt"> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: trunk/libirc/examples/stupidBot/sample.cfg =================================================================== --- trunk/libirc/examples/stupidBot/sample.cfg 2007-11-16 22:24:20 UTC (rev 334) +++ trunk/libirc/examples/stupidBot/sample.cfg 2007-11-16 23:16:40 UTC (rev 335) @@ -1,4 +1,4 @@ -nick:stupidBot +nick:JohnDoe1234 nick:stupiderBot nick:stupiderBot2 @@ -9,17 +9,4 @@ host:localhost realname:"a lib irc sample" -channel:#libirc - -master:YOUR_USERNAME - -joinmessage:#libirc "Yet another StupidBot reporting for duty" - -dontknow:"huh?" - -part:"bye" -quit: "quiting" - -action:dance "waves it like it just don't care" -factoid:status "online" -factoid:ping "pong" +channel:#commits This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Jef...@us...> - 2007-11-28 18:19:23
|
Revision: 348 http://libirc.svn.sourceforge.net/libirc/?rev=348&view=rev Author: JeffM2501 Date: 2007-11-28 10:19:21 -0800 (Wed, 28 Nov 2007) Log Message: ----------- Info not INfo Modified Paths: -------------- trunk/libirc/include/IRCClient.h trunk/libirc/include/libIRC.h trunk/libirc/src/IRCClient.cpp Modified: trunk/libirc/include/IRCClient.h =================================================================== --- trunk/libirc/include/IRCClient.h 2007-11-20 05:40:00 UTC (rev 347) +++ trunk/libirc/include/IRCClient.h 2007-11-28 18:19:21 UTC (rev 348) @@ -181,11 +181,11 @@ // command sending and receving methods called by handlers virtual bool sendCommand ( std::string &commandName, BaseIRCCommandInfo &info ); virtual bool sendIRCCommand ( teIRCCommands command, IRCCommandInfo &info ); - virtual bool sendCTMPCommand ( teCTCPCommands command, CTCPCommandINfo &info ); + virtual bool sendCTMPCommand ( teCTCPCommands command, CTCPCommandInfo &info ); virtual bool receiveCommand ( const std::string &commandName, BaseIRCCommandInfo &info ); virtual bool receiveIRCCommand ( teIRCCommands command, IRCCommandInfo &info ); - virtual bool receiveCTMPCommand ( teCTCPCommands command, CTCPCommandINfo &info ); + virtual bool receiveCTMPCommand ( teCTCPCommands command, CTCPCommandInfo &info ); // -------------------------------------------------------------------------------------- // generaly not called by the client app Modified: trunk/libirc/include/libIRC.h =================================================================== --- trunk/libirc/include/libIRC.h 2007-11-20 05:40:00 UTC (rev 347) +++ trunk/libirc/include/libIRC.h 2007-11-28 18:19:21 UTC (rev 348) @@ -96,7 +96,7 @@ /** * a Client To Client Protocol command */ -class CTCPCommandINfo : public BaseIRCCommandInfo +class CTCPCommandInfo : public BaseIRCCommandInfo { public: teCTCPCommands ctcpCommand; @@ -108,7 +108,7 @@ /** * a Direct Client Connect command */ -class DCCCommandINfo : public BaseIRCCommandInfo +class DCCCommandInfo : public BaseIRCCommandInfo { std::string from; std::string to; Modified: trunk/libirc/src/IRCClient.cpp =================================================================== --- trunk/libirc/src/IRCClient.cpp 2007-11-20 05:40:00 UTC (rev 347) +++ trunk/libirc/src/IRCClient.cpp 2007-11-28 18:19:21 UTC (rev 348) @@ -410,7 +410,7 @@ return sendCommand(info.command,info); } -bool IRCClient::sendCTMPCommand ( teCTCPCommands command, CTCPCommandINfo &info ) +bool IRCClient::sendCTMPCommand ( teCTCPCommands command, CTCPCommandInfo &info ) { info.type = eCTCPCommand; info.ctcpCommand = command; @@ -460,7 +460,7 @@ return receiveCommand(info.command,info); } -bool IRCClient::receiveCTMPCommand ( teCTCPCommands command, CTCPCommandINfo &info ) +bool IRCClient::receiveCTMPCommand ( teCTCPCommands command, CTCPCommandInfo &info ) { info.type = eCTCPCommand; info.ctcpCommand = command; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2007-12-03 16:26:14
|
Revision: 361 http://libirc.svn.sourceforge.net/libirc/?rev=361&view=rev Author: brlcad Date: 2007-12-03 08:26:07 -0800 (Mon, 03 Dec 2007) Log Message: ----------- credit where credit is due, assign copyright to the Jeff guy that actually wrote most of it all Modified Paths: -------------- trunk/libirc/AUTHORS trunk/libirc/autogen.sh trunk/libirc/botlib/inc/botlib.h trunk/libirc/botlib/src/botlib.cpp trunk/libirc/configure.ac trunk/libirc/examples/simpleIRCConnect/src/simpleIRCConnect.cpp trunk/libirc/examples/simpleTCPConnect/src/simpleTCPConnect.cpp trunk/libirc/examples/spamBot/src/spamBot.cpp trunk/libirc/examples/stupidBot/src/stupidBot.cpp trunk/libirc/examples/stupidServer/src/stupidServer.cpp trunk/libirc/include/IRCClient.h trunk/libirc/include/IRCEvents.h trunk/libirc/include/IRCNumerics.h trunk/libirc/include/IRCServer.h trunk/libirc/include/IRCUserManager.h trunk/libirc/include/TCPConnection.h trunk/libirc/include/ircCommands.h trunk/libirc/include/libIRC.h trunk/libirc/misc/elapsed.sh trunk/libirc/misc/vers.sh trunk/libirc/src/IRCClient.cpp trunk/libirc/src/IRCServer.cpp trunk/libirc/src/IRCUserManager.cpp trunk/libirc/src/TCPConnection.cpp trunk/libirc/src/irClientCommands.cpp trunk/libirc/src/irClientEvents.cpp trunk/libirc/src/ircBasicCommands.cpp trunk/libirc/src/ircBasicCommands.h trunk/libirc/src/ircCommands.cpp trunk/libirc/src/libIRC.cpp trunk/libirc/src/net.cpp Modified: trunk/libirc/AUTHORS =================================================================== --- trunk/libirc/AUTHORS 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/AUTHORS 2007-12-03 16:26:07 UTC (rev 361) @@ -5,7 +5,7 @@ ---------- Jeff Myers -Christopher Sean Morrison +Jeff Myers Dejan Lekic (previous codebase) Modified: trunk/libirc/autogen.sh =================================================================== --- trunk/libirc/autogen.sh 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/autogen.sh 2007-12-03 16:26:07 UTC (rev 361) @@ -69,7 +69,7 @@ # To verbosely try running with an older (unsupported) autoconf: # AUTOCONF_VERSION=2.50 ./autogen.sh --verbose # -# Author: Christopher Sean Morrison <mor...@br...> +# Author: Jeff Myers <mor...@br...> # ###################################################################### @@ -104,7 +104,7 @@ __version="" fi - echo "autogen.sh build preparation script by Christopher Sean Morrison" + echo "autogen.sh build preparation script by Jeff Myers" echo "revised 3-clause BSD-style license, copyright (c) $__copyright" echo "script version $__version, ISO/IEC 9945 POSIX shell script" } Modified: trunk/libirc/botlib/inc/botlib.h =================================================================== --- trunk/libirc/botlib/inc/botlib.h 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/botlib/inc/botlib.h 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/botlib/src/botlib.cpp =================================================================== --- trunk/libirc/botlib/src/botlib.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/botlib/src/botlib.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/configure.ac =================================================================== --- trunk/libirc/configure.ac 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/configure.ac 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ dnl BRL-CAD -dnl Copyright (c) 2004-2007 Christopher Sean Morrison +dnl Copyright (c) 2004-2007 Jeff Myers dnl dnl This program is free software; you can redistribute it and/or dnl modify it under the terms of the appropriate license described in Modified: trunk/libirc/examples/simpleIRCConnect/src/simpleIRCConnect.cpp =================================================================== --- trunk/libirc/examples/simpleIRCConnect/src/simpleIRCConnect.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/examples/simpleIRCConnect/src/simpleIRCConnect.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2004 Christopher Sean Morrison +* Copyright (c) 2004 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/examples/simpleTCPConnect/src/simpleTCPConnect.cpp =================================================================== --- trunk/libirc/examples/simpleTCPConnect/src/simpleTCPConnect.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/examples/simpleTCPConnect/src/simpleTCPConnect.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2004 Christopher Sean Morrison +* Copyright (c) 2004 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/examples/spamBot/src/spamBot.cpp =================================================================== --- trunk/libirc/examples/spamBot/src/spamBot.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/examples/spamBot/src/spamBot.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2004 Christopher Sean Morrison +* Copyright (c) 2004 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/examples/stupidBot/src/stupidBot.cpp =================================================================== --- trunk/libirc/examples/stupidBot/src/stupidBot.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/examples/stupidBot/src/stupidBot.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2004 Christopher Sean Morrison +* Copyright (c) 2004 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/examples/stupidServer/src/stupidServer.cpp =================================================================== --- trunk/libirc/examples/stupidServer/src/stupidServer.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/examples/stupidServer/src/stupidServer.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2004 Christopher Sean Morrison +* Copyright (c) 2004 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/include/IRCClient.h =================================================================== --- trunk/libirc/include/IRCClient.h 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/include/IRCClient.h 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/include/IRCEvents.h =================================================================== --- trunk/libirc/include/IRCEvents.h 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/include/IRCEvents.h 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/include/IRCNumerics.h =================================================================== --- trunk/libirc/include/IRCNumerics.h 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/include/IRCNumerics.h 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/include/IRCServer.h =================================================================== --- trunk/libirc/include/IRCServer.h 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/include/IRCServer.h 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/include/IRCUserManager.h =================================================================== --- trunk/libirc/include/IRCUserManager.h 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/include/IRCUserManager.h 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/include/TCPConnection.h =================================================================== --- trunk/libirc/include/TCPConnection.h 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/include/TCPConnection.h 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/include/ircCommands.h =================================================================== --- trunk/libirc/include/ircCommands.h 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/include/ircCommands.h 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/include/libIRC.h =================================================================== --- trunk/libirc/include/libIRC.h 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/include/libIRC.h 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC - * Copyright (c) 2007 Christopher Sean Morrison + * Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/misc/elapsed.sh =================================================================== --- trunk/libirc/misc/elapsed.sh 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/misc/elapsed.sh 2007-12-03 16:26:07 UTC (rev 361) @@ -6,7 +6,7 @@ # ### # BSD License -# Copyright (c) 2004, Christopher Sean Morrison +# Copyright (c) 2004, Jeff Myers # All rights reserved. # # Redistribution and use in source and binary forms, with or without Modified: trunk/libirc/misc/vers.sh =================================================================== --- trunk/libirc/misc/vers.sh 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/misc/vers.sh 2007-12-03 16:26:07 UTC (rev 361) @@ -6,7 +6,7 @@ # ### # BSD License -# Copyright (c) 2004, Christopher Sean Morrison +# Copyright (c) 2004, Jeff Myers # All rights reserved. # # Redistribution and use in source and binary forms, with or without Modified: trunk/libirc/src/IRCClient.cpp =================================================================== --- trunk/libirc/src/IRCClient.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/src/IRCClient.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/src/IRCServer.cpp =================================================================== --- trunk/libirc/src/IRCServer.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/src/IRCServer.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/src/IRCUserManager.cpp =================================================================== --- trunk/libirc/src/IRCUserManager.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/src/IRCUserManager.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/src/TCPConnection.cpp =================================================================== --- trunk/libirc/src/TCPConnection.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/src/TCPConnection.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/src/irClientCommands.cpp =================================================================== --- trunk/libirc/src/irClientCommands.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/src/irClientCommands.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/src/irClientEvents.cpp =================================================================== --- trunk/libirc/src/irClientEvents.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/src/irClientEvents.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/src/ircBasicCommands.cpp =================================================================== --- trunk/libirc/src/ircBasicCommands.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/src/ircBasicCommands.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/src/ircBasicCommands.h =================================================================== --- trunk/libirc/src/ircBasicCommands.h 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/src/ircBasicCommands.h 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/src/ircCommands.cpp =================================================================== --- trunk/libirc/src/ircCommands.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/src/ircCommands.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/src/libIRC.cpp =================================================================== --- trunk/libirc/src/libIRC.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/src/libIRC.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file Modified: trunk/libirc/src/net.cpp =================================================================== --- trunk/libirc/src/net.cpp 2007-12-03 16:20:13 UTC (rev 360) +++ trunk/libirc/src/net.cpp 2007-12-03 16:26:07 UTC (rev 361) @@ -1,5 +1,5 @@ /* libIRC -* Copyright (c) 2007 Christopher Sean Morrison +* Copyright (c) 2007 Jeff Myers * * This package is free software; you can redistribute it and/or * modify it under the terms of the license found in the file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2007-12-03 16:35:39
|
Revision: 365 http://libirc.svn.sourceforge.net/libirc/?rev=365&view=rev Author: brlcad Date: 2007-12-03 08:35:36 -0800 (Mon, 03 Dec 2007) Log Message: ----------- accept pelya's sf patch [ 1843257 ] "MSVC 6 project files" -- thanks\! Modified Paths: -------------- trunk/libirc/include/IRCTextUtils.h trunk/libirc/src/IRCServer.cpp Added Paths: ----------- trunk/libirc/vc6/ trunk/libirc/vc6/libirc.dsp trunk/libirc/vc6/libirc.dsw Modified: trunk/libirc/include/IRCTextUtils.h =================================================================== --- trunk/libirc/include/IRCTextUtils.h 2007-12-03 16:29:41 UTC (rev 364) +++ trunk/libirc/include/IRCTextUtils.h 2007-12-03 16:35:36 UTC (rev 365) @@ -443,7 +443,7 @@ std::string x; x+=f; - return find_first_of(text.begin(),text.end(),x.begin(),x.end()); + return std::find_first_of(text.begin(),text.end(),x.begin(),x.end()); } inline void eraseFirstOf ( std::string &text, char f ) Modified: trunk/libirc/src/IRCServer.cpp =================================================================== --- trunk/libirc/src/IRCServer.cpp 2007-12-03 16:29:41 UTC (rev 364) +++ trunk/libirc/src/IRCServer.cpp 2007-12-03 16:35:36 UTC (rev 365) @@ -265,11 +265,12 @@ tcpServer->disconnect(); tcpConnection.deleteServerConnection(tcpServer); tcpServer = NULL; + unsigned int i; - for (unsigned int i = 0; i < (unsigned int)clients.size(); i++ ) + for ( i = 0; i < (unsigned int)clients.size(); i++ ) deleteClient(clients[i]); - for (unsigned int i = 0; i < (unsigned int)channels.size(); i++ ) + for ( i = 0; i < (unsigned int)channels.size(); i++ ) deleteClient(clients[i]); clients.clear(); Added: trunk/libirc/vc6/libirc.dsp =================================================================== --- trunk/libirc/vc6/libirc.dsp (rev 0) +++ trunk/libirc/vc6/libirc.dsp 2007-12-03 16:35:36 UTC (rev 365) @@ -0,0 +1,202 @@ +# Microsoft Developer Studio Project File - Name="libirc" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libirc - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libirc.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libirc.mak" CFG="libirc - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libirc - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libirc - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libirc - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /MT /w /W0 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libirc - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /w /W0 /Gm /GX /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libirc - Win32 Release" +# Name "libirc - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\src\ircBasicCommands.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\IRCClient.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\ircCommands.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\irClientCommands.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\irClientEvents.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\IRCServer.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\IRCTextUtils.cxx +# End Source File +# Begin Source File + +SOURCE=..\src\IRCUserManager.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\libIRC.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\net.cpp +# End Source File +# Begin Source File + +SOURCE=..\src\TCPConnection.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Group "commandHandlers" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\src\ircBasicCommands.h +# End Source File +# End Group +# Begin Group "networking" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\include\net.h +# End Source File +# Begin Source File + +SOURCE=..\include\TCPConnection.h +# End Source File +# End Group +# Begin Group "utils" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\include\IRCTextUtils.h +# End Source File +# Begin Source File + +SOURCE=..\include\Singleton.h +# End Source File +# End Group +# Begin Group "IRC spec" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\include\ircCommands.h +# End Source File +# Begin Source File + +SOURCE=..\include\IRCNumerics.h +# End Source File +# End Group +# Begin Source File + +SOURCE=..\include\IRCClient.h +# End Source File +# Begin Source File + +SOURCE=..\include\IRCEvents.h +# End Source File +# Begin Source File + +SOURCE=..\include\IRCServer.h +# End Source File +# Begin Source File + +SOURCE=..\include\IRCUserManager.h +# End Source File +# Begin Source File + +SOURCE=..\include\libIRC.h +# End Source File +# End Group +# End Target +# End Project Property changes on: trunk/libirc/vc6/libirc.dsp ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + CRLF Added: trunk/libirc/vc6/libirc.dsw =================================================================== --- trunk/libirc/vc6/libirc.dsw (rev 0) +++ trunk/libirc/vc6/libirc.dsw 2007-12-03 16:35:36 UTC (rev 365) @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "libirc"=.\libirc.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + Property changes on: trunk/libirc/vc6/libirc.dsw ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + CRLF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2008-01-04 17:42:34
|
Revision: 368 http://libirc.svn.sourceforge.net/libirc/?rev=368&view=rev Author: brlcad Date: 2008-01-04 09:41:55 -0800 (Fri, 04 Jan 2008) Log Message: ----------- accept a patch from Barna Farag?\195?\179 that fixes the PONG reply to server PING requests Modified Paths: -------------- trunk/libirc/AUTHORS trunk/libirc/NEWS trunk/libirc/src/ircBasicCommands.cpp Modified: trunk/libirc/AUTHORS =================================================================== --- trunk/libirc/AUTHORS 2007-12-03 16:41:05 UTC (rev 367) +++ trunk/libirc/AUTHORS 2008-01-04 17:41:55 UTC (rev 368) @@ -1,3 +1,4 @@ + -*- coding: utf-8 -*- libIRC Contributors =================== @@ -12,3 +13,5 @@ VC6 build files Dejan Lekic previous 'libIRC' codebase +Barna Faragó + PONG command fix Modified: trunk/libirc/NEWS =================================================================== --- trunk/libirc/NEWS 2007-12-03 16:41:05 UTC (rev 367) +++ trunk/libirc/NEWS 2008-01-04 17:41:55 UTC (rev 368) @@ -1,3 +1,4 @@ + -*- coding: utf-8 -*- libIRC Release Notes ==================== @@ -11,6 +12,7 @@ --- 2007-09-XX Release 0.2.0 --- ---------------------------------------------------------------------- +* fixed PONG reply - Barna Faragó * fixed crash on channel departure - MasterMind (mm_202), Jeff Myers * enhancements for plugins - Jeff Myers Modified: trunk/libirc/src/ircBasicCommands.cpp =================================================================== --- trunk/libirc/src/ircBasicCommands.cpp 2007-12-03 16:41:05 UTC (rev 367) +++ trunk/libirc/src/ircBasicCommands.cpp 2008-01-04 17:41:55 UTC (rev 368) @@ -79,6 +79,7 @@ { IRCCommandInfo ircInfo; ircInfo.command = eCMD_PONG; + ircInfo.raw = info.raw; client.sendIRCCommand(eCMD_PONG,ircInfo); return true; } @@ -109,7 +110,8 @@ { IRCCommandInfo &ircInfo = (IRCCommandInfo&)info; - std::string commandLine; + std::string commandLine = info.raw.substr(5, info.raw.length()-5); + // PING client.sendIRCCommandToServer(eCMD_PONG,commandLine); return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bla...@us...> - 2008-02-07 03:56:16
|
Revision: 370 http://libirc.svn.sourceforge.net/libirc/?rev=370&view=rev Author: blast007 Date: 2008-02-06 19:56:05 -0800 (Wed, 06 Feb 2008) Log Message: ----------- s/CTMP/CTCP/ Modified Paths: -------------- trunk/libirc/include/IRCClient.h trunk/libirc/src/IRCClient.cpp Modified: trunk/libirc/include/IRCClient.h =================================================================== --- trunk/libirc/include/IRCClient.h 2008-02-06 21:20:57 UTC (rev 369) +++ trunk/libirc/include/IRCClient.h 2008-02-07 03:56:05 UTC (rev 370) @@ -181,11 +181,11 @@ // command sending and receving methods called by handlers virtual bool sendCommand ( std::string &commandName, BaseIRCCommandInfo &info ); virtual bool sendIRCCommand ( teIRCCommands command, IRCCommandInfo &info ); - virtual bool sendCTMPCommand ( teCTCPCommands command, CTCPCommandInfo &info ); + virtual bool sendCTCPCommand ( teCTCPCommands command, CTCPCommandInfo &info ); virtual bool receiveCommand ( const std::string &commandName, BaseIRCCommandInfo &info ); virtual bool receiveIRCCommand ( teIRCCommands command, IRCCommandInfo &info ); - virtual bool receiveCTMPCommand ( teCTCPCommands command, CTCPCommandInfo &info ); + virtual bool receiveCTCPCommand ( teCTCPCommands command, CTCPCommandInfo &info ); // -------------------------------------------------------------------------------------- // generaly not called by the client app Modified: trunk/libirc/src/IRCClient.cpp =================================================================== --- trunk/libirc/src/IRCClient.cpp 2008-02-06 21:20:57 UTC (rev 369) +++ trunk/libirc/src/IRCClient.cpp 2008-02-07 03:56:05 UTC (rev 370) @@ -410,7 +410,7 @@ return sendCommand(info.command,info); } -bool IRCClient::sendCTMPCommand ( teCTCPCommands command, CTCPCommandInfo &info ) +bool IRCClient::sendCTCPCommand ( teCTCPCommands command, CTCPCommandInfo &info ) { info.type = eCTCPCommand; info.ctcpCommand = command; @@ -460,7 +460,7 @@ return receiveCommand(info.command,info); } -bool IRCClient::receiveCTMPCommand ( teCTCPCommands command, CTCPCommandInfo &info ) +bool IRCClient::receiveCTCPCommand ( teCTCPCommands command, CTCPCommandInfo &info ) { info.type = eCTCPCommand; info.ctcpCommand = command; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |