* ---------------------------------------------------
*/
+#include <cstdlib>
#include <sstream>
#include <string>
#include <deque>
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.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` */
+/* $CompileFlags: -I`pg_config --includedir` `perl extra/pgsql_config.pl` */
/* $LinkerFlags: -L`pg_config --libdir` -lpq */
/* UGH, UGH, UGH, UGH, UGH, UGH
* reimplementing them I need this so
* I can access the socket engine :\
*/
-extern InspIRCd* ServerInstance;
-InspSocket* socket_ref[MAX_DESCRIPTORS];
/* Forward declare, so we can have the typedef neatly at the top */
class SQLConn;
/* CREAD, Connecting and wants read event
* CWRITE, Connecting and wants write event
* WREAD, Connected/Working and wants read event
- * WWRITE, Connected/Working and wants write event
+ * WWRITE, Connected/Working and wants write event
+ * RREAD, Resetting and wants read event
+ * RWRITE, Resetting and wants write event
*/
-enum SQLstatus { CREAD, CWRITE, WREAD, WWRITE };
+enum SQLstatus { CREAD, CWRITE, WREAD, WWRITE, RREAD, RWRITE };
+
+/** SQLhost, simple structure to store information about a SQL-connection-to-be
+ * We use this struct simply to make it neater passing around host information
+ * when we're creating connections and resolving hosts.
+ * Rather than giving SQLresolver a parameter for every field here so it can in
+ * turn call SQLConn's constructor with them all, both can simply use a SQLhost.
+ */
+class SQLhost
+{
+ public:
+ std::string id; /* Database handle id */
+ std::string host; /* Database server hostname */
+ unsigned int port; /* Database server port */
+ std::string name; /* Database name */
+ std::string user; /* Database username */
+ std::string pass; /* Database password */
+ bool ssl; /* If we should require SSL */
+
+ SQLhost()
+ {
+ }
+
+ SQLhost(const std::string& i, const std::string& h, unsigned int p, const std::string& n, const std::string& u, const std::string& pa, bool s)
+ : id(i), host(h), port(p), name(n), user(u), pass(pa), ssl(s)
+ {
+ }
+};
+
+/** Used to resolve sql server hostnames
+ */
+class SQLresolver : public Resolver
+{
+ private:
+ SQLhost host;
+ ModulePgSQL* mod;
+ public:
+ SQLresolver(ModulePgSQL* m, InspIRCd* Instance, const SQLhost& hi)
+ : Resolver(Instance, hi.host, DNS_QUERY_FORWARD, (Module*)m), host(hi), mod(m)
+ {
+ }
+
+ virtual void OnLookupComplete(const std::string &result);
+
+ virtual void OnError(ResolverError e, const std::string &errormessage)
+ {
+ ServerInstance->Log(DEBUG, "DNS lookup failed (%s), dying horribly", errormessage.c_str());
+ }
+
+ virtual ~SQLresolver()
+ {
+ }
+};
/** QueryQueue, a queue of queries waiting to be executed.
* This maintains two queues internally, one for 'priority'
class QueryQueue : public classbase
{
private:
- std::deque<SQLrequest> priority; /* The priority queue */
- std::deque<SQLrequest> normal; /* The 'normal' queue */
+ typedef std::deque<SQLrequest> 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:
void push(const SQLrequest &q)
{
- log(DEBUG, "QueryQueue::push(): Adding %s query to queue: %s", ((q.pri) ? "priority" : "non-priority"), q.query.c_str());
+ //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);
{
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.
{
PGresult* res;
int currentrow;
+ int rows;
+ int cols;
SQLfieldList* fieldlist;
SQLfieldMap* fieldmap;
public:
- PgSQLresult(Module* self, Module* to, PGresult* result)
- : SQLresult(self, to), res(result), currentrow(0), fieldlist(NULL), fieldmap(NULL)
+ PgSQLresult(Module* self, Module* to, unsigned long id, PGresult* result)
+ : SQLresult(self, to, id), res(result), currentrow(0), fieldlist(NULL), fieldmap(NULL)
{
- int rows = PQntuples(res);
- int cols = PQnfields(res);
+ rows = PQntuples(res);
+ cols = PQnfields(res);
- log(DEBUG, "Created new PgSQL result; %d rows, %d columns", rows, cols);
+ //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);
+
+ if(fieldmap)
+ DELETE(fieldmap);
+
PQclear(res);
}
virtual int Rows()
{
- return PQntuples(res);
+ if(!cols && !rows)
+ {
+ return atoi(PQcmdTuples(res));
+ }
+ else
+ {
+ return rows;
+ }
}
virtual int Cols()
}
else
{
- log(DEBUG, "PQgetvalue returned a null pointer..nobody wants to tell us what this means");
+ //ServerInstance->Log(DEBUG, "PQgetvalue returned a null pointer..nobody wants to tell us what this means");
throw SQLbadColName();
}
}
{
private:
ModulePgSQL* us; /* Pointer to the SQL provider itself */
- Server* Srv; /* Server* for..uhm..something, maybe */
std::string dbhost; /* Database server hostname */
unsigned int dbport; /* Database server port */
std::string dbname; /* Database name */
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 */
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(ModulePgSQL* self, Server* srv, const std::string &h, unsigned int p, const std::string &d, const std::string &u, const std::string &pwd, bool s);
+ SQLConn(InspIRCd* SI, ModulePgSQL* self, const SQLhost& hostinfo);
~SQLConn();
- bool DoResolve();
-
bool DoConnect();
virtual void Close();
bool DoPoll();
bool DoConnectedPoll();
+
+ bool DoResetPoll();
void ShowStatus();
bool DoEvent();
+ bool Reconnect();
+
std::string MkInfoStr();
const char* StatusStr();
- SQLerror DoQuery(const SQLrequest &req);
+ SQLerror DoQuery(SQLrequest &req);
SQLerror Query(const SQLrequest &req);
+
+ void OnUnloadModule(Module* mod);
};
class ModulePgSQL : public Module
{
private:
- Server* Srv;
+
ConnMap connections;
unsigned long currid;
char* sqlsuccess;
public:
- ModulePgSQL(Server* Me)
- : Module::Module(Me), Srv(Me), currid(0)
+ ModulePgSQL(InspIRCd* Me)
+ : Module::Module(Me), currid(0)
{
- log(DEBUG, "%s 'SQL' feature", Srv->PublishFeature("SQL", this) ? "Published" : "Couldn't publish");
- log(DEBUG, "%s 'PgSQL' feature", Srv->PublishFeature("PgSQL", this) ? "Published" : "Couldn't publish");
+ ServerInstance->Log(DEBUG, "%s 'SQL' feature", ServerInstance->PublishFeature("SQL", this) ? "Published" : "Couldn't publish");
sqlsuccess = new char[strlen(SQLSUCCESS)+1];
- strcpy(sqlsuccess, SQLSUCCESS);
+ strlcpy(sqlsuccess, SQLSUCCESS, strlen(SQLSUCCESS)+1);
OnRehash("");
}
void Implements(char* List)
{
- List[I_OnRequest] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1;
+ List[I_OnUnloadModule] = List[I_OnRequest] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1;
}
virtual void OnRehash(const std::string ¶meter)
{
- ConfigReader conf;
+ ConfigReader conf(ServerInstance);
/* Delete all the SQLConn objects in the connection lists,
* this will call their destructors where they can handle
for(int i = 0; i < conf.Enumerate("database"); i++)
{
- std::string id;
- SQLConn* newconn;
+ SQLhost host;
+ int ipvalid;
+ insp_inaddr blargle;
- id = conf.ReadValue("database", "id", i);
- newconn = new SQLConn(this, Srv,
- conf.ReadValue("database", "hostname", i),
- conf.ReadInteger("database", "port", i, true),
- conf.ReadValue("database", "name", i),
- conf.ReadValue("database", "username", i),
- conf.ReadValue("database", "password", i),
- conf.ReadFlag("database", "ssl", i));
+ 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);
- connections.insert(std::make_pair(id, newconn));
+ 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 */
+ this->AddConn(host);
+ }
+ else if(ipvalid == 0)
+ {
+ /* Conversion failed, assume it's a host */
+ SQLresolver* resolver;
+
+ try
+ {
+ resolver = new SQLresolver(this, ServerInstance, host);
+
+ ServerInstance->AddResolver(resolver);
+ }
+ catch(...)
+ {
+ 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.");
+ }
}
}
+ void AddConn(const SQLhost& hi)
+ {
+ 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)
{
- if(strcmp(SQLREQID, request->GetData()) == 0)
+ if(strcmp(SQLREQID, request->GetId()) == 0)
{
SQLrequest* req = (SQLrequest*)request;
ConnMap::iterator iter;
- log(DEBUG, "Got query: '%s' on id '%s'", req->query.c_str(), req->dbid.c_str());
+ 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->error = iter->second->Query(*req);
req->id = NewID();
+ req->error = iter->second->Query(*req);
return (req->error.Id() == NO_ERROR) ? sqlsuccess : NULL;
}
}
}
- log(DEBUG, "Got unsupported API version string: %s", request->GetData());
+ ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId());
return NULL;
}
+ virtual void OnUnloadModule(Module* mod, const std::string& name)
+ {
+ /* 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)
virtual Version GetVersion()
{
- return Version(1, 0, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER);
+ return Version(1, 1, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
}
virtual ~ModulePgSQL()
}
};
-SQLConn::SQLConn(ModulePgSQL* self, Server* srv, const std::string &h, unsigned int p, const std::string &d, const std::string &u, const std::string &pwd, bool s)
-: InspSocket::InspSocket(), us(self), Srv(srv), dbhost(h), dbport(p), dbname(d), dbuser(u), dbpass(pwd), ssl(s), sql(NULL), status(CWRITE), qinprog(false)
+SQLConn::SQLConn(InspIRCd* SI, ModulePgSQL* self, const SQLhost& hi)
+: InspSocket::InspSocket(SI), us(self), dbhost(hi.host), dbport(hi.port), dbname(hi.name), dbuser(hi.user), dbpass(hi.pass), ssl(hi.ssl), sql(NULL), status(CWRITE), qinprog(false)
{
- log(DEBUG, "Creating new PgSQL connection to database %s on %s:%u (%s/%s)", dbname.c_str(), dbhost.c_str(), dbport, dbuser.c_str(), dbpass.c_str());
+ //ServerInstance->Log(DEBUG, "Creating new PgSQL connection to database %s on %s:%u (%s/%s)", dbname.c_str(), dbhost.c_str(), dbport, dbuser.c_str(), dbpass.c_str());
/* Some of this could be reviewed, unsure if I need to fill 'host' etc...
* just copied this over from the InspSocket constructor.
*/
strlcpy(this->host, dbhost.c_str(), MAXBUF);
+ strlcpy(this->IP, dbhost.c_str(), MAXBUF);
this->port = dbport;
+ idle = this->Instance->Time();
this->ClosePending = false;
+
+ Instance->Log(DEBUG,"No need to resolve %s", this->host);
- if(!inet_aton(this->host, &this->addy))
- {
- /* Its not an ip, spawn the resolver.
- * PgSQL doesn't do nonblocking DNS
- * lookups, so we do it for it.
- */
-
- log(DEBUG,"Attempting to resolve %s", this->host);
-
- this->dns.SetNS(Srv->GetConfig()->DNSServer);
- this->dns.ForwardLookupWithFD(this->host, fd);
-
- this->state = I_RESOLVING;
- socket_ref[this->fd] = this;
- return;
- }
- else
+ if(!this->DoConnect())
{
- log(DEBUG,"No need to resolve %s", this->host);
- strlcpy(this->IP, this->host, MAXBUF);
-
- if(!this->DoConnect())
- {
- throw ModuleException("Connect failed");
- }
+ throw ModuleException("Connect failed");
}
}
Close();
}
-bool SQLConn::DoResolve()
-{
- log(DEBUG, "Checking for DNS lookup result");
-
- if(this->dns.HasResult())
- {
- std::string res_ip = dns.GetResultIP();
-
- if(res_ip.length())
- {
- log(DEBUG, "Got result: %s", res_ip.c_str());
-
- strlcpy(this->IP, res_ip.c_str(), MAXBUF);
- dbhost = res_ip;
-
- socket_ref[this->fd] = NULL;
-
- return this->DoConnect();
- }
- else
- {
- log(DEBUG, "DNS lookup failed, dying horribly");
- Close();
- return false;
- }
- }
- else
- {
- log(DEBUG, "No result for lookup yet!");
- return true;
- }
-}
-
bool SQLConn::DoConnect()
{
- log(DEBUG, "SQLConn::DoConnect()");
+ //ServerInstance->Log(DEBUG, "SQLConn::DoConnect()");
if(!(sql = PQconnectStart(MkInfoStr().c_str())))
{
- log(DEBUG, "Couldn't allocate PGconn structure, aborting: %s", PQerrorMessage(sql));
+ Instance->Log(DEBUG, "Couldn't allocate PGconn structure, aborting: %s", PQerrorMessage(sql));
Close();
return false;
}
if(PQstatus(sql) == CONNECTION_BAD)
{
- log(DEBUG, "PQconnectStart failed: %s", PQerrorMessage(sql));
+ Instance->Log(DEBUG, "PQconnectStart failed: %s", PQerrorMessage(sql));
Close();
return false;
}
if(PQsetnonblocking(sql, 1) == -1)
{
- log(DEBUG, "Couldn't set connection nonblocking: %s", PQerrorMessage(sql));
+ Instance->Log(DEBUG, "Couldn't set connection nonblocking: %s", PQerrorMessage(sql));
Close();
return false;
}
* and then start polling it.
*/
- log(DEBUG, "Old DNS socket: %d", this->fd);
+ //ServerInstance->Log(DEBUG, "Old DNS socket: %d", this->fd);
this->fd = PQsocket(sql);
- log(DEBUG, "New SQL socket: %d", this->fd);
+ Instance->Log(DEBUG, "New SQL socket: %d", this->fd);
if(this->fd <= -1)
{
- log(DEBUG, "PQsocket says we have an invalid FD: %d", this->fd);
+ Instance->Log(DEBUG, "PQsocket says we have an invalid FD: %d", this->fd);
Close();
return false;
}
this->state = I_CONNECTING;
- ServerInstance->SE->AddFd(this->fd,false,X_ESTAB_MODULE);
- socket_ref[this->fd] = this;
+ if (!this->Instance->SE->AddFd(this))
+ {
+ Instance->Log(DEBUG, "A PQsocket cant be added to the socket engine!");
+ Close();
+ return false;
+ }
/* Socket all hooked into the engine, now to tell PgSQL to start connecting */
void SQLConn::Close()
{
- log(DEBUG,"SQLConn::Close");
-
- if(this->fd > 01)
- socket_ref[this->fd] = NULL;
+ Instance->Log(DEBUG,"SQLConn::Close");
+
this->fd = -1;
this->state = I_ERROR;
this->OnError(I_ERR_SOCKET);
switch(PQconnectPoll(sql))
{
case PGRES_POLLING_WRITING:
- log(DEBUG, "PGconnectPoll: PGRES_POLLING_WRITING");
+ //ServerInstance->Log(DEBUG, "PGconnectPoll: PGRES_POLLING_WRITING");
WantWrite();
status = CWRITE;
return DoPoll();
case PGRES_POLLING_READING:
- log(DEBUG, "PGconnectPoll: PGRES_POLLING_READING");
+ //ServerInstance->Log(DEBUG, "PGconnectPoll: PGRES_POLLING_READING");
status = CREAD;
- break;
+ return true;
case PGRES_POLLING_FAILED:
- log(DEBUG, "PGconnectPoll: PGRES_POLLING_FAILED: %s", PQerrorMessage(sql));
+ //ServerInstance->Log(DEBUG, "PGconnectPoll: PGRES_POLLING_FAILED: %s", PQerrorMessage(sql));
return false;
case PGRES_POLLING_OK:
- log(DEBUG, "PGconnectPoll: PGRES_POLLING_OK");
+ //ServerInstance->Log(DEBUG, "PGconnectPoll: PGRES_POLLING_OK");
status = WWRITE;
return DoConnectedPoll();
default:
- log(DEBUG, "PGconnectPoll: wtf?");
- break;
+ //ServerInstance->Log(DEBUG, "PGconnectPoll: wtf?");
+ return true;
}
-
- return true;
}
bool SQLConn::DoConnectedPoll()
if(PQconsumeInput(sql))
{
- log(DEBUG, "PQconsumeInput succeeded");
+ 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))
{
- log(DEBUG, "Still busy processing command though");
+ //ServerInstance->Log(DEBUG, "Still busy processing command though");
}
else if(qinprog)
{
- log(DEBUG, "Looks like we have a result to process!");
+ //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();
if(to)
{
/* ..and the result */
- log(DEBUG, "Got result, status code: %s; error message: %s", PQresStatus(PQresultStatus(result)), PQresultErrorMessage(result));
-
- PgSQLresult reply(us, to, 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:
+ reply.error.Id(QREPLY_FAIL);
+ reply.error.Str(PQresultErrorMessage(result));
+ default:;
+ /* No action, other values are not errors */
+ }
reply.Send();
* 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...
*/
- 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);
+ 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);
}
queue.pop();
DoConnectedPoll();
}
+ else
+ {
+ Instance->Log(DEBUG, "Eh!? We just got a read event, and connection isn't busy..but no result :(");
+ }
return true;
}
-
- log(DEBUG, "PQconsumeInput failed: %s", PQerrorMessage(sql));
- return false;
+ else
+ {
+ /* 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;
+ }
+}
+
+bool SQLConn::DoResetPoll()
+{
+ switch(PQresetPoll(sql))
+ {
+ 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;
+ }
}
void SQLConn::ShowStatus()
switch(PQstatus(sql))
{
case CONNECTION_STARTED:
- log(DEBUG, "PQstatus: CONNECTION_STARTED: Waiting for connection to be made.");
+ Instance->Log(DEBUG, "PQstatus: CONNECTION_STARTED: Waiting for connection to be made.");
break;
case CONNECTION_MADE:
- log(DEBUG, "PQstatus: CONNECTION_MADE: Connection OK; waiting to send.");
+ Instance->Log(DEBUG, "PQstatus: CONNECTION_MADE: Connection OK; waiting to send.");
break;
case CONNECTION_AWAITING_RESPONSE:
- log(DEBUG, "PQstatus: CONNECTION_AWAITING_RESPONSE: Waiting for a response from the server.");
+ Instance->Log(DEBUG, "PQstatus: CONNECTION_AWAITING_RESPONSE: Waiting for a response from the server.");
break;
case CONNECTION_AUTH_OK:
- log(DEBUG, "PQstatus: CONNECTION_AUTH_OK: Received authentication; waiting for backend start-up to finish.");
+ Instance->Log(DEBUG, "PQstatus: CONNECTION_AUTH_OK: Received authentication; waiting for backend start-up to finish.");
break;
case CONNECTION_SSL_STARTUP:
- log(DEBUG, "PQstatus: CONNECTION_SSL_STARTUP: Negotiating SSL encryption.");
+ Instance->Log(DEBUG, "PQstatus: CONNECTION_SSL_STARTUP: Negotiating SSL encryption.");
break;
case CONNECTION_SETENV:
- log(DEBUG, "PQstatus: CONNECTION_SETENV: Negotiating environment-driven parameter settings.");
+ Instance->Log(DEBUG, "PQstatus: CONNECTION_SETENV: Negotiating environment-driven parameter settings.");
break;
default:
- log(DEBUG, "PQstatus: ???");
+ Instance->Log(DEBUG, "PQstatus: ???");
}
}
bool SQLConn::OnDataReady()
{
/* Always return true here, false would close the socket - we need to do that ourselves with the pgsql API */
- log(DEBUG, "OnDataReady(): status = %s", StatusStr());
+ Instance->Log(DEBUG, "OnDataReady(): status = %s", StatusStr());
return DoEvent();
}
bool SQLConn::OnWriteReady()
{
/* Always return true here, false would close the socket - we need to do that ourselves with the pgsql API */
- log(DEBUG, "OnWriteReady(): status = %s", StatusStr());
+ Instance->Log(DEBUG, "OnWriteReady(): status = %s", StatusStr());
return DoEvent();
}
bool SQLConn::OnConnected()
{
- log(DEBUG, "OnConnected(): status = %s", StatusStr());
+ Instance->Log(DEBUG, "OnConnected(): status = %s", StatusStr());
return DoEvent();
}
+bool SQLConn::Reconnect()
+{
+ Instance->Log(DEBUG, "Initiating reconnect");
+
+ 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;
{
ret = DoPoll();
}
+ else if((status == RREAD) || (status == RWRITE))
+ {
+ ret = DoResetPoll();
+ }
else
{
ret = DoConnectedPoll();
switch(PQflush(sql))
{
case -1:
- log(DEBUG, "Error flushing write queue: %s", PQerrorMessage(sql));
+ Instance->Log(DEBUG, "Error flushing write queue: %s", PQerrorMessage(sql));
break;
case 0:
- log(DEBUG, "Successfully flushed write queue (or there was nothing to write)");
+ Instance->Log(DEBUG, "Successfully flushed write queue (or there was nothing to write)");
break;
case 1:
- log(DEBUG, "Not all of the write queue written, triggering write event so we can have another go");
+ Instance->Log(DEBUG, "Not all of the write queue written, triggering write event so we can have another go");
WantWrite();
break;
}
return "Err...what, erm..BUG!";
}
-SQLerror SQLConn::DoQuery(const SQLrequest &req)
+SQLerror SQLConn::DoQuery(SQLrequest &req)
{
if((status == WREAD) || (status == WWRITE))
{
if(!qinprog)
{
- if(PQsendQuery(sql, req.query.c_str()))
+ /* 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++)
{
- log(DEBUG, "Dispatched query: %s", req.query.c_str());
+ 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)];
+ 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(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;
+
+#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)
+ {
+ 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++;
+ }
+ }
+
+ /* 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
{
- log(DEBUG, "Failed to dispatch query: %s", PQerrorMessage(sql));
+ Instance->Log(DEBUG, "Failed to dispatch query: %s", PQerrorMessage(sql));
+ delete[] query;
return SQLerror(QSEND_FAIL, PQerrorMessage(sql));
}
}
}
- log(DEBUG, "Can't query until connection is complete");
+ Instance->Log(DEBUG, "Can't query until connection is complete");
return SQLerror(BAD_CONN, "Can't query until connection is complete");
}
}
}
+void SQLConn::OnUnloadModule(Module* mod)
+{
+ queue.PurgeModule(mod);
+}
+
+void SQLresolver::OnLookupComplete(const std::string &result)
+{
+ host.host = result;
+ mod->AddConn(host);
+}
+
class ModulePgSQLFactory : public ModuleFactory
{
public:
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModulePgSQL(Me);
}
projects / user / henk / code / inspircd.git / blobdiff