X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqlutils.cpp;h=0acb6fe09c6badc57ac8b2c48ade4cbdad13659c;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=f2085cbcda270fcee75ce0ef2a2ed9fba2bba015;hpb=afa1ec0e9586d93482b5dfdc2d77e93c9499ea10;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp index f2085cbcd..0acb6fe09 100644 --- a/src/modules/extra/m_sqlutils.cpp +++ b/src/modules/extra/m_sqlutils.cpp @@ -2,197 +2,163 @@ * | 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-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/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 */ -extern InspIRCd* ServerInstance; - -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: - Server* Srv; - IdUserMap iduser; IdChanMap idchan; public: - ModuleSQLutils(Server* Me) - : Module::Module(Me), Srv(Me) + ModuleSQLutils(InspIRCd* Me) + : Module(Me) { - log(DEBUG, "%s 'SQLutils' feature", ServerInstance->PublishFeature("SQLutils", this) ? "Published" : "Couldn't publish"); + ServerInstance->Modules->PublishInterface("SQLutils", this); + Implementation eventlist[] = { I_OnChannelDelete, I_OnUnloadModule, I_OnRequest, I_OnUserDisconnect }; + ServerInstance->Modules->Attach(eventlist, this, 4); } - void Implements(char* List) + virtual ~ModuleSQLutils() { - 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; - - 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); } else if(strcmp(SQLUTILAC, request->GetId()) == 0) { AssociateChan* req = (AssociateChan*)request; - log(DEBUG, "Associated ID %lu with channel %s", req->id, req->chan->name); - - 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. */ - - log(DEBUG, "Unassociating ID %lu with all users and channels", req->id); - + 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); - - log(DEBUG, "Looking up user associated with ID %lu", req->id); - + if(iter != iduser.end()) { - log(DEBUG, "Found user %s", iter->second->nick); req->user = iter->second; } } else if(strcmp(SQLUTILGC, request->GetId()) == 0) { - GetAssocChan* req = (GetAssocChan*)request; - + GetAssocChan* req = (GetAssocChan*)request; + IdChanMap::iterator iter = idchan.find(req->id); - - log(DEBUG, "Looking up channel associated with ID %lu", req->id); - + if(iter != idchan.end()) { - log(DEBUG, "Found channel %s", iter->second->name); req->chan = iter->second; } } - else - { - 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 * 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) - { - log(DEBUG, "Erased query from map associated with quitting user %s", user->nick); - } - else + if(iter->second != user) { - 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); + iduser.erase(iter); } else { - 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.. */ @@ -201,7 +167,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' @@ -209,7 +175,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() @@ -217,84 +183,49 @@ public: * to the value. */ RemoveFromList(iter->second, id); - - log(DEBUG, "Removed query %lu from map and removed references to it on value", id); - } - else - { - 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 * 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) + if(iter->second != chan) { - log(DEBUG, "Erased query from map associated with dying channnel %s", 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()); } - else - { - 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); + idchan.erase(iter); } else { - 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, 0, 0, 0, VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER); + return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); } - - virtual ~ModuleSQLutils() - { - } -}; -class ModuleSQLutilsFactory : public ModuleFactory -{ - public: - ModuleSQLutilsFactory() - { - } - - ~ModuleSQLutilsFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleSQLutils(Me); - } }; - -extern "C" void * init_module( void ) -{ - return new ModuleSQLutilsFactory; -} +MODULE_INIT(ModuleSQLutils)