* ---------------------------------------------------
*/
-using namespace std;
-
-#include <stdio.h>
-#include <string>
-#include <stdlib.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <poll.h>
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "configreader.h"
#include "inspircd.h"
#include "m_sqlv2.h"
static Module* SQLModule;
static Module* MyMod;
static std::string dbid;
-extern time_t TIME;
enum LogTypes { LT_OPER = 1, LT_KILL, LT_SERVLINK, LT_XLINE, LT_CONNECT, LT_DISCONNECT, LT_FLOOD, LT_LOADMODULE };
int hostid;
int category;
time_t date;
+ std::string lastquery;
QueryInfo(const std::string &n, const std::string &h, unsigned long i, int cat)
{
id = i;
category = cat;
sourceid = nickid = hostid = -1;
- date = TIME;
+ date = time(NULL);
+ lastquery = "";
}
void Go(SQLresult* res)
// Nothing here and not sent yet
SQLrequest req = SQLreq(MyMod, SQLModule, dbid, "", "");
- log(DEBUG,"State: %d",qs);
-
switch (qs)
{
case FIND_SOURCE:
// "SELECT id,actor FROM ircd_log_actors WHERE actor='"+nick+"'"
// If we find it, advance to FIND_NICK state, otherwise go to INSERT_SOURCE
- if (res->Rows())
+ if (res->Cols())
{
- qs = INSERT_SOURCE;
+ if (sourceid == -1)
+ {
+ sourceid = atoi(res->GetValue(0,0).d.c_str());
+ qs = FIND_NICK;
+ }
+ else qs = INSERT_SOURCE;
}
else
{
- req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", nick);
- if(req.Send())
+ if (lastquery == "SELECT id,actor FROM ircd_log_actors WHERE actor='?'")
{
- qs = FIND_SOURCE;
- active_queries[req.id] = this;
+ qs = INSERT_SOURCE;
}
else
{
- log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+ lastquery = "SELECT id,actor FROM ircd_log_actors WHERE actor='?'";
+ req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", nick);
+ if(req.Send())
+ {
+ qs = FIND_SOURCE;
+ active_queries[req.id] = this;
+ }
+ else
+ {
+ //ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+ }
+ break;
}
- break;
-
}
case INSERT_SOURCE:
// "INSERT INTO ircd_log_actors VALUES('','"+nick+"')")
// after we've done this, go back to FIND_SOURCE
+ lastquery = "INSERT INTO ircd_log_actors VALUES('','?')";
req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_actors VALUES('','?')", nick);
if(req.Send())
{
}
else
{
- log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+ //ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str());
}
break;
case FIND_NICK:
// "SELECT id,actor FROM ircd_log_actors WHERE actor='"+nick+"'"
// If we find it, advance to FIND_HOST state, otherwise go to INSERT_NICK
- if (res->Rows())
+ if (res->Cols())
{
- qs = INSERT_NICK;
+ if (nickid == -1)
+ {
+ nickid = atoi(res->GetValue(0,0).d.c_str());
+ qs = FIND_HOST;
+ }
+ else qs = INSERT_NICK;
}
else
{
- req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", nick);
- if(req.Send())
+ if (lastquery == "SELECT id,actor FROM ircd_log_actors WHERE actor='?'")
{
- qs = FIND_NICK;
- active_queries[req.id] = this;
+ qs = INSERT_NICK;
}
else
{
- log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+ req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,actor FROM ircd_log_actors WHERE actor='?'", nick);
+ if(req.Send())
+ {
+ qs = FIND_NICK;
+ active_queries[req.id] = this;
+ }
+ else
+ {
+ //ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+ }
+ break;
}
- break;
}
case INSERT_NICK:
// "INSERT INTO ircd_log_actors VALUES('','"+nick+"')")
}
else
{
- log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+ //ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str());
}
break;
case FIND_HOST:
// "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='"+host+"'"
// If we find it, advance to INSERT_LOGENTRY state, otherwise go to INSERT_HOST
- if (res->Rows())
+ if (res->Cols())
{
- qs = INSERT_HOST;
+ if (hostid == -1)
+ {
+ hostid = atoi(res->GetValue(0,0).d.c_str());
+ qs = INSERT_LOGENTRY;
+ }
+ else qs = INSERT_HOST;
}
else
{
- req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'",hostname);
- if(req.Send())
+ if (lastquery == "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'")
{
- qs = FIND_HOST;
- active_queries[req.id] = this;
+ qs = INSERT_HOST;
}
else
{
- log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+ lastquery = "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'";
+ req = SQLreq(MyMod, SQLModule, dbid, "SELECT id,hostname FROM ircd_log_hosts WHERE hostname='?'",hostname);
+ if(req.Send())
+ {
+ qs = FIND_HOST;
+ active_queries[req.id] = this;
+ }
+ else
+ {
+ //ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+ }
+ break;
}
- break;
}
case INSERT_HOST:
// "INSERT INTO ircd_log_hosts VALUES('','"+host+"')"
// after we've done this, go back to FIND_HOST
+ lastquery = "INSERT INTO ircd_log_hosts VALUES('','?')";
req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log_hosts VALUES('','?')", hostname);
if(req.Send())
{
}
else
{
- log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+ //ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str());
}
break;
case INSERT_LOGENTRY:
}
else
{
+ lastquery = "INSERT INTO ircd_log VALUES()";
req = SQLreq(MyMod, SQLModule, dbid, "INSERT INTO ircd_log VALUES('',"+ConvToStr(category)+","+ConvToStr(nickid)+","+ConvToStr(hostid)+","+ConvToStr(sourceid)+","+ConvToStr(date)+")");
/*,category,
nickid,
}
else
{
- log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+ //ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str());
}
}
break;
class ModuleSQLLog : public Module
{
- Server* Srv;
+ InspIRCd* Srv;
ConfigReader* Conf;
public:
bool ReadConfig()
{
- Conf = new ConfigReader();
- dbid = Conf->ReadValue("sqllog","dbid",0); // database id of a database configured in sql module
- DELETE(Conf);
+ ConfigReader Conf(Srv);
+
+ dbid = Conf.ReadValue("sqllog","dbid",0); // database id of a database configured in sql module
+
SQLModule = Srv->FindFeature("SQL");
if (!SQLModule)
- Srv->Log(DEFAULT,"WARNING: m_sqllog.so could not initialize because an SQL module is not loaded. Load the module and rehash your server.");
+ ServerInstance->Log(DEFAULT,"WARNING: m_sqllog.so could not initialize because an SQL module is not loaded. Load the module and rehash your server.");
return (SQLModule);
}
- ModuleSQLLog(Server* Me) : Module::Module(Me)
+ ModuleSQLLog(InspIRCd* Me)
+ : Module::Module(Me), Srv(Me)
{
- Srv = Me;
ReadConfig();
MyMod = this;
active_queries.clear();
void Implements(char* List)
{
List[I_OnRehash] = List[I_OnOper] = List[I_OnGlobalOper] = List[I_OnKill] = 1;
- List[I_OnPreCommand] = List[I_OnUserConnect] = List[I_OnGlobalConnect] = 1;
+ List[I_OnPreCommand] = List[I_OnUserConnect] = 1;
List[I_OnUserQuit] = List[I_OnLoadModule] = List[I_OnRequest] = 1;
}
virtual char* OnRequest(Request* request)
{
- if(strcmp(SQLRESID, request->GetData()) == 0)
+ ServerInstance->Log(DEBUG,"OnRequest in m_sqllog.so");
+ if(strcmp(SQLRESID, request->GetId()) == 0)
{
SQLresult* res;
std::map<unsigned long, QueryInfo*>::iterator n;
res = static_cast<SQLresult*>(request);
- log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetData(), res->id);
+ ServerInstance->Log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetId(), res->id);
n = active_queries.find(res->id);
if (n != active_queries.end())
{
- log(DEBUG,"This is an active query");
+ ServerInstance->Log(DEBUG,"This is an active query");
n->second->Go(res);
std::map<unsigned long, QueryInfo*>::iterator n = active_queries.find(res->id);
QueryInfo* i = new QueryInfo(nick, host, req.id, category);
i->qs = FIND_SOURCE;
active_queries[req.id] = i;
+ ServerInstance->Log(DEBUG,"Active query id %d",req.id);
}
else
{
- log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+ ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str());
}
/*long nickid = InsertNick(nick);
return 0;
}
- virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
+ virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
{
if ((command == "GLINE") || (command == "KLINE") || (command == "ELINE") || (command == "ZLINE"))
{
AddLogEntry(LT_CONNECT,user->nick,user->host,user->server);
}
- virtual void OnGlobalConnect(userrec* user)
- {
- AddLogEntry(LT_CONNECT,user->nick,user->host,user->server);
- }
-
virtual void OnUserQuit(userrec* user, const std::string &reason)
{
AddLogEntry(LT_DISCONNECT,user->nick,user->host,user->server);
virtual void OnLoadModule(Module* mod, const std::string &name)
{
- AddLogEntry(LT_LOADMODULE,name,Srv->GetServerName(),Srv->GetServerName());
+ AddLogEntry(LT_LOADMODULE,name,Srv->Config->ServerName, Srv->Config->ServerName);
}
virtual ~ModuleSQLLog()
virtual Version GetVersion()
{
- return Version(1,0,0,1,VF_VENDOR);
+ return Version(1,1,0,1,VF_VENDOR,API_VERSION);
}
};
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleSQLLog(Me);
}
{
return new ModuleSQLLogFactory;
}
-
projects / user / henk / code / inspircd.git / blobdiff