X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fextra%2Fm_sqlite3.cpp;h=d51bc16953845bb8647c571fcbbdcc63d0e1254f;hb=fa933d7bdcb3e5fecce260f5456a00dda80f21e2;hp=9607cb4dd07cfd49b3a9d77c39f09efbe09f6d60;hpb=12b9855339a3bbd05cc0636588ea68bf8db390f5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 9607cb4dd..d51bc1695 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -1,22 +1,18 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | 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 - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ #include "inspircd.h" #include -#include "users.h" -#include "channels.h" -#include "modules.h" - #include "m_sqlv2.h" /* $ModDesc: sqlite3 provider */ @@ -28,37 +24,60 @@ class SQLConn; class SQLite3Result; class ResultNotifier; +class SQLiteListener; +class ModuleSQLite3; typedef std::map ConnMap; typedef std::deque paramlist; typedef std::deque ResultQueue; -ResultNotifier* resultnotify = NULL; - +ResultNotifier* notifier = NULL; +SQLiteListener* listener = NULL; +int QueueFD = -1; class ResultNotifier : public BufferedSocket { - Module* mod; - insp_sockaddr sock_us; + ModuleSQLite3* mod; + + public: + ResultNotifier(ModuleSQLite3* m, InspIRCd* SI, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m) + { + } + + virtual bool OnDataReady() + { + char data = 0; + if (ServerInstance->SE->Recv(this, &data, 1, 0) > 0) + { + Dispatch(); + return true; + } + return false; + } + + void Dispatch(); +}; + +class SQLiteListener : public ListenSocketBase +{ + ModuleSQLite3* Parent; + irc::sockets::insp_sockaddr sock_us; socklen_t uslen; + FileReader* index; public: - /* Create a socket on a random port. Let the tcp stack allocate us an available port */ -#ifdef IPV6 - ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "::1", 0, true, 3000), mod(m) -#else - ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "127.0.0.1", 0, true, 3000), mod(m) -#endif + SQLiteListener(ModuleSQLite3* P, InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr), Parent(P) { uslen = sizeof(sock_us); if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen)) { - throw ModuleException("Could not create random listening port on localhost"); + throw ModuleException("Could not getsockname() to find out port number for ITC port"); } } - ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m) + virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip) { + new ResultNotifier(this->Parent, this->ServerInstance, nfd, (char *)ipconnectedto.c_str()); // XXX unsafe casts suck } /* Using getsockname and ntohs, we can determine which port number we were allocated */ @@ -70,20 +89,11 @@ class ResultNotifier : public BufferedSocket return ntohs(sock_us.sin_port); #endif } - - virtual int OnIncomingConnection(int newsock, char* ip) - { - Dispatch(); - return false; - } - - void Dispatch(); }; - class SQLite3Result : public SQLresult { - private: + private: int currentrow; int rows; int cols; @@ -95,9 +105,9 @@ class SQLite3Result : public SQLresult SQLfieldList* fieldlist; 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) + public: + SQLite3Result(Module* self, Module* to, unsigned int rid) + : SQLresult(self, to, rid), currentrow(0), rows(0), cols(0), fieldlist(NULL), fieldmap(NULL) { } @@ -105,7 +115,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; @@ -113,7 +123,7 @@ 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++; @@ -251,20 +261,20 @@ class SQLite3Result : public SQLresult class SQLConn : public classbase { - private: + private: ResultQueue results; - InspIRCd* Instance; + InspIRCd* ServerInstance; Module* mod; SQLhost host; sqlite3* conn; - public: + public: SQLConn(InspIRCd* SI, Module* m, const SQLhost& hi) - : Instance(SI), mod(m), host(hi) + : ServerInstance(SI), mod(m), host(hi) { if (OpenDB() != SQLITE_OK) { - Instance->Log(DEFAULT, "WARNING: Could not open DB with id: " + host.id); + ServerInstance->Logs->Log("m_sqlite3",DEFAULT, "WARNING: Could not open DB with id: " + host.id); CloseDB(); } } @@ -285,7 +295,7 @@ class SQLConn : public classbase /* Total length of the unescaped parameters */ unsigned long paramlen; - /* Total length of query, used for binary-safety in mysql_real_query */ + /* Total length of query, used for binary-safety */ unsigned long querylength = 0; paramlen = 0; @@ -297,7 +307,7 @@ class SQLConn : public classbase /* To avoid a lot of allocations, allocate enough memory for the biggest the escaped query could possibly be. * sizeofquery + (totalparamlength*2) + 1 * - * The +1 is for null-terminating the string for mysql_real_escape_string + * The +1 is for null-terminating the string */ query = new char[req.query.q.length() + (paramlen*2) + 1]; queryend = query; @@ -346,7 +356,7 @@ class SQLConn : public classbase sqlite3_free(errmsg); delete[] query; delete res; - return SQLerror(QSEND_FAIL, error); + return SQLerror(SQL_QSEND_FAIL, error); } delete[] query; @@ -427,32 +437,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; + irc::sockets::insp_sockaddr addr; #ifdef IPV6 - insp_aton("::1", &addr.sin6_addr); - addr.sin6_family = AF_FAMILY; - addr.sin6_port = htons(resultnotify->GetPort()); + irc::sockets::insp_aton("::1", &addr.sin6_addr); + addr.sin6_family = AF_FAMILY; + addr.sin6_port = htons(listener->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()); + irc::sockets::insp_inaddr ia; + irc::sockets::insp_aton("127.0.0.1", &ia); + addr.sin_family = AF_FAMILY; + addr.sin_addr = ia; + addr.sin_port = htons(listener->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); } }; @@ -460,13 +474,13 @@ class SQLConn : public classbase class ModuleSQLite3 : public Module { - private: + private: ConnMap connections; unsigned long currid; - public: + public: ModuleSQLite3(InspIRCd* Me) - : Module::Module(Me), currid(0) + : Module(Me), currid(0) { ServerInstance->Modules->UseInterface("SQLutils"); @@ -475,7 +489,22 @@ class ModuleSQLite3 : public Module throw ModuleException("m_sqlite3: Unable to publish feature 'SQL'"); } - resultnotify = new ResultNotifier(ServerInstance, this); + /* Create a socket on a random port. Let the tcp stack allocate us an available port */ +#ifdef IPV6 + listener = new SQLiteListener(this, ServerInstance, 0, "::1"); +#else + listener = new SQLiteListener(this, ServerInstance, 0, "127.0.0.1"); +#endif + + if (listener->GetFd() == -1) + { + ServerInstance->Modules->DoneWithInterface("SQLutils"); + throw ModuleException("m_sqlite3: unable to create ITC pipe"); + } + else + { + ServerInstance->Logs->Log("m_sqlite3", DEBUG, "SQLite: Interthread comms port is %d", listener->GetPort()); + } ReadConf(); @@ -488,20 +517,28 @@ class ModuleSQLite3 : public Module { ClearQueue(); ClearAllConnections(); - resultnotify->SetFd(-1); - resultnotify->state = I_ERROR; - resultnotify->OnError(I_ERR_SOCKET); - resultnotify->ClosePending = true; - delete resultnotify; + + ServerInstance->SE->DelFd(listener); + ServerInstance->BufferedSocketCull(); + + if (QueueFD >= 0) + { + shutdown(QueueFD, 2); + close(QueueFD); + } + + if (notifier) + { + ServerInstance->SE->DelFd(notifier); + notifier->Close(); + ServerInstance->BufferedSocketCull(); + } + ServerInstance->Modules->UnpublishInterface("SQL", this); ServerInstance->Modules->UnpublishFeature("SQL"); ServerInstance->Modules->DoneWithInterface("SQLutils"); } - void Implements(char* List) - { - List[I_OnRequest] = List[I_OnRehash] = 1; - } void SendQueue() { @@ -541,7 +578,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 +599,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 +611,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; } @@ -617,7 +652,7 @@ class ModuleSQLite3 : public Module ReadConf(); } - virtual char* OnRequest(Request* request) + virtual const char* OnRequest(Request* request) { if(strcmp(SQLREQID, request->GetId()) == 0) { @@ -631,7 +666,7 @@ class ModuleSQLite3 : public Module } else { - req->error.Id(BAD_DBID); + req->error.Id(SQL_BAD_DBID); return NULL; } } @@ -648,15 +683,14 @@ class ModuleSQLite3 : public Module virtual Version GetVersion() { - return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION); + return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); } }; void ResultNotifier::Dispatch() { - ((ModuleSQLite3*)mod)->SendQueue(); + mod->SendQueue(); } MODULE_INIT(ModuleSQLite3) -