X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_pgsql.cpp;h=b417fc0192b039185240dfcb263725789e0ed933;hb=0da6b3a13def40e8fd002b9fc60f955467f6372d;hp=d5041f6f752e4adcebb00ddca352999fd644985c;hpb=f1ca6c6d71f3e31b333e0be45294bcb30fd89b4d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index d5041f6f7..b417fc019 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,34 +11,23 @@ * --------------------------------------------------- */ +#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 */ -/* UGH, UGH, UGH, UGH, UGH, UGH - * I'm having trouble seeing how I - * can avoid this. The core-defined - * constructors for InspSocket just - * aren't suitable...and if I'm - * reimplementing them I need this so - * I can access the socket engine :\ + +/* SQLConn rewritten by peavey to + * use EventHandler instead of + * BufferedSocket. This is much neater + * and gives total control of destroy + * and delete of resources. */ /* Forward declare, so we can have the typedef neatly at the top */ @@ -55,14 +44,25 @@ typedef std::map ConnMap; */ enum SQLstatus { CREAD, CWRITE, WREAD, WWRITE, RREAD, RWRITE }; +unsigned long count(const char * const str, char a) +{ + unsigned long n = 0; + for (const char *p = reinterpret_cast(str); *p; ++p) + { + if (*p == '?') + ++n; + } + return n; +} + /** SQLhost::GetDSN() - Overload to return correct DSN for PostgreSQL */ std::string SQLhost::GetDSN() { - std::ostringstream conninfo("connect_timeout = '2'"); + std::ostringstream conninfo("connect_timeout = '5'"); - if (ip.length()) - conninfo << " hostaddr = '" << ip << "'"; + if (host.length()) + conninfo << " host = '" << host << "'"; if (port) conninfo << " port = '" << port << "'"; @@ -77,166 +77,29 @@ std::string SQLhost::GetDSN() conninfo << " password = '" << pass << "'"; if (ssl) + { conninfo << " sslmode = 'require'"; + } + else + { + conninfo << " sslmode = 'disable'"; + } return conninfo.str(); } -/** Used to resolve sql server hostnames - */ -class SQLresolver : public Resolver +class ReconnectTimer : public Timer { private: - SQLhost host; Module* mod; public: - SQLresolver(Module* m, InspIRCd* Instance, const SQLhost& hi, bool &cached) - : Resolver(Instance, hi.host, DNS_QUERY_FORWARD, cached, (Module*)m), host(hi), mod(m) + ReconnectTimer(InspIRCd* SI, Module* m) + : Timer(5, SI->Time(), false), mod(m) { } - - virtual void OnLookupComplete(const std::string &result, unsigned int ttl); - - virtual void OnError(ResolverError e, const std::string &errormessage) - { - ServerInstance->Log(DEBUG, "DNS lookup failed (%s), dying horribly", errormessage.c_str()); - } + virtual void Tick(time_t TIME); }; -/** 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); - } - } - } - } -}; /** PgSQLresult is a subclass of the mostly-pure-virtual class SQLresult. * All SQL providers must create their own subclass and define it's methods using that @@ -255,23 +118,21 @@ class PgSQLresult : public SQLresult SQLfieldList* fieldlist; SQLfieldMap* fieldmap; public: - PgSQLresult(Module* self, Module* to, unsigned long id, PGresult* result) - : SQLresult(self, to, id), res(result), currentrow(0), fieldlist(NULL), fieldmap(NULL) + PgSQLresult(Module* self, Module* to, unsigned long rid, PGresult* result) + : SQLresult(self, to, rid), res(result), currentrow(0), fieldlist(NULL), fieldmap(NULL) { rows = PQntuples(res); cols = PQnfields(res); - - //ServerInstance->Log(DEBUG, "Created new PgSQL result; %d rows, %d columns, %s affected", rows, cols, PQcmdTuples(res)); } ~PgSQLresult() { /* If we allocated these, free them... */ if(fieldlist) - DELETE(fieldlist); + delete fieldlist; if(fieldmap) - DELETE(fieldmap); + delete fieldmap; PQclear(res); } @@ -324,7 +185,6 @@ public: } else { - //ServerInstance->Log(DEBUG, "PQgetvalue returned a null pointer..nobody wants to tell us what this means"); throw SQLbadColName(); } } @@ -345,9 +205,9 @@ public: if(currentrow < PQntuples(res)) { - int cols = PQnfields(res); + int ncols = PQnfields(res); - for(int i = 0; i < cols; i++) + for(int i = 0; i < ncols; i++) { fieldlist->push_back(GetValue(currentrow, i)); } @@ -374,9 +234,9 @@ public: if(currentrow < PQntuples(res)) { - int cols = PQnfields(res); + int ncols = PQnfields(res); - for(int i = 0; i < cols; i++) + for(int i = 0; i < ncols; i++) { fieldmap->insert(std::make_pair(ColName(i), GetValue(currentrow, i))); } @@ -393,9 +253,9 @@ public: if(currentrow < PQntuples(res)) { - int cols = PQnfields(res); + int ncols = PQnfields(res); - for(int i = 0; i < cols; i++) + for(int i = 0; i < ncols; i++) { fl->push_back(GetValue(currentrow, i)); } @@ -412,9 +272,9 @@ public: if(currentrow < PQntuples(res)) { - int cols = PQnfields(res); + int ncols = PQnfields(res); - for(int i = 0; i < cols; i++) + for(int i = 0; i < ncols; i++) { fm->insert(std::make_pair(ColName(i), GetValue(currentrow, i))); } @@ -427,25 +287,21 @@ public: virtual void Free(SQLfieldMap* fm) { - DELETE(fm); + delete fm; } virtual void Free(SQLfieldList* fl) { - DELETE(fl); + delete fl; } }; /** SQLConn represents one SQL session. - * Each session has its own persistent connection to the database. - * This is a subclass of InspSocket so it can easily recieve read/write events from the core socket - * engine, unlike the original MySQL module this module does not block. Ever. It gets a mild stabbing - * if it dares to. */ - -class SQLConn : public InspSocket +class SQLConn : public EventHandler { -private: + private: + InspIRCd* ServerInstance; SQLhost confhost; /* The entry */ Module* us; /* Pointer to the SQL provider itself */ PGconn* sql; /* PgSQL database connection handle */ @@ -453,587 +309,500 @@ private: bool qinprog; /* If there is currently a query in progress */ QueryQueue queue; /* Queue of queries waiting to be executed on this connection */ time_t idle; /* Time we last heard from the database */ -public: - - /* This class should only ever be created inside this module, using this constructor, so we don't have to worry about the default ones */ - - SQLConn(InspIRCd* SI, Module* self, const SQLhost& hostinfo); - - ~SQLConn(); - - bool DoConnect(); - - virtual void Close(); - - void DoClose(); - - bool DoPoll(); - - bool DoConnectedPoll(); - - bool DoResetPoll(); - - void ShowStatus(); - - virtual bool OnDataReady(); - - virtual bool OnWriteReady(); - - virtual bool OnConnected(); - - bool DoEvent(); - - bool Reconnect(); - - const char* StatusStr(); - - SQLerror DoQuery(SQLrequest &req); - SQLerror Query(const SQLrequest &req); - - void OnUnloadModule(Module* mod); - - const SQLhost GetConfHost(); -}; - -SQLConn::SQLConn(InspIRCd* SI, Module* self, const SQLhost& hi) -: InspSocket::InspSocket(SI), confhost(hi), us(self), sql(NULL), status(CWRITE), qinprog(false) -{ - idle = this->Instance->Time(); - this->ClosePending = false; - - if(!this->DoConnect()) - { - Instance->Log(DEFAULT, "WARNING: Could not connect to database with id: " + ConvToStr(hi.id)); - } -} - -SQLConn::~SQLConn() -{ - DoClose(); -} - -bool SQLConn::DoConnect() -{ - if(!(sql = PQconnectStart(confhost.GetDSN().c_str()))) + public: + SQLConn(InspIRCd* SI, Module* self, const SQLhost& hi) + : EventHandler(), ServerInstance(SI), confhost(hi), us(self), sql(NULL), status(CWRITE), qinprog(false) { - Instance->Log(DEBUG, "Couldn't allocate PGconn structure, aborting: %s", PQerrorMessage(sql)); - DoClose(); - return false; + idle = this->ServerInstance->Time(); + if(!DoConnect()) + { + ServerInstance->Logs->Log("m_pgsql",DEFAULT, "WARNING: Could not connect to database with id: " + ConvToStr(hi.id)); + DelayReconnect(); + } } - if(PQstatus(sql) == CONNECTION_BAD) + ~SQLConn() { - Instance->Log(DEBUG, "PQconnectStart failed: %s", PQerrorMessage(sql)); - DoClose(); - return false; + Close(); } - ShowStatus(); - - if(PQsetnonblocking(sql, 1) == -1) + virtual void HandleEvent(EventType et, int errornum) { - Instance->Log(DEBUG, "Couldn't set connection nonblocking: %s", PQerrorMessage(sql)); - DoClose(); - return false; - } + switch (et) + { + case EVENT_READ: + OnDataReady(); + break; - /* OK, we've initalised the connection, now to get it hooked into the socket engine - * and then start polling it. - */ + case EVENT_WRITE: + OnWriteReady(); + break; - //ServerInstance->Log(DEBUG, "Old DNS socket: %d", this->fd); - this->fd = PQsocket(sql); - Instance->Log(DEBUG, "New SQL socket: %d", this->fd); + case EVENT_ERROR: + DelayReconnect(); + break; - if(this->fd <= -1) - { - Instance->Log(DEBUG, "PQsocket says we have an invalid FD: %d", this->fd); - DoClose(); - return false; + default: + break; + } } - this->state = I_CONNECTING; - if (!this->Instance->SE->AddFd(this)) + bool DoConnect() { - Instance->Log(DEBUG, "A PQsocket cant be added to the socket engine!"); - DoClose(); - return false; - } + if(!(sql = PQconnectStart(confhost.GetDSN().c_str()))) + return false; - /* Socket all hooked into the engine, now to tell PgSQL to start connecting */ + if(PQstatus(sql) == CONNECTION_BAD) + return false; - return DoPoll(); -} + if(PQsetnonblocking(sql, 1) == -1) + return false; -void SQLConn::Close() { - DoClose(); -} + /* OK, we've initalised the connection, now to get it hooked into the socket engine + * and then start polling it. + */ + this->fd = PQsocket(sql); -bool SQLConn::DoPoll() -{ - switch(PQconnectPoll(sql)) - { - case PGRES_POLLING_WRITING: - //ServerInstance->Log(DEBUG, "PGconnectPoll: PGRES_POLLING_WRITING"); - WantWrite(); - status = CWRITE; - return DoPoll(); - case PGRES_POLLING_READING: - //ServerInstance->Log(DEBUG, "PGconnectPoll: PGRES_POLLING_READING"); - status = CREAD; - return true; - case PGRES_POLLING_FAILED: - //ServerInstance->Log(DEBUG, "PGconnectPoll: PGRES_POLLING_FAILED: %s", PQerrorMessage(sql)); + if(this->fd <= -1) return false; - case PGRES_POLLING_OK: - //ServerInstance->Log(DEBUG, "PGconnectPoll: PGRES_POLLING_OK"); - status = WWRITE; - return DoConnectedPoll(); - default: - //ServerInstance->Log(DEBUG, "PGconnectPoll: wtf?"); - return true; - } -} -bool SQLConn::DoConnectedPoll() -{ - if(!qinprog && queue.totalsize()) - { - /* There's no query currently in progress, and there's queries in the queue. */ - SQLrequest& query = queue.front(); - DoQuery(query); + if (!this->ServerInstance->SE->AddFd(this)) + { + ServerInstance->Logs->Log("m_pgsql",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(); } - if(PQconsumeInput(sql)) + bool DoPoll() { - 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)) + switch(PQconnectPoll(sql)) { - //ServerInstance->Log(DEBUG, "Still busy processing command though"); + case PGRES_POLLING_WRITING: + ServerInstance->SE->WantWrite(this); + status = CWRITE; + return true; + case PGRES_POLLING_READING: + status = CREAD; + return true; + case PGRES_POLLING_FAILED: + return false; + case PGRES_POLLING_OK: + status = WWRITE; + return DoConnectedPoll(); + default: + return true; } - else if(qinprog) - { - //ServerInstance->Log(DEBUG, "Looks like we have a result to process!"); + } - /* Grab the request we're processing */ + bool DoConnectedPoll() + { + if(!qinprog && queue.totalsize()) + { + /* There's no query currently in progress, and there's queries in the queue. */ SQLrequest& query = queue.front(); + DoQuery(query); + } - 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(); - - /* Fetch the result.. */ - PGresult* result = PQgetResult(sql); - - /* PgSQL would allow a query string to be sent which has multiple - * queries in it, this isn't portable across database backends and - * we don't want modules doing it. But just in case we make sure we - * drain any results there are and just use the last one. - * If the module devs are behaving there will only be one result. + if(PQconsumeInput(sql)) + { + /* We just read stuff from the server, that counts as it being alive + * so update the idle-since time :p */ - while (PGresult* temp = PQgetResult(sql)) + idle = this->ServerInstance->Time(); + + if (PQisBusy(sql)) { - PQclear(result); - result = temp; + /* Nothing happens here */ } - - if(to) + else if (qinprog) { - /* ..and the result */ - PgSQLresult reply(us, to, query.id, result); + /* Grab the request we're processing */ + SQLrequest& query = queue.front(); - /* Fix by brain, make sure the original query gets sent back in the reply */ - reply.query = query.query.q; + /* Get a pointer to the module we're about to return the result to */ + Module* to = query.GetSource(); - Instance->Log(DEBUG, "Got result, status code: %s; error message: %s", PQresStatus(PQresultStatus(result)), PQresultErrorMessage(result)); + /* Fetch the result.. */ + PGresult* result = PQgetResult(sql); - switch(PQresultStatus(result)) + /* PgSQL would allow a query string to be sent which has multiple + * queries in it, this isn't portable across database backends and + * we don't want modules doing it. But just in case we make sure we + * drain any results there are and just use the last one. + * If the module devs are behaving there will only be one result. + */ + while (PGresult* temp = PQgetResult(sql)) { - case PGRES_EMPTY_QUERY: - case PGRES_BAD_RESPONSE: - case PGRES_FATAL_ERROR: - reply.error.Id(QREPLY_FAIL); - reply.error.Str(PQresultErrorMessage(result)); - default:; - /* No action, other values are not errors */ + PQclear(result); + result = temp; } - reply.Send(); + if(to) + { + /* ..and the result */ + PgSQLresult reply(us, to, query.id, result); + + /* Fix by brain, make sure the original query gets sent back in the reply */ + reply.query = query.query.q; - /* PgSQLresult's destructor will free the PGresult */ - } - else - { - /* If the client module is unloaded partway through a query then the provider will set - * 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); - } + switch(PQresultStatus(result)) + { + case PGRES_EMPTY_QUERY: + case PGRES_BAD_RESPONSE: + case PGRES_FATAL_ERROR: + reply.error.Id(SQL_QREPLY_FAIL); + reply.error.Str(PQresultErrorMessage(result)); + default: + ; + /* No action, other values are not errors */ + } - qinprog = false; - queue.pop(); - DoConnectedPoll(); + reply.Send(); + + /* PgSQLresult's destructor will free the PGresult */ + } + else + { + /* If the client module is unloaded partway through a query then the provider will set + * 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... + */ + PQclear(result); + } + qinprog = false; + queue.pop(); + DoConnectedPoll(); + } + return true; } else { - Instance->Log(DEBUG, "Eh!? We just got a read event, and connection isn't busy..but no result :("); + /* I think we'll assume this means the server died...it might not, + * but I think that any error serious enough we actually get here + * deserves to reconnect [/excuse] + * Returning true so the core doesn't try and close the connection. + */ + DelayReconnect(); + return true; } - - return true; } - else + + bool DoResetPoll() { - /* I think we'll assume this means the server died...it might not, - * but I think that any error serious enough we actually get here - * deserves to reconnect [/excuse] - * Returning true so the core doesn't try and close the connection. - */ - Instance->Log(DEBUG, "PQconsumeInput failed: %s", PQerrorMessage(sql)); - Reconnect(); - return true; + switch(PQresetPoll(sql)) + { + case PGRES_POLLING_WRITING: + ServerInstance->SE->WantWrite(this); + status = CWRITE; + return DoPoll(); + case PGRES_POLLING_READING: + status = CREAD; + return true; + case PGRES_POLLING_FAILED: + return false; + case PGRES_POLLING_OK: + status = WWRITE; + return DoConnectedPoll(); + default: + return true; + } } -} -bool SQLConn::DoResetPoll() -{ - switch(PQresetPoll(sql)) + bool OnDataReady() { - case PGRES_POLLING_WRITING: - //ServerInstance->Log(DEBUG, "PGresetPoll: PGRES_POLLING_WRITING"); - WantWrite(); - status = CWRITE; - 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; + /* Always return true here, false would close the socket - we need to do that ourselves with the pgsql API */ + return DoEvent(); } -} -void SQLConn::ShowStatus() -{ - switch(PQstatus(sql)) + bool OnWriteReady() { - 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; + /* Always return true here, false would close the socket - we need to do that ourselves with the pgsql API */ + return DoEvent(); + } - case CONNECTION_AUTH_OK: - Instance->Log(DEBUG, "PQstatus: CONNECTION_AUTH_OK: Received authentication; waiting for backend start-up to finish."); - break; + bool OnConnected() + { + return DoEvent(); + } - case CONNECTION_SSL_STARTUP: - Instance->Log(DEBUG, "PQstatus: CONNECTION_SSL_STARTUP: Negotiating SSL encryption."); - break; + void DelayReconnect(); - case CONNECTION_SETENV: - Instance->Log(DEBUG, "PQstatus: CONNECTION_SETENV: Negotiating environment-driven parameter settings."); - break; + bool DoEvent() + { + bool ret; - default: - Instance->Log(DEBUG, "PQstatus: ???"); + if((status == CREAD) || (status == CWRITE)) + { + ret = DoPoll(); + } + else if((status == RREAD) || (status == RWRITE)) + { + ret = DoResetPoll(); + } + else + { + ret = DoConnectedPoll(); + } + return ret; } -} -bool SQLConn::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(); -} + SQLerror DoQuery(SQLrequest &req) + { + if((status == WREAD) || (status == WWRITE)) + { + if(!qinprog) + { + /* Parse the command string and dispatch it */ -bool SQLConn::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()); + /* Pointer to the buffer we screw around with substitution in */ + char* query; + /* Pointer to the current end of query, where we append new stuff */ + char* queryend; - return DoEvent(); -} + /* Total length of the unescaped parameters */ + unsigned long maxparamlen, paramcount; -bool SQLConn::OnConnected() -{ - Instance->Log(DEBUG, "OnConnected(): status = %s", StatusStr()); + /* The length of the longest parameter */ + maxparamlen = 0; - return DoEvent(); -} + for(ParamL::iterator i = req.query.p.begin(); i != req.query.p.end(); i++) + { + if (i->size() > maxparamlen) + maxparamlen = i->size(); + } -bool SQLConn::Reconnect() -{ - Instance->Log(DEBUG, "Initiating reconnect"); + /* How many params are there in the query? */ + paramcount = count(req.query.q.c_str(), '?'); - if(PQresetStart(sql)) - { - /* Successfully initiatied database reconnect, - * set flags so PQresetPoll() will be called appropriately - */ - status = RWRITE; - qinprog = false; - return true; - } - else - { - Instance->Log(DEBUG, "Failed to initiate reconnect...fun"); - return false; - } -} - -bool SQLConn::DoEvent() -{ - bool ret; + /* This stores copy of params to be inserted with using numbered params 1;3B*/ + ParamL paramscopy(req.query.p); - if((status == CREAD) || (status == CWRITE)) - { - ret = DoPoll(); - } - else if((status == RREAD) || (status == RWRITE)) - { - ret = DoResetPoll(); - } - else - { - ret = DoConnectedPoll(); - } - - switch(PQflush(sql)) - { - case -1: - Instance->Log(DEBUG, "Error flushing write queue: %s", PQerrorMessage(sql)); - break; - case 0: - Instance->Log(DEBUG, "Successfully flushed write queue (or there was nothing to write)"); - break; - case 1: - Instance->Log(DEBUG, "Not all of the write queue written, triggering write event so we can have another go"); - WantWrite(); - break; - } - - return ret; -} + /* To avoid a lot of allocations, allocate enough memory for the biggest the escaped query could possibly be. + * sizeofquery + (maxtotalparamlength*2) + 1 + * + * The +1 is for null-terminating the string for PQsendQuery() + */ -const char* SQLConn::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!"; -} + query = new char[req.query.q.length() + (maxparamlen*paramcount*2) + 1]; + queryend = query; -SQLerror SQLConn::DoQuery(SQLrequest &req) -{ - if((status == WREAD) || (status == WWRITE)) - { - if(!qinprog) - { - /* Parse the command string and dispatch it */ + /* Okay, now we have a buffer large enough we need to start copying the query into it and escaping and substituting + * the parameters into it... + */ - /* Pointer to the buffer we screw around with substitution in */ - char* query; - /* Pointer to the current end of query, where we append new stuff */ - char* queryend; - /* Total length of the unescaped parameters */ - unsigned int paramlen; + for(unsigned int i = 0; i < req.query.q.length(); i++) + { + if(req.query.q[i] == '?') + { + /* We found a place to substitute..what fun. + * Use the PgSQL calls to escape and write the + * escaped string onto the end of our query buffer, + * then we "just" need to make sure queryend is + * pointing at the right place. + */ - paramlen = 0; + /* Is it numbered parameter? + */ - for(ParamL::iterator i = req.query.p.begin(); i != req.query.p.end(); i++) - { - paramlen += i->size(); - } + bool numbered; + numbered = false; - /* 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 PQsendQuery() - */ + /* Numbered parameter number :| + */ + unsigned int paramnum; + paramnum = 0; - query = new char[req.query.q.length() + (paramlen*2) + 1]; - queryend = query; + /* Let's check if it's a numbered param. And also calculate it's number. + */ - /* Okay, now we have a buffer large enough we need to start copying the query into it and escaping and substituting - * the parameters into it... - */ + while ((i < req.query.q.length() - 1) && (req.query.q[i+1] >= '0') && (req.query.q[i+1] <= '9')) + { + numbered = true; + ++i; + paramnum = paramnum * 10 + req.query.q[i] - '0'; + } - for(unsigned int i = 0; i < req.query.q.length(); i++) - { - if(req.query.q[i] == '?') - { - /* We found a place to substitute..what fun. - * Use the PgSQL calls to escape and write the - * escaped string onto the end of our query buffer, - * then we "just" need to make sure queryend is - * pointing at the right place. - */ + if (paramnum > paramscopy.size() - 1) + { + /* index is out of range! + */ + numbered = false; + } - if(req.query.p.size()) - { - int error = 0; - size_t len = 0; + if (numbered) + { + int error = 0; + size_t len = 0; #ifdef PGSQL_HAS_ESCAPECONN - len = PQescapeStringConn(sql, queryend, req.query.p.front().c_str(), req.query.p.front().length(), &error); + len = PQescapeStringConn(sql, queryend, paramscopy[paramnum].c_str(), paramscopy[paramnum].length(), &error); #else - len = PQescapeString (queryend, req.query.p.front().c_str(), req.query.p.front().length()); + len = PQescapeString (queryend, paramscopy[paramnum].c_str(), paramscopy[paramnum].length()); #endif - if(error) - { - Instance->Log(DEBUG, "Apparently PQescapeStringConn() failed somehow...don't know how or what to do..."); + if (error) + { + ServerInstance->Logs->Log("m_pgsql", DEBUG, "BUG: Apparently PQescapeStringConn() failed somehow...don't know how or what to do..."); + } + + /* Incremenet queryend to the end of the newly escaped parameter */ + queryend += len; } + else if (req.query.p.size()) + { + int error = 0; + size_t len = 0; - Instance->Log(DEBUG, "Appended %d bytes of escaped string onto the query", len); +#ifdef PGSQL_HAS_ESCAPECONN + len = PQescapeStringConn(sql, queryend, req.query.p.front().c_str(), req.query.p.front().length(), &error); +#else + len = PQescapeString (queryend, req.query.p.front().c_str(), req.query.p.front().length()); +#endif + if(error) + { + ServerInstance->Logs->Log("m_pgsql",DEBUG, "BUG: Apparently PQescapeStringConn() failed somehow...don't know how or what to do..."); + } - /* Incremenet queryend to the end of the newly escaped parameter */ - queryend += len; + /* Incremenet queryend to the end of the newly escaped parameter */ + queryend += len; - /* Remove the parameter we just substituted in */ - req.query.p.pop_front(); + /* Remove the parameter we just substituted in */ + req.query.p.pop_front(); + } + else + { + ServerInstance->Logs->Log("m_pgsql",DEBUG, "BUG: Found a substitution location but no parameter to substitute :|"); + break; + } } else { - Instance->Log(DEBUG, "Found a substitution location but no parameter to substitute :|"); - break; + *queryend = req.query.q[i]; + queryend++; } } + + /* Null-terminate the query */ + *queryend = 0; + req.query.q = query; + + if(PQsendQuery(sql, query)) + { + qinprog = true; + delete[] query; + return SQLerror(); + } else { - *queryend = req.query.q[i]; - queryend++; + delete[] query; + return SQLerror(SQL_QSEND_FAIL, PQerrorMessage(sql)); } } + } + return SQLerror(SQL_BAD_CONN, "Can't query until connection is complete"); + } - /* Null-terminate the query */ - *queryend = 0; + SQLerror Query(const SQLrequest &req) + { + queue.push(req); + + if(!qinprog && queue.totalsize()) + { + /* There's no query currently in progress, and there's queries in the queue. */ + SQLrequest& query = queue.front(); + return DoQuery(query); + } + else + { + return SQLerror(); + } + } - Instance->Log(DEBUG, "Attempting to dispatch query: %s", query); + void OnUnloadModule(Module* mod) + { + queue.PurgeModule(mod); + } - req.query.q = query; + const SQLhost GetConfHost() + { + return confhost; + } - if(PQsendQuery(sql, query)) + void Close() + { + if (!this->ServerInstance->SE->DelFd(this)) + { + if (sql && PQstatus(sql) == CONNECTION_BAD) { - Instance->Log(DEBUG, "Dispatched query successfully"); - qinprog = true; - delete[] query; - return SQLerror(); + this->ServerInstance->SE->DelFd(this, true); } else { - Instance->Log(DEBUG, "Failed to dispatch query: %s", PQerrorMessage(sql)); - delete[] query; - return SQLerror(QSEND_FAIL, PQerrorMessage(sql)); + ServerInstance->Logs->Log("m_pgsql",DEBUG, "BUG: PQsocket cant be removed from socket engine!"); } } - } - return SQLerror(BAD_CONN, "Can't query until connection is complete"); -} - -SQLerror SQLConn::Query(const SQLrequest &req) -{ - queue.push(req); - - if(!qinprog && queue.totalsize()) - { - /* There's no query currently in progress, and there's queries in the queue. */ - SQLrequest& query = queue.front(); - return DoQuery(query); - } - else - { - return SQLerror(); + if(sql) + { + PQfinish(sql); + sql = NULL; + } } -} -void SQLConn::OnUnloadModule(Module* mod) -{ - queue.PurgeModule(mod); -} - -const SQLhost SQLConn::GetConfHost() -{ - return confhost; -} +}; class ModulePgSQL : public Module { -private: - + private: ConnMap connections; - ConnMap deadconnections; unsigned long currid; char* sqlsuccess; + ReconnectTimer* retimer; -public: + public: ModulePgSQL(InspIRCd* Me) - : Module::Module(Me), currid(0) + : Module(Me), currid(0) { - ServerInstance->UseInterface("SQLutils"); + ServerInstance->Modules->UseInterface("SQLutils"); sqlsuccess = new char[strlen(SQLSUCCESS)+1]; strlcpy(sqlsuccess, SQLSUCCESS, strlen(SQLSUCCESS)); - if (!ServerInstance->PublishFeature("SQL", this)) + if (!ServerInstance->Modules->PublishFeature("SQL", this)) { - throw ModuleException("m_pgsql: Unable to publish feature 'SQL'"); + throw ModuleException("BUG: PgSQL Unable to publish feature 'SQL'"); } ReadConf(); - ServerInstance->PublishInterface("SQL", this); + ServerInstance->Modules->PublishInterface("SQL", this); + Implementation eventlist[] = { I_OnUnloadModule, I_OnRequest, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 3); } virtual ~ModulePgSQL() { + if (retimer) + ServerInstance->Timers->DelTimer(retimer); ClearAllConnections(); delete[] sqlsuccess; - ServerInstance->UnpublishInterface("SQL", this); - ServerInstance->UnpublishFeature("SQL"); - ServerInstance->DoneWithInterface("SQLutils"); + ServerInstance->Modules->UnpublishInterface("SQL", this); + ServerInstance->Modules->UnpublishFeature("SQL"); + ServerInstance->Modules->DoneWithInterface("SQLutils"); } - void Implements(char* List) - { - List[I_OnUnloadModule] = List[I_OnRequest] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1; - } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user) { ReadConf(); } bool HasHost(const SQLhost &host) { - ClearDeadConnections(); for (ConnMap::iterator iter = connections.begin(); iter != connections.end(); iter++) { if (host == iter->second->GetConfHost()) @@ -1044,7 +813,6 @@ public: bool HostInConf(const SQLhost &h) { - ClearDeadConnections(); ConfigReader conf(ServerInstance); for(int i = 0; i < conf.Enumerate("database"); i++) { @@ -1055,7 +823,7 @@ public: 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", i); + host.ssl = conf.ReadFlag("database", "ssl", "0", i); if (h == host) return true; } @@ -1064,14 +832,12 @@ public: void ReadConf() { - ClearDeadConnections(); - ConfigReader conf(ServerInstance); + ClearOldConnections(); + ConfigReader conf(ServerInstance); for(int i = 0; i < conf.Enumerate("database"); i++) { SQLhost host; - int ipvalid; - insp_inaddr blargle; host.id = conf.ReadValue("database", "id", i); host.host = conf.ReadValue("database", "hostname", i); @@ -1079,48 +845,17 @@ public: 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", i); + host.ssl = conf.ReadFlag("database", "ssl", "0", i); if (HasHost(host)) continue; - ipvalid = insp_aton(host.host.c_str(), &blargle); - - if(ipvalid > 0) - { - /* The conversion succeeded, we were given an IP and we can give it straight to SQLConn */ - host.ip = host.host; - this->AddConn(host); - } - else if(ipvalid == 0) - { - /* Conversion failed, assume it's a host */ - SQLresolver* resolver; - - try - { - bool cached; - resolver = new SQLresolver(this, ServerInstance, host, cached); - ServerInstance->AddResolver(resolver, cached); - } - 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."); - } + this->AddConn(host); } - ClearOldConnections(); } void ClearOldConnections() { - ClearDeadConnections(); ConnMap::iterator iter,safei; for (iter = connections.begin(); iter != connections.end(); iter++) { @@ -1136,76 +871,64 @@ public: void ClearAllConnections() { - ClearDeadConnections(); - ConnMap::iterator iter; - while ((iter = connections.begin()) != connections.end()) + ConnMap::iterator i; + while ((i = connections.begin()) != connections.end()) { - connections.erase(iter); - delete iter->second; + connections.erase(i); + delete i->second; } } - void ClearDeadConnections() - { - ConnMap::iterator di; - while ((di = deadconnections.begin()) != deadconnections.end()) - { - ConnMap::iterator iter = connections.find(di->first); - if (iter != connections.end()) - { - connections.erase(iter); - } - deadconnections.erase(di); - } - } - - void AddDeadConn(std::string id, SQLConn* conn) - { - deadconnections[id] = conn; - } - void AddConn(const SQLhost& hi) { if (HasHost(hi)) { - ServerInstance->Log(DEFAULT, "WARNING: A pgsql connection with id: %s already exists, possibly due to DNS delay. Aborting connection attempt.", hi.id.c_str()); + ServerInstance->Logs->Log("m_pgsql",DEFAULT, "WARNING: A pgsql connection with id: %s already exists. Aborting connection attempt.", hi.id.c_str()); return; } SQLConn* newconn; - /* The conversion succeeded, we were given an IP and we can give it straight to SQLConn */ newconn = new SQLConn(ServerInstance, this, hi); connections.insert(std::make_pair(hi.id, newconn)); } - virtual char* OnRequest(Request* request) + void ReconnectConn(SQLConn* conn) + { + for (ConnMap::iterator iter = connections.begin(); iter != connections.end(); iter++) + { + if (conn == iter->second) + { + delete iter->second; + connections.erase(iter); + break; + } + } + retimer = new ReconnectTimer(ServerInstance, this); + ServerInstance->Timers->AddTimer(retimer); + } + + 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()) { /* Execute query */ req->id = NewID(); req->error = iter->second->Query(*req); - return (req->error.Id() == NO_ERROR) ? sqlsuccess : NULL; + return (req->error.Id() == SQL_NO_ERROR) ? sqlsuccess : NULL; } else { - req->error.Id(BAD_DBID); + req->error.Id(SQL_BAD_DBID); return NULL; } } - - ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId()); - return NULL; } @@ -1233,63 +956,18 @@ public: virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION); + return Version("$Id$", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION); } }; -/* move this here to use AddConn, rather that than having the whole - * module above SQLConn, since this is buggin me right now :/ - */ -void SQLresolver::OnLookupComplete(const std::string &result, unsigned int ttl) +void ReconnectTimer::Tick(time_t time) { - host.ip = result; - ((ModulePgSQL*)mod)->AddConn(host); - ((ModulePgSQL*)mod)->ClearOldConnections(); + ((ModulePgSQL*)mod)->ReadConf(); } -/* move this here too, to use AddDeadConn */ -void SQLConn::DoClose() +void SQLConn::DelayReconnect() { - Instance->Log(DEBUG,"SQLConn::Close"); - - if (!this->Instance->SE->DelFd(this)) - { - Instance->Log(DEBUG, "PQsocket cant be removed from the socket engine!"); - } - this->fd = -1; - this->state = I_ERROR; - this->OnError(I_ERR_SOCKET); - this->ClosePending = true; - - if(sql) - { - PQfinish(sql); - sql = NULL; - } - - ((ModulePgSQL*)us)->AddDeadConn(confhost.id, this); + ((ModulePgSQL*)us)->ReconnectConn(this); } -class ModulePgSQLFactory : public ModuleFactory -{ - public: - ModulePgSQLFactory() - { - } - - ~ModulePgSQLFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModulePgSQL(Me); - } -}; - - -extern "C" void * init_module( void ) -{ -// PQregisterThreadLock(pgthreadlock_t(1)); - return new ModulePgSQLFactory; -} +MODULE_INIT(ModulePgSQL)