X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqlutils.cpp;h=6d40ee22cc44dde0d8b30e9bec62dc335e854e8b;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=131e20e5e13a45a974d763a88515879a5687fdfa;hpb=76bf72f8c2c5b1524bf20a523fe1cf0d79d29742;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp index 131e20e5e..6d40ee22c 100644 --- a/src/modules/extra/m_sqlutils.cpp +++ b/src/modules/extra/m_sqlutils.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,25 +11,16 @@ * --------------------------------------------------- */ +#include "inspircd.h" #include -#include -#include #include - -#include "users.h" -#include "channels.h" -#include "modules.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 @@ -39,57 +30,54 @@ private: IdChanMap idchan; public: - ModuleSQLutils(InspIRCd* Me) - : Module::Module(Me) - { - ServerInstance->PublishInterface("SQLutils", this); + ModuleSQLutils() + { + ServerInstance->Modules->PublishInterface("SQLutils", this); + Implementation eventlist[] = { I_OnChannelDelete, I_OnUnloadModule, I_OnRequest, I_OnUserDisconnect }; + ServerInstance->Modules->Attach(eventlist, this, 4); } virtual ~ModuleSQLutils() { - ServerInstance->UnpublishInterface("SQLutils", this); - } - - void Implements(char* List) - { - List[I_OnChannelDelete] = List[I_OnUnloadModule] = List[I_OnRequest] = List[I_OnUserDisconnect] = 1; + ServerInstance->Modules->UnpublishInterface("SQLutils", this); } - virtual char* OnRequest(Request* request) + + virtual const char* OnRequest(Request* request) { if(strcmp(SQLUTILAU, request->GetId()) == 0) { AssociateUser* req = (AssociateUser*)request; - + iduser.insert(std::make_pair(req->id, req->user)); - + AttachList(req->user, req->id); } else if(strcmp(SQLUTILAC, request->GetId()) == 0) { AssociateChan* req = (AssociateChan*)request; - - idchan.insert(std::make_pair(req->id, req->chan)); - + + idchan.insert(std::make_pair(req->id, req->chan)); + AttachList(req->chan, req->id); } else if(strcmp(SQLUTILUA, request->GetId()) == 0) { UnAssociate* req = (UnAssociate*)request; - + /* Unassociate a given query ID with all users and channels * it is associated with. */ - + DoUnAssociate(iduser, req->id); DoUnAssociate(idchan, req->id); } else if(strcmp(SQLUTILGU, request->GetId()) == 0) { GetAssocUser* req = (GetAssocUser*)request; - + IdUserMap::iterator iter = iduser.find(req->id); - + if(iter != iduser.end()) { req->user = iter->second; @@ -97,79 +85,79 @@ public: } else if(strcmp(SQLUTILGC, request->GetId()) == 0) { - GetAssocChan* req = (GetAssocChan*)request; - + GetAssocChan* req = (GetAssocChan*)request; + IdChanMap::iterator iter = idchan.find(req->id); - + if(iter != idchan.end()) { req->chan = iter->second; } } - + 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 * associated them asks to look them up then it gets a NULL result and knows to discard the query. */ AssocIdList* il; - + if(user->GetExt("sqlutils_queryids", il)) { for(AssocIdList::iterator listiter = il->begin(); listiter != il->end(); listiter++) { IdUserMap::iterator iter; - + iter = iduser.find(*listiter); - + if(iter != iduser.end()) { 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->Logs->Log("m_sqlutils",DEBUG, "BUG: ID associated with user %s doesn't have the same User* associated with it in the map (erasing anyway)", user->nick.c_str()); } iduser.erase(iter); } else { - ServerInstance->Log(DEBUG, "BUG: user %s was extended with sqlutils_queryids but there was nothing matching in the map", user->nick); + ServerInstance->Logs->Log("m_sqlutils",DEBUG, "BUG: user %s was extended with sqlutils_queryids but there was nothing matching in the map", user->nick.c_str()); } } - + user->Shrink("sqlutils_queryids"); delete il; } } - + void AttachList(Extensible* obj, unsigned long id) { AssocIdList* il; - + if(!obj->GetExt("sqlutils_queryids", il)) { /* Doesn't already exist, create a new list and attach it. */ il = new AssocIdList; obj->Extend("sqlutils_queryids", il); } - + /* Now either way we have a valid list in il, attached. */ il->push_back(id); } - + void RemoveFromList(Extensible* obj, unsigned long id) { AssocIdList* il; - + if(obj->GetExt("sqlutils_queryids", il)) { /* Only do anything if the list exists... (which it ought to) */ il->remove(id); - + if(il->empty()) { /* If we just emptied it.. */ @@ -178,7 +166,7 @@ public: } } } - + template void DoUnAssociate(T &map, unsigned long id) { /* For each occurence of 'id' (well, only one..it's not a multimap) in 'map' @@ -186,7 +174,7 @@ public: * 'id' from the list of query IDs attached to it. */ typename T::iterator iter = map.find(id); - + if(iter != map.end()) { /* Found a value indexed by 'id', call RemoveFromList() @@ -196,68 +184,47 @@ public: RemoveFromList(iter->second, 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 * associated them asks to look them up then it gets a NULL result and knows to discard the query. */ AssocIdList* il; - + if(chan->GetExt("sqlutils_queryids", il)) { for(AssocIdList::iterator listiter = il->begin(); listiter != il->end(); listiter++) { IdChanMap::iterator iter; - + iter = idchan.find(*listiter); - + if(iter != idchan.end()) { if(iter->second != chan) { - 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); + ServerInstance->Logs->Log("m_sqlutils",DEBUG, "BUG: ID associated with channel %s doesn't have the same Channel* associated with it in the map (erasing anyway)", chan->name.c_str()); } - idchan.erase(iter); + idchan.erase(iter); } else { - ServerInstance->Log(DEBUG, "BUG: channel %s was extended with sqlutils_queryids but there was nothing matching in the map", chan->name); + ServerInstance->Logs->Log("m_sqlutils",DEBUG, "BUG: channel %s was extended with sqlutils_queryids but there was nothing matching in the map", chan->name.c_str()); } } - + chan->Shrink("sqlutils_queryids"); delete il; } } - + virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION); + return Version("Provides some utilities to SQL client modules, such as mapping queries to users and channels", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); } - -}; -class ModuleSQLutilsFactory : public ModuleFactory -{ - public: - ModuleSQLutilsFactory() - { - } - - ~ModuleSQLutilsFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSQLutils(Me); - } }; - -extern "C" void * init_module( void ) -{ - return new ModuleSQLutilsFactory; -} +MODULE_INIT(ModuleSQLutils)