X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqlutils.cpp;h=07cecc6980151ecc781ac613e1cd32b37d4364d2;hb=2e1f86fd0c9911210b79e6ac346672441eef18c4;hp=8cddacd4283a4be109e04f606e64dda9c66f5d81;hpb=e84bf9f3ec5a60078c32b272d3d7885c0708c544;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp index 8cddacd42..07cecc698 100644 --- a/src/modules/extra/m_sqlutils.cpp +++ b/src/modules/extra/m_sqlutils.cpp @@ -2,46 +2,34 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ +#include "inspircd.h" #include -#include -#include #include - #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" -#include "inspircd.h" #include "configreader.h" - #include "m_sqlutils.h" /* $ModDesc: Provides some utilities to SQL client modules, such as mapping queries to users and channels */ +/* $ModDep: m_sqlutils.h */ - - -typedef std::map IdUserMap; -typedef std::map IdChanMap; +typedef std::map IdUserMap; +typedef std::map IdChanMap; typedef std::list AssocIdList; class ModuleSQLutils : public Module { private: - - IdUserMap iduser; IdChanMap idchan; @@ -49,9 +37,14 @@ public: ModuleSQLutils(InspIRCd* Me) : Module::Module(Me) { - ServerInstance->Log(DEBUG, "%s 'SQLutils' feature", ServerInstance->PublishFeature("SQLutils", this) ? "Published" : "Couldn't publish"); + ServerInstance->Modules->PublishInterface("SQLutils", this); } + virtual ~ModuleSQLutils() + { + ServerInstance->Modules->UnpublishInterface("SQLutils", this); + } + void Implements(char* List) { List[I_OnChannelDelete] = List[I_OnUnloadModule] = List[I_OnRequest] = List[I_OnUserDisconnect] = 1; @@ -63,8 +56,6 @@ public: { AssociateUser* req = (AssociateUser*)request; - ServerInstance->Log(DEBUG, "Associated ID %lu with user %s", req->id, req->user->nick); - iduser.insert(std::make_pair(req->id, req->user)); AttachList(req->user, req->id); @@ -72,8 +63,6 @@ public: else if(strcmp(SQLUTILAC, request->GetId()) == 0) { AssociateChan* req = (AssociateChan*)request; - - ServerInstance->Log(DEBUG, "Associated ID %lu with channel %s", req->id, req->chan->name); idchan.insert(std::make_pair(req->id, req->chan)); @@ -87,8 +76,6 @@ public: * it is associated with. */ - ServerInstance->Log(DEBUG, "Unassociating ID %lu with all users and channels", req->id); - DoUnAssociate(iduser, req->id); DoUnAssociate(idchan, req->id); } @@ -98,11 +85,8 @@ public: IdUserMap::iterator iter = iduser.find(req->id); - ServerInstance->Log(DEBUG, "Looking up user associated with ID %lu", req->id); - if(iter != iduser.end()) { - ServerInstance->Log(DEBUG, "Found user %s", iter->second->nick); req->user = iter->second; } } @@ -112,24 +96,16 @@ public: IdChanMap::iterator iter = idchan.find(req->id); - ServerInstance->Log(DEBUG, "Looking up channel associated with ID %lu", req->id); - if(iter != idchan.end()) { - ServerInstance->Log(DEBUG, "Found channel %s", iter->second->name); req->chan = iter->second; } } - else - { - ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId()); - return NULL; - } return SQLUTILSUCCESS; } - virtual void OnUserDisconnect(userrec* user) + virtual void OnUserDisconnect(User* user) { /* A user is disconnecting, first we need to check if they have a list of queries associated with them. * Then, if they do, we need to erase each of them from our IdUserMap (iduser) so when the module that @@ -147,16 +123,12 @@ public: if(iter != iduser.end()) { - if(iter->second == user) - { - ServerInstance->Log(DEBUG, "Erased query from map associated with quitting user %s", user->nick); - } - else + if(iter->second != user) { - ServerInstance->Log(DEBUG, "BUG: ID associated with user %s doesn't have the same userrec* associated with it in the map (erasing anyway)", user->nick); + ServerInstance->Log(DEBUG, "BUG: ID associated with user %s doesn't have the same User* associated with it in the map (erasing anyway)", user->nick); } - iduser.erase(iter); + iduser.erase(iter); } else { @@ -217,16 +189,10 @@ public: * to the value. */ RemoveFromList(iter->second, id); - - ServerInstance->Log(DEBUG, "Removed query %lu from map and removed references to it on value", id); - } - else - { - ServerInstance->Log(DEBUG, "Nothing associated with query %lu", id); } } - virtual void OnChannelDelete(chanrec* chan) + virtual void OnChannelDelete(Channel* chan) { /* A channel is being destroyed, first we need to check if it has a list of queries associated with it. * Then, if it does, we need to erase each of them from our IdChanMap (idchan) so when the module that @@ -244,15 +210,10 @@ public: if(iter != idchan.end()) { - if(iter->second == chan) + if(iter->second != chan) { - ServerInstance->Log(DEBUG, "Erased query from map associated with dying channnel %s", chan->name); + ServerInstance->Log(DEBUG, "BUG: ID associated with channel %s doesn't have the same Channel* associated with it in the map (erasing anyway)", chan->name); } - else - { - ServerInstance->Log(DEBUG, "BUG: ID associated with channel %s doesn't have the same chanrec* associated with it in the map (erasing anyway)", chan->name); - } - idchan.erase(iter); } else @@ -268,33 +229,9 @@ public: virtual Version GetVersion() { - return Version(1, 0, 0, 0, VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER); - } - - virtual ~ModuleSQLutils() - { - } -}; - -class ModuleSQLutilsFactory : public ModuleFactory -{ - public: - ModuleSQLutilsFactory() - { + return Version(1, 1, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION); } - ~ModuleSQLutilsFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSQLutils(Me); - } }; - -extern "C" void * init_module( void ) -{ - return new ModuleSQLutilsFactory; -} +MODULE_INIT(ModuleSQLutils)