X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqlite3.cpp;h=8c191381a7e1717e416eb5549613bd651dbe83a9;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=9795e9f8bad84c92af8a523dff06306d6d2d1e14;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index 9795e9f8b..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 @@ -16,14 +16,13 @@ #include "users.h" #include "channels.h" #include "modules.h" - #include "m_sqlv2.h" /* $ModDesc: sqlite3 provider */ /* $CompileFlags: pkgconfversion("sqlite3","3.3") pkgconfincludes("sqlite3","/sqlite3.h","") */ /* $LinkerFlags: pkgconflibs("sqlite3","/libsqlite3.so","-lsqlite3") */ /* $ModDep: m_sqlv2.h */ - +/* $NoPedantic */ class SQLConn; class SQLite3Result; @@ -34,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; @@ -45,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); @@ -57,7 +57,7 @@ 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) { } @@ -73,7 +73,18 @@ class ResultNotifier : public InspSocket virtual int OnIncomingConnection(int newsock, char* ip) { - 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; } @@ -96,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) { } @@ -105,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; @@ -113,7 +124,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++; @@ -264,7 +275,7 @@ class SQLConn : public classbase { 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(); } } @@ -427,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); } }; @@ -480,26 +495,37 @@ class ModuleSQLite3 : public Module ReadConf(); 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->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 Implements(char* List) - { - List[I_OnRequest] = List[I_OnRehash] = 1; - } void SendQueue() { @@ -539,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; } @@ -561,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; @@ -574,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; } @@ -592,7 +616,7 @@ class ModuleSQLite3 : public Module { if (!HostInConf(iter->second->GetConfHost())) { - DELETE(iter->second); + delete iter->second; safei = iter; --iter; connections.erase(safei); @@ -606,7 +630,7 @@ class ModuleSQLite3 : public Module while ((i = connections.begin()) != connections.end()) { connections.erase(i); - DELETE(i->second); + delete i->second; } } @@ -615,7 +639,7 @@ class ModuleSQLite3 : public Module ReadConf(); } - virtual char* OnRequest(Request* request) + virtual const char* OnRequest(Request* request) { if(strcmp(SQLREQID, request->GetId()) == 0) { @@ -646,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); } }; @@ -656,5 +680,4 @@ void ResultNotifier::Dispatch() ((ModuleSQLite3*)mod)->SendQueue(); } -MODULE_INIT(ModuleSQLite3); - +MODULE_INIT(ModuleSQLite3)