X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_pgsql.cpp;h=5d267fc1acce29f481a414efc7aa3c12ecaa3201;hb=d556a4f8740b65e635ff7d2b976faaedbdac51d4;hp=ae655495ee6979b6d9641af04f0e40e84fc25d2a;hpb=c662a37341e9787ca8c5e553b3d641a19e3b81c8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index ae655495e..5d267fc1a 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -11,25 +11,19 @@ * --------------------------------------------------- */ +#include "inspircd.h" #include #include -#include -#include -#include #include - #include "users.h" #include "channels.h" #include "modules.h" - -#include "inspircd.h" #include "configreader.h" - #include "m_sqlv2.h" /* $ModDesc: PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API */ -/* $CompileFlags: -I`pg_config --includedir` `perl extra/pgsql_config.pl` */ -/* $LinkerFlags: -L`pg_config --libdir` -lpq */ +/* $CompileFlags: -Iexec("pg_config --includedir") eval("my $s = `pg_config --version`;$s =~ /^.*?(\d+)\.(\d+)\.(\d+).*?$/;my $v = hex(sprintf("0x%02x%02x%02x", $1, $2, $3));print "-DPGSQL_HAS_ESCAPECONN" if(($v >= 0x080104) || ($v >= 0x07030F && $v < 0x070400) || ($v >= 0x07040D && $v < 0x080000) || ($v >= 0x080008 && $v < 0x080100));") */ +/* $LinkerFlags: -Lexec("pg_config --libdir") -lpq */ /* $ModDep: m_sqlv2.h */ @@ -90,11 +84,10 @@ std::string SQLhost::GetDSN() class ReconnectTimer : public InspTimer { private: - SQLConn* conn; Module* mod; public: - ReconnectTimer(InspIRCd* SI, SQLConn* c, Module* m) - : InspTimer(5, SI->Time(), false), conn(c), mod(m) + ReconnectTimer(InspIRCd* SI, Module* m) + : InspTimer(5, SI->Time(), false), mod(m) { } virtual void Tick(time_t TIME); @@ -118,142 +111,7 @@ class SQLresolver : public Resolver virtual void OnError(ResolverError e, const std::string &errormessage) { - ServerInstance->Log(DEBUG, "DNS lookup failed (%s), dying horribly", errormessage.c_str()); - } -}; - -/** QueryQueue, a queue of queries waiting to be executed. - * This maintains two queues internally, one for 'priority' - * queries and one for less important ones. Each queue has - * new queries appended to it and ones to execute are popped - * off the front. This keeps them flowing round nicely and no - * query should ever get 'stuck' for too long. If there are - * queries in the priority queue they will be executed first, - * 'unimportant' queries will only be executed when the - * priority queue is empty. - * - * We store lists of SQLrequest's here, by value as we want to avoid storing - * any data allocated inside the client module (in case that module is unloaded - * while the query is in progress). - * - * Because we want to work on the current SQLrequest in-situ, we need a way - * of accessing the request we are currently processing, QueryQueue::front(), - * but that call needs to always return the same request until that request - * is removed from the queue, this is what the 'which' variable is. New queries are - * always added to the back of one of the two queues, but if when front() - * is first called then the priority queue is empty then front() will return - * a query from the normal queue, but if a query is then added to the priority - * queue then front() must continue to return the front of the *normal* queue - * until pop() is called. - */ - -class QueryQueue : public classbase -{ -private: - typedef std::deque ReqDeque; - - ReqDeque priority; /* The priority queue */ - ReqDeque normal; /* The 'normal' queue */ - enum { PRI, NOR, NON } which; /* Which queue the currently active element is at the front of */ - -public: - QueryQueue() - : which(NON) - { - } - - void push(const SQLrequest &q) - { - //ServerInstance->Log(DEBUG, "QueryQueue::push(): Adding %s query to queue: %s", ((q.pri) ? "priority" : "non-priority"), q.query.q.c_str()); - - if(q.pri) - priority.push_back(q); - else - normal.push_back(q); - } - - void pop() - { - if((which == PRI) && priority.size()) - { - priority.pop_front(); - } - else if((which == NOR) && normal.size()) - { - normal.pop_front(); - } - - /* Reset this */ - which = NON; - - /* Silently do nothing if there was no element to pop() */ - } - - SQLrequest& front() - { - switch(which) - { - case PRI: - return priority.front(); - case NOR: - return normal.front(); - default: - if(priority.size()) - { - which = PRI; - return priority.front(); - } - - if(normal.size()) - { - which = NOR; - return normal.front(); - } - - /* This will probably result in a segfault, - * but the caller should have checked totalsize() - * first so..meh - moron :p - */ - - return priority.front(); - } - } - - std::pair size() - { - return std::make_pair(priority.size(), normal.size()); - } - - int totalsize() - { - return priority.size() + normal.size(); - } - - void PurgeModule(Module* mod) - { - DoPurgeModule(mod, priority); - DoPurgeModule(mod, normal); - } - -private: - void DoPurgeModule(Module* mod, ReqDeque& q) - { - for(ReqDeque::iterator iter = q.begin(); iter != q.end(); iter++) - { - if(iter->GetSource() == mod) - { - if(iter->id == front().id) - { - /* It's the currently active query.. :x */ - iter->SetSource(NULL); - } - else - { - /* It hasn't been executed yet..just remove it */ - iter = q.erase(iter); - } - } - } + ServerInstance->Log(DEBUG, "PgSQL: DNS lookup failed (%s), dying horribly", errormessage.c_str()); } }; @@ -279,8 +137,6 @@ public: { rows = PQntuples(res); cols = PQnfields(res); - - //ServerInstance->Log(DEBUG, "Created new PgSQL result; %d rows, %d columns, %s affected", rows, cols, PQcmdTuples(res)); } ~PgSQLresult() @@ -343,7 +199,6 @@ public: } else { - //ServerInstance->Log(DEBUG, "PQgetvalue returned a null pointer..nobody wants to tell us what this means"); throw SQLbadColName(); } } @@ -477,7 +332,6 @@ class SQLConn : public EventHandler if(!DoConnect()) { Instance->Log(DEFAULT, "WARNING: Could not connect to database with id: " + ConvToStr(hi.id)); - Close(); DelayReconnect(); } } @@ -500,7 +354,6 @@ class SQLConn : public EventHandler break; case EVENT_ERROR: - Close(); DelayReconnect(); break; @@ -512,45 +365,29 @@ class SQLConn : public EventHandler bool DoConnect() { if(!(sql = PQconnectStart(confhost.GetDSN().c_str()))) - { - Instance->Log(DEBUG, "Couldn't allocate PGconn structure, aborting: %s", PQerrorMessage(sql)); return false; - } if(PQstatus(sql) == CONNECTION_BAD) - { - Instance->Log(DEBUG, "PQconnectStart failed: %s", PQerrorMessage(sql)); return false; - } - - ShowStatus(); if(PQsetnonblocking(sql, 1) == -1) - { - Instance->Log(DEBUG, "Couldn't set connection nonblocking: %s", PQerrorMessage(sql)); return false; - } /* OK, we've initalised the connection, now to get it hooked into the socket engine * and then start polling it. */ this->fd = PQsocket(sql); - Instance->Log(DEBUG, "New SQL socket: %d", this->fd); if(this->fd <= -1) - { - Instance->Log(DEBUG, "PQsocket says we have an invalid FD: %d", this->fd); return false; - } if (!this->Instance->SE->AddFd(this)) { - Instance->Log(DEBUG, "A PQsocket cant be added to the socket engine!"); + Instance->Log(DEBUG, "BUG: Couldn't add pgsql socket to socket engine"); return false; } /* Socket all hooked into the engine, now to tell PgSQL to start connecting */ - return DoPoll(); } @@ -586,26 +423,20 @@ class SQLConn : public EventHandler if(PQconsumeInput(sql)) { - Instance->Log(DEBUG, "PQconsumeInput succeeded"); - /* We just read stuff from the server, that counts as it being alive * so update the idle-since time :p */ idle = this->Instance->Time(); - if(PQisBusy(sql)) + if (PQisBusy(sql)) { - //Instance->Log(DEBUG, "Still busy processing command though"); + /* Nothing happens here */ } - else if(qinprog) + else if (qinprog) { - //ServerInstance->Log(DEBUG, "Looks like we have a result to process!"); - /* Grab the request we're processing */ SQLrequest& query = queue.front(); - Instance->Log(DEBUG, "ID is %lu", query.id); - /* Get a pointer to the module we're about to return the result to */ Module* to = query.GetSource(); @@ -632,8 +463,6 @@ class SQLConn : public EventHandler /* Fix by brain, make sure the original query gets sent back in the reply */ reply.query = query.query.q; - Instance->Log(DEBUG, "Got result, status code: %s; error message: %s", PQresStatus(PQresultStatus(result)), PQresultErrorMessage(result)); - switch(PQresultStatus(result)) { case PGRES_EMPTY_QUERY: @@ -655,17 +484,12 @@ class SQLConn : public EventHandler * 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: %lu", query.id); PQclear(result); } qinprog = false; queue.pop(); DoConnectedPoll(); } - else - { - Instance->Log(DEBUG, "Eh!? We just got a read event, and connection isn't busy..but no result :("); - } return true; } else @@ -675,10 +499,8 @@ class SQLConn : public EventHandler * deserves to reconnect [/excuse] * Returning true so the core doesn't try and close the connection. */ - Instance->Log(DEBUG, "PQconsumeInput failed: %s", PQerrorMessage(sql)); - Close(); DelayReconnect(); - return false; + return true; } } @@ -687,85 +509,40 @@ class SQLConn : public EventHandler switch(PQresetPoll(sql)) { case PGRES_POLLING_WRITING: - //ServerInstance->Log(DEBUG, "PGresetPoll: PGRES_POLLING_WRITING"); Instance->SE->WantWrite(this); status = CWRITE; - return true; + return DoPoll(); case PGRES_POLLING_READING: - //ServerInstance->Log(DEBUG, "PGresetPoll: PGRES_POLLING_READING"); status = CREAD; return true; case PGRES_POLLING_FAILED: - //ServerInstance->Log(DEBUG, "PGresetPoll: PGRES_POLLING_FAILED: %s", PQerrorMessage(sql)); return false; case PGRES_POLLING_OK: - //ServerInstance->Log(DEBUG, "PGresetPoll: PGRES_POLLING_OK"); status = WWRITE; return DoConnectedPoll(); default: - //ServerInstance->Log(DEBUG, "PGresetPoll: wtf?"); return true; } } - void ShowStatus() - { - switch(PQstatus(sql)) - { - case CONNECTION_STARTED: - Instance->Log(DEBUG, "PQstatus: CONNECTION_STARTED: Waiting for connection to be made."); - break; - - case CONNECTION_MADE: - Instance->Log(DEBUG, "PQstatus: CONNECTION_MADE: Connection OK; waiting to send."); - break; - - case CONNECTION_AWAITING_RESPONSE: - Instance->Log(DEBUG, "PQstatus: CONNECTION_AWAITING_RESPONSE: Waiting for a response from the server."); - break; - - case CONNECTION_AUTH_OK: - Instance->Log(DEBUG, "PQstatus: CONNECTION_AUTH_OK: Received authentication; waiting for backend start-up to finish."); - break; - - case CONNECTION_SSL_STARTUP: - Instance->Log(DEBUG, "PQstatus: CONNECTION_SSL_STARTUP: Negotiating SSL encryption."); - break; - - case CONNECTION_SETENV: - Instance->Log(DEBUG, "PQstatus: CONNECTION_SETENV: Negotiating environment-driven parameter settings."); - break; - - default: - Instance->Log(DEBUG, "PQstatus: ???"); - } - } - bool OnDataReady() { /* Always return true here, false would close the socket - we need to do that ourselves with the pgsql API */ - Instance->Log(DEBUG, "OnDataReady(): status = %s", StatusStr()); return DoEvent(); } bool OnWriteReady() { /* Always return true here, false would close the socket - we need to do that ourselves with the pgsql API */ - Instance->Log(DEBUG, "OnWriteReady(): status = %s", StatusStr()); return DoEvent(); } bool OnConnected() { - Instance->Log(DEBUG, "OnConnected(): status = %s", StatusStr()); return DoEvent(); } - void DelayReconnect() - { - ReconnectTimer* timer = new ReconnectTimer(Instance, this, us); - Instance->Timers->AddTimer(timer); - } + void DelayReconnect(); bool DoEvent() { @@ -786,15 +563,6 @@ class SQLConn : public EventHandler return ret; } - const char* StatusStr() - { - if(status == CREAD) return "CREAD"; - if(status == CWRITE) return "CWRITE"; - if(status == WREAD) return "WREAD"; - if(status == WWRITE) return "WWRITE"; - return "Err...what, erm..BUG!"; - } - SQLerror DoQuery(SQLrequest &req) { if((status == WREAD) || (status == WWRITE)) @@ -853,11 +621,9 @@ class SQLConn : public EventHandler #endif if(error) { - Instance->Log(DEBUG, "Apparently PQescapeStringConn() failed somehow...don't know how or what to do..."); + Instance->Log(DEBUG, "BUG: Apparently PQescapeStringConn() failed somehow...don't know how or what to do..."); } - Instance->Log(DEBUG, "Appended %d bytes of escaped string onto the query", len); - /* Incremenet queryend to the end of the newly escaped parameter */ queryend += len; @@ -866,7 +632,7 @@ class SQLConn : public EventHandler } else { - Instance->Log(DEBUG, "Found a substitution location but no parameter to substitute :|"); + Instance->Log(DEBUG, "BUG: Found a substitution location but no parameter to substitute :|"); break; } } @@ -879,21 +645,16 @@ class SQLConn : public EventHandler /* Null-terminate the query */ *queryend = 0; - - Instance->Log(DEBUG, "Attempting to dispatch query: %s", query); - req.query.q = query; if(PQsendQuery(sql, query)) { - Instance->Log(DEBUG, "Dispatched query successfully"); qinprog = true; delete[] query; return SQLerror(); } else { - Instance->Log(DEBUG, "Failed to dispatch query: %s", PQerrorMessage(sql)); delete[] query; return SQLerror(QSEND_FAIL, PQerrorMessage(sql)); } @@ -929,21 +690,18 @@ class SQLConn : public EventHandler } void Close() { - DoClose(); - } - - void DoClose() - { - Instance->Log(DEBUG,"SQLConn::Close"); - Instance->Log(DEBUG, "FD IS: %d", this->fd); - - if (!this->Instance->SE->DelFd(this, true)) + if (!this->Instance->SE->DelFd(this)) { - Instance->Log(DEBUG, "PQsocket cant be removed from the socket engine!"); - } - else { - Instance->Log(DEBUG, "FD WAS REMOVED!"); + if (sql && PQstatus(sql) == CONNECTION_BAD) + { + this->Instance->SE->DelFd(this, true); + } + else + { + Instance->Log(DEBUG, "BUG: PQsocket cant be removed from socket engine!"); + } } + if(sql) { PQfinish(sql); @@ -959,6 +717,7 @@ class ModulePgSQL : public Module ConnMap connections; unsigned long currid; char* sqlsuccess; + ReconnectTimer* retimer; public: ModulePgSQL(InspIRCd* Me) @@ -972,7 +731,7 @@ class ModulePgSQL : public Module if (!ServerInstance->PublishFeature("SQL", this)) { - throw ModuleException("m_pgsql: Unable to publish feature 'SQL'"); + throw ModuleException("BUG: PgSQL Unable to publish feature 'SQL'"); } ReadConf(); @@ -982,6 +741,8 @@ class ModulePgSQL : public Module virtual ~ModulePgSQL() { + if (retimer) + ServerInstance->Timers->DelTimer(retimer); ClearAllConnections(); delete[] sqlsuccess; ServerInstance->UnpublishInterface("SQL", this); @@ -1037,7 +798,6 @@ class ModulePgSQL : public Module { SQLhost host; int ipvalid; - insp_inaddr blargle; host.id = conf.ReadValue("database", "id", i); host.host = conf.ReadValue("database", "hostname", i); @@ -1050,7 +810,18 @@ class ModulePgSQL : public Module if (HasHost(host)) continue; - ipvalid = insp_aton(host.host.c_str(), &blargle); +#ifdef IPV6 + if (strchr(host.host.c_str(),':')) + { + in6_addr blargle; + ipvalid = inet_pton(AF_INET6, host.host.c_str(), &blargle); + } + else +#endif + { + in_addr blargle; + ipvalid = inet_aton(host.host.c_str(), &blargle); + } if(ipvalid > 0) { @@ -1072,13 +843,12 @@ class ModulePgSQL : public Module catch(...) { /* THE WORLD IS COMING TO AN END! */ - ServerInstance->Log(DEBUG, "Couldn't make a SQLresolver..this connection is gonna diiiiiie...actually we just won't create it"); } } else { /* Invalid address family, die horribly. */ - ServerInstance->Log(DEBUG, "insp_aton failed returning -1, oh noes."); + ServerInstance->Log(DEBUG, "BUG: insp_aton failed returning -1, oh noes."); } } } @@ -1135,7 +905,8 @@ class ModulePgSQL : public Module break; } } - ReadConf(); + retimer = new ReconnectTimer(ServerInstance, this); + ServerInstance->Timers->AddTimer(retimer); } virtual char* OnRequest(Request* request) @@ -1144,9 +915,6 @@ class ModulePgSQL : public Module { 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()) { /* Execute query */ @@ -1161,9 +929,6 @@ class ModulePgSQL : public Module return NULL; } } - - ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId()); - return NULL; } @@ -1207,29 +972,13 @@ void SQLresolver::OnLookupComplete(const std::string &result, unsigned int ttl, void ReconnectTimer::Tick(time_t time) { - ((ModulePgSQL*)mod)->ReconnectConn(conn); + ((ModulePgSQL*)mod)->ReadConf(); } - -class ModulePgSQLFactory : public ModuleFactory +void SQLConn::DelayReconnect() { - public: - ModulePgSQLFactory() - { - } - - ~ModulePgSQLFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModulePgSQL(Me); - } -}; + ((ModulePgSQL*)us)->ReconnectConn(this); +} +MODULE_INIT(ModulePgSQL); -extern "C" void * init_module( void ) -{ - return new ModulePgSQLFactory; -}