X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqlite3.cpp;h=8c191381a7e1717e416eb5549613bd651dbe83a9;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=469d5e1532f8a43553bc72f12a5ed12196ea5e32;hpb=c971f6faf391ec6232de78b7fbbcaa0a9df5f991;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 469d5e153..8c191381a 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -2,7 +2,7 @@ * | 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 @@ -11,24 +11,18 @@ * --------------------------------------------------- */ -#include -#include -#include +#include "inspircd.h" #include - #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.h" -#include "configreader.h" - #include "m_sqlv2.h" /* $ModDesc: sqlite3 provider */ -/* $CompileFlags: pkgconfincludes("sqlite3","/sqlite3.h","") */ +/* $CompileFlags: pkgconfversion("sqlite3","3.3") pkgconfincludes("sqlite3","/sqlite3.h","") */ /* $LinkerFlags: pkgconflibs("sqlite3","/libsqlite3.so","-lsqlite3") */ /* $ModDep: m_sqlv2.h */ - +/* $NoPedantic */ class SQLConn; class SQLite3Result; @@ -39,9 +33,10 @@ typedef std::deque paramlist; typedef std::deque ResultQueue; ResultNotifier* resultnotify = NULL; +ResultNotifier* resultdispatch = NULL; +int QueueFD = -1; - -class ResultNotifier : public InspSocket +class ResultNotifier : public BufferedSocket { Module* mod; insp_sockaddr sock_us; @@ -50,9 +45,9 @@ class ResultNotifier : public InspSocket public: /* Create a socket on a random port. Let the tcp stack allocate us an available port */ #ifdef IPV6 - ResultNotifier(InspIRCd* SI, Module* m) : InspSocket(SI, "::1", 0, true, 3000), mod(m) + ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "::1", 0, true, 3000), mod(m) #else - ResultNotifier(InspIRCd* SI, Module* m) : InspSocket(SI, "127.0.0.1", 0, true, 3000), mod(m) + ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "127.0.0.1", 0, true, 3000), mod(m) #endif { uslen = sizeof(sock_us); @@ -62,9 +57,8 @@ class ResultNotifier : public InspSocket } } - ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : InspSocket(SI, newfd, ip), mod(m) + ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m) { - Instance->Log(DEBUG,"Constructor of new socket"); } /* Using getsockname and ntohs, we can determine which port number we were allocated */ @@ -79,8 +73,18 @@ class ResultNotifier : public InspSocket virtual int OnIncomingConnection(int newsock, char* ip) { - Instance->Log(DEBUG,"Inbound connection on fd %d!",newsock); - Dispatch(); + resultdispatch = new ResultNotifier(Instance, mod, newsock, ip); + return true; + } + + virtual bool OnDataReady() + { + char data = 0; + if (Instance->SE->Recv(this, &data, 1, 0) > 0) + { + Dispatch(); + return true; + } return false; } @@ -103,8 +107,8 @@ class SQLite3Result : public SQLresult SQLfieldMap* fieldmap; public: - SQLite3Result(Module* self, Module* to, unsigned int id) - : SQLresult(self, to, id), currentrow(0), rows(0), cols(0), fieldlist(NULL), fieldmap(NULL) + SQLite3Result(Module* self, Module* to, unsigned int rid) + : SQLresult(self, to, rid), currentrow(0), rows(0), cols(0), fieldlist(NULL), fieldmap(NULL) { } @@ -112,7 +116,7 @@ class SQLite3Result : public SQLresult { } - void AddRow(int colsnum, char **data, char **colname) + void AddRow(int colsnum, char **dat, char **colname) { colnames.clear(); cols = colsnum; @@ -120,12 +124,17 @@ class SQLite3Result : public SQLresult { fieldlists.resize(fieldlists.size()+1); colnames.push_back(colname[i]); - SQLfield sf(data[i] ? data[i] : "", data[i] ? false : true); + SQLfield sf(dat[i] ? dat[i] : "", dat[i] ? false : true); fieldlists[rows].push_back(sf); } rows++; } + void UpdateAffectedCount() + { + rows++; + } + virtual int Rows() { return rows; @@ -264,14 +273,9 @@ class SQLConn : public classbase SQLConn(InspIRCd* SI, Module* m, const SQLhost& hi) : Instance(SI), mod(m), host(hi) { - int result; - if ((result = OpenDB()) == SQLITE_OK) - { - Instance->Log(DEBUG, "Opened sqlite DB: " + host.host); - } - else + if (OpenDB() != SQLITE_OK) { - Instance->Log(DEFAULT, "WARNING: Could not open DB with id: " + host.id); + Instance->Logs->Log("m_sqlite3",DEFAULT, "WARNING: Could not open DB with id: " + host.id); CloseDB(); } } @@ -306,7 +310,6 @@ class SQLConn : public classbase * * The +1 is for null-terminating the string for mysql_real_escape_string */ - query = new char[req.query.q.length() + (paramlen*2) + 1]; queryend = query; @@ -339,8 +342,6 @@ class SQLConn : public classbase *queryend = 0; req.query.q = query; -// Instance->Log(DEBUG, "<******> Doing query: " + ConvToStr(req.query.q.data())); - SQLite3Result* res = new SQLite3Result(mod, req.GetSource(), req.id); res->dbid = host.id; res->query = req.query.q; @@ -349,15 +350,15 @@ class SQLConn : public classbase params.push_back(res); char *errmsg = 0; + sqlite3_update_hook(conn, QueryUpdateHook, ¶ms); if (sqlite3_exec(conn, req.query.q.data(), QueryResult, ¶ms, &errmsg) != SQLITE_OK) { - Instance->Log(DEBUG, "Query failed: " + ConvToStr(errmsg)); + std::string error(errmsg); sqlite3_free(errmsg); delete[] query; delete res; - return SQLerror(QSEND_FAIL, ConvToStr(errmsg)); + return SQLerror(QSEND_FAIL, error); } - Instance->Log(DEBUG, "Dispatched query successfully. ID: %d resulting rows %d", req.id, res->Rows()); delete[] query; results.push_back(res); @@ -372,11 +373,22 @@ class SQLConn : public classbase return 0; } + static void QueryUpdateHook(void *params, int eventid, char const * azSQLite, char const * azColName, sqlite_int64 rowid) + { + paramlist* p = (paramlist*)params; + ((SQLConn*)(*p)[0])->AffectedReady(((SQLite3Result*)(*p)[1])); + } + void ResultReady(SQLite3Result *res, int cols, char **data, char **colnames) { res->AddRow(cols, data, colnames); } + void AffectedReady(SQLite3Result *res) + { + res->UpdateAffectedCount(); + } + int OpenDB() { return sqlite3_open(host.host.c_str(), &conn); @@ -386,7 +398,6 @@ class SQLConn : public classbase { sqlite3_interrupt(conn); sqlite3_close(conn); - Instance->Log(DEBUG, "Closed sqlite DB: " + host.host); } SQLhost GetConfHost() @@ -409,7 +420,6 @@ class SQLConn : public classbase * the pointer to NULL. We cannot just cancel the query as the result will still come * through at some point...and it could get messy if we play with invalid pointers... */ - Instance->Log(DEBUG, "Looks like we're handling a zombie query from a module which unloaded before it got a result..fun. ID: " + ConvToStr(res->GetId())); delete res; } results.pop_front(); @@ -428,32 +438,36 @@ class SQLConn : public classbase void SendNotify() { - int QueueFD; - if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) + if (QueueFD < 0) { - /* crap, we're out of sockets... */ - return; - } + if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1) + { + /* crap, we're out of sockets... */ + return; + } - insp_sockaddr addr; + insp_sockaddr addr; #ifdef IPV6 - insp_aton("::1", &addr.sin6_addr); - addr.sin6_family = AF_FAMILY; - addr.sin6_port = htons(resultnotify->GetPort()); + insp_aton("::1", &addr.sin6_addr); + addr.sin6_family = AF_FAMILY; + addr.sin6_port = htons(resultnotify->GetPort()); #else - insp_inaddr ia; - insp_aton("127.0.0.1", &ia); - addr.sin_family = AF_FAMILY; - addr.sin_addr = ia; - addr.sin_port = htons(resultnotify->GetPort()); + insp_inaddr ia; + insp_aton("127.0.0.1", &ia); + addr.sin_family = AF_FAMILY; + addr.sin_addr = ia; + addr.sin_port = htons(resultnotify->GetPort()); #endif - if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1) - { - /* wtf, we cant connect to it, but we just created it! */ - return; + if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1) + { + /* wtf, we cant connect to it, but we just created it! */ + return; + } } + char id = 0; + send(QueueFD, &id, 1, 0); } }; @@ -469,40 +483,50 @@ class ModuleSQLite3 : public Module ModuleSQLite3(InspIRCd* Me) : Module::Module(Me), currid(0) { - ServerInstance->UseInterface("SQLutils"); + ServerInstance->Modules->UseInterface("SQLutils"); - if (!ServerInstance->PublishFeature("SQL", this)) + if (!ServerInstance->Modules->PublishFeature("SQL", this)) { throw ModuleException("m_sqlite3: Unable to publish feature 'SQL'"); } resultnotify = new ResultNotifier(ServerInstance, this); - ServerInstance->Log(DEBUG,"Bound notifier to 127.0.0.1:%d",resultnotify->GetPort()); ReadConf(); - ServerInstance->PublishInterface("SQL", this); + ServerInstance->Modules->PublishInterface("SQL", this); + Implementation eventlist[] = { I_OnRequest, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 2); } virtual ~ModuleSQLite3() { ClearQueue(); ClearAllConnections(); - resultnotify->SetFd(-1); - resultnotify->state = I_ERROR; - resultnotify->OnError(I_ERR_SOCKET); - resultnotify->ClosePending = true; - delete resultnotify; - ServerInstance->UnpublishInterface("SQL", this); - ServerInstance->UnpublishFeature("SQL"); - ServerInstance->DoneWithInterface("SQLutils"); - } - void Implements(char* List) - { - List[I_OnRequest] = List[I_OnRehash] = 1; + ServerInstance->SE->DelFd(resultnotify); + resultnotify->Close(); + ServerInstance->BufferedSocketCull(); + + if (QueueFD >= 0) + { + shutdown(QueueFD, 2); + close(QueueFD); + } + + if (resultdispatch) + { + ServerInstance->SE->DelFd(resultdispatch); + resultdispatch->Close(); + ServerInstance->BufferedSocketCull(); + } + + ServerInstance->Modules->UnpublishInterface("SQL", this); + ServerInstance->Modules->UnpublishFeature("SQL"); + ServerInstance->Modules->DoneWithInterface("SQLutils"); } + void SendQueue() { for (ConnMap::iterator iter = connections.begin(); iter != connections.end(); iter++) @@ -541,7 +565,6 @@ class ModuleSQLite3 : public Module host.name = conf.ReadValue("database", "name", i); host.user = conf.ReadValue("database", "username", i); host.pass = conf.ReadValue("database", "password", i); - host.ssl = conf.ReadFlag("database", "ssl", "0", i); if (h == host) return true; } @@ -563,7 +586,6 @@ class ModuleSQLite3 : public Module host.name = conf.ReadValue("database", "name", i); host.user = conf.ReadValue("database", "username", i); host.pass = conf.ReadValue("database", "password", i); - host.ssl = conf.ReadFlag("database", "ssl", "0", i); if (HasHost(host)) continue; @@ -576,7 +598,7 @@ class ModuleSQLite3 : public Module { if (HasHost(hi)) { - ServerInstance->Log(DEFAULT, "WARNING: A sqlite connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str()); + ServerInstance->Logs->Log("m_sqlite3",DEFAULT, "WARNING: A sqlite connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str()); return; } @@ -594,7 +616,7 @@ class ModuleSQLite3 : public Module { if (!HostInConf(iter->second->GetConfHost())) { - DELETE(iter->second); + delete iter->second; safei = iter; --iter; connections.erase(safei); @@ -608,22 +630,21 @@ class ModuleSQLite3 : public Module while ((i = connections.begin()) != connections.end()) { connections.erase(i); - DELETE(i->second); + delete i->second; } } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ReadConf(); } - virtual char* OnRequest(Request* request) + virtual const char* OnRequest(Request* request) { if(strcmp(SQLREQID, request->GetId()) == 0) { SQLrequest* req = (SQLrequest*)request; ConnMap::iterator iter; - ServerInstance->Log(DEBUG, "Got query: '%s' with %d replacement parameters on id '%s'", req->query.q.c_str(), req->query.p.size(), req->dbid.c_str()); if((iter = connections.find(req->dbid)) != connections.end()) { req->id = NewID(); @@ -636,7 +657,6 @@ class ModuleSQLite3 : public Module return NULL; } } - ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId()); return NULL; } @@ -650,7 +670,7 @@ class ModuleSQLite3 : public Module virtual Version GetVersion() { - return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION); + return Version(1,2,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION); } }; @@ -660,24 +680,4 @@ void ResultNotifier::Dispatch() ((ModuleSQLite3*)mod)->SendQueue(); } -class ModuleSQLite3Factory : public ModuleFactory -{ - public: - ModuleSQLite3Factory() - { - } - - ~ModuleSQLite3Factory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleSQLite3(Me); - } -}; - -extern "C" void * init_module( void ) -{ - return new ModuleSQLite3Factory; -} +MODULE_INIT(ModuleSQLite3)