#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
+
#include "inspircd.h"
#include "configreader.h"
class SQLhost
{
public:
- std::string id; /* Database handle id */
- std::string host; /* Database server hostname */
+ 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 */
+ std::string name; /* Database name */
+ std::string user; /* Database username */
+ std::string pass; /* Database password */
+ bool ssl; /* If we should require SSL */
SQLhost()
{
}
};
+/** Used to resolve sql server hostnames
+ */
class SQLresolver : public Resolver
{
private:
ModulePgSQL* mod;
public:
SQLresolver(ModulePgSQL* m, InspIRCd* Instance, const SQLhost& hi)
- : Resolver(Instance, hi.host, DNS_QUERY_FORWARD), host(hi), mod(m)
+ : Resolver(Instance, hi.host, DNS_QUERY_FORWARD, (Module*)m), host(hi), mod(m)
{
}
virtual void OnError(ResolverError e, const std::string &errormessage)
{
- log(DEBUG, "DNS lookup failed (%s), dying horribly", errormessage.c_str());
+ ServerInstance->Log(DEBUG, "DNS lookup failed (%s), dying horribly", errormessage.c_str());
}
virtual ~SQLresolver()
void push(const SQLrequest &q)
{
- log(DEBUG, "QueryQueue::push(): Adding %s query to queue: %s", ((q.pri) ? "priority" : "non-priority"), q.query.q.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);
rows = PQntuples(res);
cols = PQnfields(res);
- log(DEBUG, "Created new PgSQL result; %d rows, %d columns, %s affected", rows, cols, PQcmdTuples(res));
+ //ServerInstance->Log(DEBUG, "Created new PgSQL result; %d rows, %d columns, %s affected", rows, cols, PQcmdTuples(res));
}
~PgSQLresult()
}
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();
}
}
ModulePgSQL(InspIRCd* Me)
: Module::Module(Me), currid(0)
{
- log(DEBUG, "%s 'SQL' feature", ServerInstance->PublishFeature("SQL", 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("");
}
/* Conversion failed, assume it's a host */
SQLresolver* resolver;
- resolver = new SQLresolver(this, ServerInstance, host);
-
- ServerInstance->AddResolver(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. */
- log(DEBUG, "insp_aton failed returning -1, oh noes.");
+ ServerInstance->Log(DEBUG, "insp_aton failed returning -1, oh noes.");
}
}
}
SQLrequest* req = (SQLrequest*)request;
ConnMap::iterator iter;
- 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());
+ 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())
{
}
}
- log(DEBUG, "Got unsupported API version string: %s", request->GetId());
+ ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId());
return NULL;
}
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(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 = TIME;
+ idle = this->Instance->Time();
this->ClosePending = false;
- log(DEBUG,"No need to resolve %s", this->host);
+ Instance->Log(DEBUG,"No need to resolve %s", this->host);
if(!this->DoConnect())
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;
- if (!this->Instance->SE->AddFd(this->fd,false,X_ESTAB_MODULE))
+ if (!this->Instance->SE->AddFd(this))
{
- log(DEBUG, "A PQsocket cant be added to the socket engine!");
+ Instance->Log(DEBUG, "A PQsocket cant be added to the socket engine!");
Close();
return false;
}
- this->Instance->socket_ref[this->fd] = this;
/* Socket all hooked into the engine, now to tell PgSQL to start connecting */
void SQLConn::Close()
{
- log(DEBUG,"SQLConn::Close");
-
- if(this->fd > 01)
- Instance->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;
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?");
+ //ServerInstance->Log(DEBUG, "PGconnectPoll: wtf?");
return true;
}
}
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 = TIME;
+ 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();
- log(DEBUG, "ID is %lu", query.id);
+ 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();
{
/* ..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;
- log(DEBUG, "Got result, status code: %s; error message: %s", PQresStatus(PQresultStatus(result)), PQresultErrorMessage(result));
+ Instance->Log(DEBUG, "Got result, status code: %s; error message: %s", PQresStatus(PQresultStatus(result)), PQresultErrorMessage(result));
switch(PQresultStatus(result))
{
* 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);
}
}
else
{
- log(DEBUG, "Eh!? We just got a read event, and connection isn't busy..but no result :(");
+ Instance->Log(DEBUG, "Eh!? We just got a read event, and connection isn't busy..but no result :(");
}
return true;
* deserves to reconnect [/excuse]
* Returning true so the core doesn't try and close the connection.
*/
- log(DEBUG, "PQconsumeInput failed: %s", PQerrorMessage(sql));
+ Instance->Log(DEBUG, "PQconsumeInput failed: %s", PQerrorMessage(sql));
Reconnect();
return true;
}
switch(PQresetPoll(sql))
{
case PGRES_POLLING_WRITING:
- log(DEBUG, "PGresetPoll: PGRES_POLLING_WRITING");
+ //ServerInstance->Log(DEBUG, "PGresetPoll: PGRES_POLLING_WRITING");
WantWrite();
status = CWRITE;
return DoPoll();
case PGRES_POLLING_READING:
- log(DEBUG, "PGresetPoll: PGRES_POLLING_READING");
+ //ServerInstance->Log(DEBUG, "PGresetPoll: PGRES_POLLING_READING");
status = CREAD;
return true;
case PGRES_POLLING_FAILED:
- log(DEBUG, "PGresetPoll: PGRES_POLLING_FAILED: %s", PQerrorMessage(sql));
+ //ServerInstance->Log(DEBUG, "PGresetPoll: PGRES_POLLING_FAILED: %s", PQerrorMessage(sql));
return false;
case PGRES_POLLING_OK:
- log(DEBUG, "PGresetPoll: PGRES_POLLING_OK");
+ //ServerInstance->Log(DEBUG, "PGresetPoll: PGRES_POLLING_OK");
status = WWRITE;
return DoConnectedPoll();
default:
- log(DEBUG, "PGresetPoll: wtf?");
+ //ServerInstance->Log(DEBUG, "PGresetPoll: wtf?");
return true;
}
}
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()
{
- log(DEBUG, "Initiating reconnect");
+ Instance->Log(DEBUG, "Initiating reconnect");
if(PQresetStart(sql))
{
}
else
{
- log(DEBUG, "Failed to initiate reconnect...fun");
+ Instance->Log(DEBUG, "Failed to initiate reconnect...fun");
return false;
}
}
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;
}
#ifdef PGSQL_HAS_ESCAPECONN
len = PQescapeStringConn(sql, queryend, req.query.p.front().c_str(), req.query.p.front().length(), &error);
#else
- len = PQescapeStringConn(queryend, req.query.p.front().c_str(), req.query.p.front().length());
- error = 0;
+ len = PQescapeString (queryend, req.query.p.front().c_str(), req.query.p.front().length());
#endif
if(error)
{
- log(DEBUG, "Apparently PQescapeStringConn() failed somehow...don't know how or what to do...");
+ Instance->Log(DEBUG, "Apparently PQescapeStringConn() failed somehow...don't know how or what to do...");
}
- log(DEBUG, "Appended %d bytes of escaped string onto the query", len);
+ 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;
}
else
{
- log(DEBUG, "Found a substitution location but no parameter to substitute :|");
+ Instance->Log(DEBUG, "Found a substitution location but no parameter to substitute :|");
break;
}
}
/* Null-terminate the query */
*queryend = 0;
- log(DEBUG, "Attempting to dispatch query: %s", query);
+ Instance->Log(DEBUG, "Attempting to dispatch query: %s", query);
req.query.q = query;
if(PQsendQuery(sql, query))
{
- log(DEBUG, "Dispatched query successfully");
+ Instance->Log(DEBUG, "Dispatched query successfully");
qinprog = true;
- DELETE(query);
+ delete[] query;
return SQLerror();
}
else
{
- log(DEBUG, "Failed to dispatch query: %s", PQerrorMessage(sql));
- DELETE(query);
+ 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");
}
projects / user / henk / code / inspircd.git / blobdiff