* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
* ---------------------------------------------------
*/
+#include "inspircd.h"
#include <sstream>
-#include <string>
-#include <map>
#include <list>
-
#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<unsigned long, userrec*> IdUserMap;
-typedef std::map<unsigned long, chanrec*> IdChanMap;
+typedef std::map<unsigned long, User*> IdUserMap;
+typedef std::map<unsigned long, Channel*> IdChanMap;
typedef std::list<unsigned long> AssocIdList;
class ModuleSQLutils : public Module
{
private:
-
-
IdUserMap iduser;
IdChanMap idchan;
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);
+ 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;
- 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);
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));
* 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);
}
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;
}
}
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
if(iter != iduser.end())
{
- if(iter->second == user)
+ if(iter->second != user)
{
- ServerInstance->Log(DEBUG, "Erased query from map associated with quitting user %s", user->nick);
- }
- else
- {
- 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);
}
- iduser.erase(iter);
+ 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);
}
}
* 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
if(iter != idchan.end())
{
- if(iter->second == chan)
- {
- ServerInstance->Log(DEBUG, "Erased query from map associated with dying channnel %s", chan->name);
- }
- else
+ 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);
}
-
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);
}
}
virtual Version GetVersion()
{
- return Version(1, 1, 0, 0, VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+ return Version(1, 2, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
}
- virtual ~ModuleSQLutils()
- {
- }
};
-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)