X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_pgsql.cpp;h=ab6908d171d0e200986fb3ee5d37eec0c13cff92;hb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;hp=f11940309dcdb5d4460bedf1e44cec6e3d06fe44;hpb=be8a96afedf969076f1c59d094e277f426e6bab3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index f11940309..ab6908d17 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -1,47 +1,47 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2006-2007, 2009 Dennis Friis + * Copyright (C) 2006-2007, 2009 Craig Edwards + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2006 Oliver Lupton * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + +#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" +#include "sql.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 */ -/* $ModDep: m_sqlv2.h */ - +/* $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 */ /* SQLConn rewritten by peavey to * use EventHandler instead of - * InspSocket. This is much neater + * 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 */ class SQLConn; +class ModulePgSQL; typedef std::map ConnMap; @@ -54,187 +54,22 @@ typedef std::map ConnMap; */ enum SQLstatus { CREAD, CWRITE, WREAD, WWRITE, RREAD, RWRITE }; -/** SQLhost::GetDSN() - Overload to return correct DSN for PostgreSQL - */ -std::string SQLhost::GetDSN() -{ - std::ostringstream conninfo("connect_timeout = '2'"); - - if (ip.length()) - conninfo << " hostaddr = '" << ip << "'"; - - if (port) - conninfo << " port = '" << port << "'"; - - if (name.length()) - conninfo << " dbname = '" << name << "'"; - - if (user.length()) - conninfo << " user = '" << user << "'"; - - if (pass.length()) - conninfo << " password = '" << pass << "'"; - - if (ssl) - conninfo << " sslmode = 'require'"; - - return conninfo.str(); -} - -/** Used to resolve sql server hostnames - */ -class SQLresolver : public Resolver +class ReconnectTimer : public Timer { private: - SQLhost host; - Module* mod; + ModulePgSQL* 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) - { - } - - virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached); - - virtual void OnError(ResolverError e, const std::string &errormessage) + ReconnectTimer(ModulePgSQL* m) : Timer(5, ServerInstance->Time(), false), mod(m) { - 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 +struct QueueItem { -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); - } - } - } - } + SQLQuery* c; + std::string q; + QueueItem(SQLQuery* C, const std::string& Q) : c(C), q(Q) {} }; /** PgSQLresult is a subclass of the mostly-pure-virtual class SQLresult. @@ -244,239 +79,105 @@ private: * data is passes to the module nearly as directly as if it was using the API directly itself. */ -class PgSQLresult : public SQLresult +class PgSQLresult : public SQLResult { PGresult* res; int currentrow; int rows; - int cols; - - 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) + public: + PgSQLresult(PGresult* result) : res(result), currentrow(0) { rows = PQntuples(res); - cols = PQnfields(res); - - //ServerInstance->Log(DEBUG, "Created new PgSQL result; %d rows, %d columns, %s affected", rows, cols, PQcmdTuples(res)); + if (!rows) + rows = atoi(PQcmdTuples(res)); } ~PgSQLresult() { - /* If we allocated these, free them... */ - if(fieldlist) - DELETE(fieldlist); - - if(fieldmap) - DELETE(fieldmap); - PQclear(res); } virtual int Rows() { - if(!cols && !rows) - { - return atoi(PQcmdTuples(res)); - } - else - { - return rows; - } - } - - virtual int Cols() - { - return PQnfields(res); + return rows; } - virtual std::string ColName(int column) + virtual void GetCols(std::vector& result) { - char* name = PQfname(res, column); - - return (name) ? name : ""; - } - - virtual int ColNum(const std::string &column) - { - int n = PQfnumber(res, column.c_str()); - - if(n == -1) + result.resize(PQnfields(res)); + for(unsigned int i=0; i < result.size(); i++) { - throw SQLbadColName(); - } - else - { - return n; + result[i] = PQfname(res, i); } } - virtual SQLfield GetValue(int row, int column) + virtual SQLEntry GetValue(int row, int column) { char* v = PQgetvalue(res, row, column); + if (!v || PQgetisnull(res, row, column)) + return SQLEntry(); - if(v) - { - return SQLfield(std::string(v, PQgetlength(res, row, column)), PQgetisnull(res, row, column)); - } - else - { - //ServerInstance->Log(DEBUG, "PQgetvalue returned a null pointer..nobody wants to tell us what this means"); - throw SQLbadColName(); - } - } - - virtual SQLfieldList& GetRow() - { - /* In an effort to reduce overhead we don't actually allocate the list - * until the first time it's needed...so... - */ - if(fieldlist) - { - fieldlist->clear(); - } - else - { - fieldlist = new SQLfieldList; - } - - if(currentrow < PQntuples(res)) - { - int cols = PQnfields(res); - - for(int i = 0; i < cols; i++) - { - fieldlist->push_back(GetValue(currentrow, i)); - } - - currentrow++; - } - - return *fieldlist; - } - - virtual SQLfieldMap& GetRowMap() - { - /* In an effort to reduce overhead we don't actually allocate the map - * until the first time it's needed...so... - */ - if(fieldmap) - { - fieldmap->clear(); - } - else - { - fieldmap = new SQLfieldMap; - } - - if(currentrow < PQntuples(res)) - { - int cols = PQnfields(res); - - for(int i = 0; i < cols; i++) - { - fieldmap->insert(std::make_pair(ColName(i), GetValue(currentrow, i))); - } - - currentrow++; - } - - return *fieldmap; - } - - virtual SQLfieldList* GetRowPtr() - { - SQLfieldList* fl = new SQLfieldList; - - if(currentrow < PQntuples(res)) - { - int cols = PQnfields(res); - - for(int i = 0; i < cols; i++) - { - fl->push_back(GetValue(currentrow, i)); - } - - currentrow++; - } - - return fl; + return SQLEntry(std::string(v, PQgetlength(res, row, column))); } - virtual SQLfieldMap* GetRowMapPtr() + virtual bool GetRow(SQLEntries& result) { - SQLfieldMap* fm = new SQLfieldMap; + if (currentrow >= PQntuples(res)) + return false; + int ncols = PQnfields(res); - if(currentrow < PQntuples(res)) + for(int i = 0; i < ncols; i++) { - int cols = PQnfields(res); - - for(int i = 0; i < cols; i++) - { - fm->insert(std::make_pair(ColName(i), GetValue(currentrow, i))); - } - - currentrow++; + result.push_back(GetValue(currentrow, i)); } + currentrow++; - return fm; - } - - virtual void Free(SQLfieldMap* fm) - { - DELETE(fm); - } - - virtual void Free(SQLfieldList* fl) - { - DELETE(fl); + return true; } }; /** SQLConn represents one SQL session. */ -class SQLConn : public EventHandler +class SQLConn : public SQLProvider, public EventHandler { - private: - InspIRCd* Instance; - SQLhost confhost; /* The entry */ - Module* us; /* Pointer to the SQL provider itself */ + public: + reference conf; /* The entry */ + std::deque queue; PGconn* sql; /* PgSQL database connection handle */ SQLstatus status; /* PgSQL database connection status */ - 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 */ - - bool wantwrite; + QueueItem qinprog; /* If there is currently a query in progress */ - public: - SQLConn(InspIRCd* SI, Module* self, const SQLhost& hi) - : EventHandler(), Instance(SI), confhost(hi), us(self), sql(NULL), status(CWRITE), qinprog(false) + SQLConn(Module* Creator, ConfigTag* tag) + : SQLProvider(Creator, "SQL/" + tag->getString("id")), conf(tag), sql(NULL), status(CWRITE), qinprog(NULL, "") { - wantwrite = false; - idle = this->Instance->Time(); - - if(!DoConnect()) + if (!DoConnect()) { - Instance->Log(DEFAULT, "WARNING: Could not connect to database with id: " + ConvToStr(hi.id)); + ServerInstance->Logs->Log("m_pgsql",DEFAULT, "WARNING: Could not connect to database " + tag->getString("id")); + DelayReconnect(); } } - ~SQLConn() - { - Close(); - } - - virtual bool Writeable() + CullResult cull() { - return wantwrite; + this->SQLProvider::cull(); + ServerInstance->Modules->DelService(*this); + return this->EventHandler::cull(); } - virtual bool Readable() + ~SQLConn() { - return !wantwrite; + SQLerror err(SQL_BAD_DBID); + if (qinprog.c) + { + qinprog.c->OnError(err); + delete qinprog.c; + } + for(std::deque::iterator i = queue.begin(); i != queue.end(); i++) + { + SQLQuery* q = i->c; + q->OnError(err); + delete q; + } } virtual void HandleEvent(EventType et, int errornum) @@ -484,65 +185,70 @@ class SQLConn : public EventHandler switch (et) { case EVENT_READ: - OnDataReady(); - wantwrite = true; - break; - case EVENT_WRITE: - OnWriteReady(); - wantwrite = false; + DoEvent(); break; case EVENT_ERROR: - Reconnect(); - break; - - default: - break; + DelayReconnect(); } } + std::string GetDSN() + { + std::ostringstream conninfo("connect_timeout = '5'"); + std::string item; + + if (conf->readString("host", item)) + conninfo << " host = '" << item << "'"; + + if (conf->readString("port", item)) + conninfo << " port = '" << item << "'"; + + if (conf->readString("name", item)) + conninfo << " dbname = '" << item << "'"; + + if (conf->readString("user", item)) + conninfo << " user = '" << item << "'"; + + if (conf->readString("pass", item)) + conninfo << " password = '" << item << "'"; + + if (conf->getBool("ssl")) + conninfo << " sslmode = 'require'"; + else + conninfo << " sslmode = 'disable'"; + + return conninfo.str(); + } + bool DoConnect() { - if(!(sql = PQconnectStart(confhost.GetDSN().c_str()))) - { - Instance->Log(DEBUG, "Couldn't allocate PGconn structure, aborting: %s", PQerrorMessage(sql)); - Close(); + sql = PQconnectStart(GetDSN().c_str()); + if (!sql) return false; - } + if(PQstatus(sql) == CONNECTION_BAD) - { - Instance->Log(DEBUG, "PQconnectStart failed: %s", PQerrorMessage(sql)); - Close(); return false; - } - ShowStatus(); + if(PQsetnonblocking(sql, 1) == -1) - { - Instance->Log(DEBUG, "Couldn't set connection nonblocking: %s", PQerrorMessage(sql)); - Close(); return false; - } - this->fd = PQsocket(sql); - Instance->Log(DEBUG, "New SQL socket: %d", this->fd); + /* OK, we've initalised the connection, now to get it hooked into the socket engine + * and then start polling it. + */ + this->fd = PQsocket(sql); if(this->fd <= -1) - { - Instance->Log(DEBUG, "PQsocket says we have an invalid FD: %d", this->fd); - Close(); return false; - } - if (!this->Instance->SE->AddFd(this)) + if (!ServerInstance->SE->AddFd(this, FD_WANT_NO_WRITE | FD_WANT_NO_READ)) { - Instance->Log(DEBUG, "A PQsocket cant be added to the socket engine!"); - Close(); + 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(); } @@ -551,56 +257,42 @@ class SQLConn : public EventHandler switch(PQconnectPoll(sql)) { case PGRES_POLLING_WRITING: - wantwrite = true; + ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_WRITE | FD_WANT_NO_READ); status = CWRITE; - return DoPoll(); + return true; case PGRES_POLLING_READING: + ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); status = CREAD; return true; case PGRES_POLLING_FAILED: return false; case PGRES_POLLING_OK: + ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); status = WWRITE; - return DoConnectedPoll(); + DoConnectedPoll(); default: return true; } } - bool DoConnectedPoll() + void DoConnectedPoll() { - if(!qinprog && queue.totalsize()) +restart: + while (qinprog.q.empty() && !queue.empty()) { /* There's no query currently in progress, and there's queries in the queue. */ - SQLrequest& query = queue.front(); - DoQuery(query); + DoQuery(queue.front()); + queue.pop_front(); } - if(PQconsumeInput(sql)) + 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)) { - //ServerInstance->Log(DEBUG, "Still busy processing command though"); + /* Nothing happens here */ } - else if(qinprog) + else if (qinprog.c) { - //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(); - /* Fetch the result.. */ PGresult* result = PQgetResult(sql); @@ -616,49 +308,31 @@ class SQLConn : public EventHandler result = temp; } - if(to) + /* ..and the result */ + PgSQLresult reply(result); + switch(PQresultStatus(result)) { - /* ..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; - - Instance->Log(DEBUG, "Got result, status code: %s; error message: %s", PQresStatus(PQresultStatus(result)), PQresultErrorMessage(result)); - - switch(PQresultStatus(result)) + case PGRES_EMPTY_QUERY: + case PGRES_BAD_RESPONSE: + case PGRES_FATAL_ERROR: { - 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 */ + SQLerror err(SQL_QREPLY_FAIL, PQresultErrorMessage(result)); + qinprog.c->OnError(err); + break; } - - reply.Send(); - - /* PgSQLresult's destructor will free the PGresult */ + default: + /* Other values are not errors */ + qinprog.c->OnResult(reply); } - 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); - } - qinprog = false; - queue.pop(); - DoConnectedPoll(); + + delete qinprog.c; + qinprog = QueueItem(NULL, ""); + goto restart; } else { - Instance->Log(DEBUG, "Eh!? We just got a read event, and connection isn't busy..but no result :("); + qinprog.q.clear(); } - return true; } else { @@ -667,9 +341,7 @@ 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)); - Reconnect(); - return true; + DelayReconnect(); } } @@ -678,290 +350,145 @@ class SQLConn : public EventHandler switch(PQresetPoll(sql)) { case PGRES_POLLING_WRITING: - //ServerInstance->Log(DEBUG, "PGresetPoll: PGRES_POLLING_WRITING"); - wantwrite = true; + ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_WRITE | FD_WANT_NO_READ); status = CWRITE; return DoPoll(); case PGRES_POLLING_READING: - //ServerInstance->Log(DEBUG, "PGresetPoll: PGRES_POLLING_READING"); + ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); 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"); + ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE); status = WWRITE; - return DoConnectedPoll(); + DoConnectedPoll(); default: - //ServerInstance->Log(DEBUG, "PGresetPoll: wtf?"); return true; } } - void ShowStatus() + void DelayReconnect(); + + void DoEvent() { - switch(PQstatus(sql)) + if((status == CREAD) || (status == CWRITE)) { - 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: ???"); + DoPoll(); } - } - - 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(); - } - - bool Reconnect() - { - Instance->Log(DEBUG, "Initiating reconnect"); - if(PQresetStart(sql)) + else if((status == RREAD) || (status == RWRITE)) { - /* Successfully initiatied database reconnect, - * set flags so PQresetPoll() will be called appropriately - */ - status = RWRITE; - qinprog = false; - return true; + DoResetPoll(); } else { - Instance->Log(DEBUG, "Failed to initiate reconnect...fun"); - return false; + DoConnectedPoll(); } } - bool DoEvent() + void submit(SQLQuery *req, const std::string& q) { - bool ret; - - if((status == CREAD) || (status == CWRITE)) + if (qinprog.q.empty()) { - ret = DoPoll(); - } - else if((status == RREAD) || (status == RWRITE)) - { - ret = DoResetPoll(); + DoQuery(QueueItem(req,q)); } else { - ret = DoConnectedPoll(); + // wait your turn. + queue.push_back(QueueItem(req,q)); } - - 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 = true; - break; - } - - 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) + void submit(SQLQuery *req, const std::string& q, const ParamL& p) { - if((status == WREAD) || (status == WWRITE)) + std::string res; + unsigned int param = 0; + for(std::string::size_type i = 0; i < q.length(); i++) { - if(!qinprog) + if (q[i] != '?') + res.push_back(q[i]); + else { - /* Parse the command string and dispatch 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; - - paramlen = 0; - - for(ParamL::iterator i = req.query.p.begin(); i != req.query.p.end(); i++) - { - paramlen += i->size(); - } - - /* 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() - */ - - query = new char[req.query.q.length() + (paramlen*2) + 1]; - queryend = query; - - /* 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... - */ - - for(unsigned int i = 0; i < req.query.q.length(); i++) + if (param < p.size()) { - 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(req.query.p.size()) - { - int error = 0; - size_t len = 0; - + std::string parm = p[param++]; + char buffer[MAXBUF]; #ifdef PGSQL_HAS_ESCAPECONN - len = PQescapeStringConn(sql, queryend, req.query.p.front().c_str(), req.query.p.front().length(), &error); + int error; + PQescapeStringConn(sql, buffer, parm.c_str(), parm.length(), &error); + if (error) + ServerInstance->Logs->Log("m_pgsql", DEBUG, "BUG: Apparently PQescapeStringConn() failed"); #else - len = PQescapeString (queryend, req.query.p.front().c_str(), req.query.p.front().length()); + PQescapeString (buffer, parm.c_str(), parm.length()); #endif - if(error) - { - Instance->Log(DEBUG, "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; - - /* Remove the parameter we just substituted in */ - req.query.p.pop_front(); - } - else - { - Instance->Log(DEBUG, "Found a substitution location but no parameter to substitute :|"); - break; - } - } - else - { - *queryend = req.query.q[i]; - queryend++; - } + res.append(buffer); } + } + } + submit(req, res); + } - /* 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 + void submit(SQLQuery *req, const std::string& q, const ParamM& p) + { + std::string res; + for(std::string::size_type i = 0; i < q.length(); i++) + { + if (q[i] != '$') + res.push_back(q[i]); + else + { + std::string field; + i++; + while (i < q.length() && isalnum(q[i])) + field.push_back(q[i++]); + i--; + + ParamM::const_iterator it = p.find(field); + if (it != p.end()) { - Instance->Log(DEBUG, "Failed to dispatch query: %s", PQerrorMessage(sql)); - delete[] query; - return SQLerror(QSEND_FAIL, PQerrorMessage(sql)); + std::string parm = it->second; + char buffer[MAXBUF]; +#ifdef PGSQL_HAS_ESCAPECONN + int error; + PQescapeStringConn(sql, buffer, parm.c_str(), parm.length(), &error); + if (error) + ServerInstance->Logs->Log("m_pgsql", DEBUG, "BUG: Apparently PQescapeStringConn() failed"); +#else + PQescapeString (buffer, parm.c_str(), parm.length()); +#endif + res.append(buffer); } } } - - return SQLerror(BAD_CONN, "Can't query until connection is complete"); + submit(req, res); } - SQLerror Query(const SQLrequest &req) + void DoQuery(const QueueItem& req) { - queue.push(req); + if (status != WREAD && status != WWRITE) + { + // whoops, not connected... + SQLerror err(SQL_BAD_CONN); + req.c->OnError(err); + delete req.c; + return; + } - if(!qinprog && queue.totalsize()) + if(PQsendQuery(sql, req.q.c_str())) { - /* There's no query currently in progress, and there's queries in the queue. */ - SQLrequest& query = queue.front(); - return DoQuery(query); + qinprog = req; } else { - return SQLerror(); + SQLerror err(SQL_QSEND_FAIL, PQerrorMessage(sql)); + req.c->OnError(err); + delete req.c; } } - - void OnUnloadModule(Module* mod) + void Close() { - queue.PurgeModule(mod); - } - - const SQLhost GetConfHost() - { - return confhost; - } - - void Close() { - DoClose(); - } - - void DoClose() - { - 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; + ServerInstance->SE->DelFd(this); if(sql) { @@ -969,268 +496,128 @@ class SQLConn : public EventHandler sql = NULL; } } - }; - class ModulePgSQL : public Module { - private: + public: ConnMap connections; - ConnMap deadconnections; - unsigned long currid; - char* sqlsuccess; + ReconnectTimer* retimer; - public: - ModulePgSQL(InspIRCd* Me) - : Module::Module(Me), currid(0) + ModulePgSQL() { - ServerInstance->UseInterface("SQLutils"); - - sqlsuccess = new char[strlen(SQLSUCCESS)+1]; - - strlcpy(sqlsuccess, SQLSUCCESS, strlen(SQLSUCCESS)); - - if (!ServerInstance->PublishFeature("SQL", this)) - { - throw ModuleException("m_pgsql: Unable to publish feature 'SQL'"); - } + } + void init() + { ReadConf(); - ServerInstance->PublishInterface("SQL", this); + Implementation eventlist[] = { I_OnUnloadModule, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 2); } virtual ~ModulePgSQL() { + if (retimer) + ServerInstance->Timers->DelTimer(retimer); ClearAllConnections(); - delete[] sqlsuccess; - ServerInstance->UnpublishInterface("SQL", this); - ServerInstance->UnpublishFeature("SQL"); - ServerInstance->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) - { - for (ConnMap::iterator iter = connections.begin(); iter != connections.end(); iter++) - { - if (host == iter->second->GetConfHost()) - return true; - } - return false; - } - - bool HostInConf(const SQLhost &h) - { - ConfigReader conf(ServerInstance); - for(int i = 0; i < conf.Enumerate("database"); i++) - { - SQLhost host; - host.id = conf.ReadValue("database", "id", i); - host.host = conf.ReadValue("database", "hostname", i); - host.port = conf.ReadInteger("database", "port", i, true); - 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); - if (h == host) - return true; - } - return false; - } - void ReadConf() { - ClearOldConnections(); - - ConfigReader conf(ServerInstance); - for(int i = 0; i < conf.Enumerate("database"); i++) + ConnMap conns; + ConfigTagList tags = ServerInstance->Config->ConfTags("database"); + for(ConfigIter i = tags.first; i != tags.second; i++) { - SQLhost host; - int ipvalid; - insp_inaddr blargle; - - host.id = conf.ReadValue("database", "id", i); - host.host = conf.ReadValue("database", "hostname", i); - host.port = conf.ReadInteger("database", "port", i, true); - 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); - - if (HasHost(host)) + if (i->second->getString("module", "pgsql") != "pgsql") continue; - - ipvalid = insp_aton(host.host.c_str(), &blargle); - - if(ipvalid > 0) + std::string id = i->second->getString("id"); + ConnMap::iterator curr = connections.find(id); + if (curr == connections.end()) { - /* 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"); - } + SQLConn* conn = new SQLConn(this, i->second); + conns.insert(std::make_pair(id, conn)); + ServerInstance->Modules->AddService(*conn); } else { - /* Invalid address family, die horribly. */ - ServerInstance->Log(DEBUG, "insp_aton failed returning -1, oh noes."); - } - } - } - - void ClearOldConnections() - { - ConnMap::iterator iter,safei; - for (iter = connections.begin(); iter != connections.end(); iter++) - { - if (!HostInConf(iter->second->GetConfHost())) - { - DELETE(iter->second); - safei = iter; - --iter; - connections.erase(safei); + conns.insert(*curr); + connections.erase(curr); } } + ClearAllConnections(); + conns.swap(connections); } void ClearAllConnections() { - ConnMap::iterator i; - while ((i = connections.begin()) != connections.end()) + for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++) { - connections.erase(i); - DELETE(i->second); + i->second->cull(); + delete i->second; } + connections.clear(); } - 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()); - 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 OnUnloadModule(Module* mod) { - if(strcmp(SQLREQID, request->GetId()) == 0) + SQLerror err(SQL_BAD_DBID); + for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++) { - 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()) + SQLConn* conn = i->second; + if (conn->qinprog.c && conn->qinprog.c->creator == mod) { - /* Execute query */ - req->id = NewID(); - req->error = iter->second->Query(*req); - - return (req->error.Id() == NO_ERROR) ? sqlsuccess : NULL; + conn->qinprog.c->OnError(err); + delete conn->qinprog.c; + conn->qinprog.c = NULL; } - else + std::deque::iterator j = conn->queue.begin(); + while (j != conn->queue.end()) { - req->error.Id(BAD_DBID); - return NULL; + SQLQuery* q = j->c; + if (q->creator == mod) + { + q->OnError(err); + delete q; + j = conn->queue.erase(j); + } + else + j++; } } - - ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId()); - - return NULL; } - virtual void OnUnloadModule(Module* mod, const std::string& name) + Version GetVersion() { - /* When a module unloads we have to check all the pending queries for all our connections - * and set the Module* specifying where the query came from to NULL. If the query has already - * been dispatched then when it is processed it will be dropped if the pointer is NULL. - * - * If the queries we find are not already being executed then we can simply remove them immediately. - */ - for(ConnMap::iterator iter = connections.begin(); iter != connections.end(); iter++) - { - iter->second->OnUnloadModule(mod); - } - } - - unsigned long NewID() - { - if (currid+1 == 0) - currid++; - - return ++currid; - } - - virtual Version GetVersion() - { - return Version(1, 1, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION); + return Version("PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API", VF_VENDOR); } }; -/* 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, bool cached) +void ReconnectTimer::Tick(time_t time) { - host.ip = result; - ((ModulePgSQL*)mod)->AddConn(host); - ((ModulePgSQL*)mod)->ClearOldConnections(); + mod->retimer = NULL; + mod->ReadConf(); } -class ModulePgSQLFactory : public ModuleFactory +void SQLConn::DelayReconnect() { - public: - ModulePgSQLFactory() - { - } - - ~ModulePgSQLFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) + ModulePgSQL* mod = (ModulePgSQL*)(Module*)creator; + ConnMap::iterator it = mod->connections.find(conf->getString("id")); + if (it != mod->connections.end()) { - return new ModulePgSQL(Me); + mod->connections.erase(it); + ServerInstance->GlobalCulls.AddItem((EventHandler*)this); + if (!mod->retimer) + { + mod->retimer = new ReconnectTimer(mod); + ServerInstance->Timers->AddTimer(mod->retimer); + } } -}; - - -extern "C" void * init_module( void ) -{ - return new ModulePgSQLFactory; } + +MODULE_INIT(ModulePgSQL)