* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
#include "inspircd.h"
#include <mysql.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "m_sqlv2.h"
#ifdef WINDOWS
class SQLConnection;
-class Notifier;
+class MySQLListener;
typedef std::map<std::string, SQLConnection*> ConnMap;
-static Notifier* MessagePipe = NULL;
+static MySQLListener *MessagePipe = NULL;
int QueueFD = -1;
class DispatcherThread;
+unsigned long count(const char * const str, char a)
+{
+ unsigned long n = 0;
+ for (const char *p = reinterpret_cast<const char *>(str); *p; ++p)
+ {
+ if (*p == '?')
+ ++n;
+ }
+ return n;
+}
+
+
/** MySQL module
* */
class ModuleSQL : public Module
Mutex* QueueMutex;
Mutex* ResultsMutex;
Mutex* LoggingMutex;
+ Mutex* ConnMutex;
ModuleSQL(InspIRCd* Me);
~ModuleSQL();
rows++;
}
mysql_free_result(res);
+ res = NULL;
}
}
class SQLConnection : public classbase
{
protected:
-
- MYSQL connection;
+ MYSQL *connection;
MYSQL_RES *res;
- MYSQL_ROW row;
+ MYSQL_ROW *row;
SQLhost host;
std::map<std::string,std::string> thisrow;
bool Enabled;
ResultQueue rq;
// This constructor creates an SQLConnection object with the given credentials, but does not connect yet.
- SQLConnection(const SQLhost &hi, ModuleSQL* Creator) : host(hi), Enabled(false), Parent(Creator)
+ SQLConnection(const SQLhost &hi, ModuleSQL* Creator) : connection(NULL), host(hi), Enabled(false), Parent(Creator)
{
}
bool Connect()
{
unsigned int timeout = 1;
- mysql_init(&connection);
- mysql_options(&connection,MYSQL_OPT_CONNECT_TIMEOUT,(char*)&timeout);
- return mysql_real_connect(&connection, host.host.c_str(), host.user.c_str(), host.pass.c_str(), host.name.c_str(), host.port, NULL, 0);
+ connection = mysql_init(connection);
+ mysql_options(connection,MYSQL_OPT_CONNECT_TIMEOUT,(char*)&timeout);
+ return mysql_real_connect(connection, host.host.c_str(), host.user.c_str(), host.pass.c_str(), host.name.c_str(), host.port, NULL, 0);
}
void DoLeadingQuery()
char* queryend;
/* Total length of the unescaped parameters */
- unsigned long paramlen;
+ unsigned long maxparamlen, paramcount;
- /* Total length of query, used for binary-safety in mysql_real_query */
- unsigned long querylength = 0;
-
- paramlen = 0;
+ /* The length of the longest parameter */
+ maxparamlen = 0;
for(ParamL::iterator i = req.query.p.begin(); i != req.query.p.end(); i++)
{
- paramlen += i->size();
+ if (i->size() > maxparamlen)
+ maxparamlen = i->size();
}
+ /* How many params are there in the query? */
+ paramcount = count(req.query.q.c_str(), '?');
+
+ /* This stores copy of params to be inserted with using numbered params 1;3B*/
+ ParamL paramscopy(req.query.p);
+
/* To avoid a lot of allocations, allocate enough memory for the biggest the escaped query could possibly be.
- * sizeofquery + (totalparamlength*2) + 1
+ * sizeofquery + (maxtotalparamlength*2) + 1
*
* The +1 is for null-terminating the string for mysql_real_escape_string
*/
- query = new char[req.query.q.length() + (paramlen*2) + 1];
+ query = new char[req.query.q.length() + (maxparamlen*paramcount*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
* then we "just" need to make sure queryend is
* pointing at the right place.
*/
- if(req.query.p.size())
+
+ /* Is it numbered parameter?
+ */
+
+ bool numbered;
+ numbered = false;
+
+ /* Numbered parameter number :|
+ */
+ unsigned int paramnum;
+ paramnum = 0;
+
+ /* Let's check if it's a numbered param. And also calculate it's number.
+ */
+
+ 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';
+ }
+
+ if (paramnum > paramscopy.size() - 1)
+ {
+ /* index is out of range!
+ */
+ numbered = false;
+ }
+
+ if (numbered)
+ {
+ unsigned long len = mysql_real_escape_string(connection, queryend, paramscopy[paramnum].c_str(), paramscopy[paramnum].length());
+
+ queryend += len;
+ }
+ else if (req.query.p.size())
{
- unsigned long len = mysql_real_escape_string(&connection, queryend, req.query.p.front().c_str(), req.query.p.front().length());
+ unsigned long len = mysql_real_escape_string(connection, queryend, req.query.p.front().c_str(), req.query.p.front().length());
queryend += len;
req.query.p.pop_front();
*queryend = req.query.q[i];
queryend++;
}
- querylength++;
}
*queryend = 0;
- Parent->QueueMutex->Enable(true);
+ Parent->QueueMutex->Lock();
req.query.q = query;
- Parent->QueueMutex->Enable(false);
+ Parent->QueueMutex->Unlock();
- if (!mysql_real_query(&connection, req.query.q.data(), req.query.q.length()))
+ if (!mysql_real_query(connection, req.query.q.data(), req.query.q.length()))
{
/* Successfull query */
- res = mysql_use_result(&connection);
- unsigned long rows = mysql_affected_rows(&connection);
+ res = mysql_use_result(connection);
+ unsigned long rows = mysql_affected_rows(connection);
MySQLresult* r = new MySQLresult(Parent, req.GetSource(), res, rows, req.id);
r->dbid = this->GetID();
r->query = req.query.q;
/* Put this new result onto the results queue.
* XXX: Remember to mutex the queue!
*/
- Parent->ResultsMutex->Enable(true);
+ Parent->ResultsMutex->Lock();
rq.push_back(r);
- Parent->ResultsMutex->Enable(false);
+ Parent->ResultsMutex->Unlock();
}
else
{
/* XXX: See /usr/include/mysql/mysqld_error.h for a list of
* possible error numbers and error messages */
- SQLerror e(QREPLY_FAIL, ConvToStr(mysql_errno(&connection)) + std::string(": ") + mysql_error(&connection));
+ SQLerror e(SQL_QREPLY_FAIL, ConvToStr(mysql_errno(connection)) + std::string(": ") + mysql_error(connection));
MySQLresult* r = new MySQLresult(Parent, req.GetSource(), e, req.id);
r->dbid = this->GetID();
r->query = req.query.q;
- Parent->ResultsMutex->Enable(true);
+ Parent->ResultsMutex->Lock();
rq.push_back(r);
- Parent->ResultsMutex->Enable(false);
+ Parent->ResultsMutex->Unlock();
}
/* Now signal the main thread that we've got a result to process.
bool ConnectionLost()
{
- if (&connection) {
- return (mysql_ping(&connection) != 0);
+ if (&connection)
+ {
+ return (mysql_ping(connection) != 0);
}
else return false;
}
bool CheckConnection()
{
- if (ConnectionLost()) {
+ if (ConnectionLost())
+ {
return Connect();
}
else return true;
std::string GetError()
{
- return mysql_error(&connection);
+ return mysql_error(connection);
}
const std::string& GetID()
void Close()
{
- mysql_close(&connection);
+ mysql_close(connection);
}
const SQLhost& GetConfHost()
if (!i->second->Connect())
{
/* XXX: MUTEX */
- Parent->LoggingMutex->Enable(true);
+ Parent->LoggingMutex->Lock();
ServerInstance->Logs->Log("m_mysql",DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError());
i->second->SetEnable(false);
- Parent->LoggingMutex->Enable(false);
+ Parent->LoggingMutex->Unlock();
}
}
}
void LoadDatabases(ConfigReader* conf, InspIRCd* ServerInstance, ModuleSQL* Parent)
{
+ Parent->ConnMutex->Lock();
ClearOldConnections(conf);
for (int j =0; j < conf->Enumerate("database"); j++)
{
}
}
ConnectDatabases(ServerInstance, Parent);
+ Parent->ConnMutex->Unlock();
}
char FindCharId(const std::string &id)
*/
class Notifier : public BufferedSocket
{
- insp_sockaddr sock_us;
- socklen_t uslen;
ModuleSQL* Parent;
public:
-
- /* Create a socket on a random port. Let the tcp stack allocate us an available port */
-#ifdef IPV6
- Notifier(InspIRCd* SI, ModuleSQL* Creator) : BufferedSocket(SI, "::1", 0, true, 3000), Parent(Creator)
-#else
- Notifier(InspIRCd* SI, ModuleSQL* Creator) : BufferedSocket(SI, "127.0.0.1", 0, true, 3000), Parent(Creator)
-#endif
- {
- uslen = sizeof(sock_us);
- if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
- {
- throw ModuleException("Could not create random listening port on localhost");
- }
- }
-
- Notifier(InspIRCd* SI, int newfd, char* ip) : BufferedSocket(SI, newfd, ip)
- {
- }
-
- /* Using getsockname and ntohs, we can determine which port number we were allocated */
- int GetPort()
- {
-#ifdef IPV6
- return ntohs(sock_us.sin6_port);
-#else
- return ntohs(sock_us.sin_port);
-#endif
- }
-
- virtual int OnIncomingConnection(int newsock, char* ip)
- {
- Notifier* n = new Notifier(this->Instance, newsock, ip);
- n = n; /* Stop bitching at me, GCC */
- return true;
- }
+ Notifier(ModuleSQL* P, InspIRCd* SI, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), Parent(P) { }
virtual bool OnDataReady()
{
* The function GetCharId translates a single character
* back into an iterator.
*/
- if (Instance->SE->Recv(this, &data, 1, 0) > 0)
+
+ if (ServerInstance->SE->Recv(this, &data, 1, 0) > 0)
{
+ Parent->ConnMutex->Lock();
ConnMap::iterator iter = GetCharId(data);
+ Parent->ConnMutex->Unlock();
if (iter != Connections.end())
{
- /* Lock the mutex, send back the data */
- Parent->ResultsMutex->Enable(true);
+ Parent->ResultsMutex->Lock();
ResultQueue::iterator n = iter->second->rq.begin();
+ Parent->ResultsMutex->Unlock();
+
(*n)->Send();
delete (*n);
+
+ Parent->ResultsMutex->Lock();
iter->second->rq.pop_front();
- Parent->ResultsMutex->Enable(false);
+ Parent->ResultsMutex->Unlock();
+
return true;
}
/* No error, but unknown id */
}
};
+/** Spawn sockets from a listener
+ */
+class MySQLListener : public ListenSocketBase
+{
+ ModuleSQL* Parent;
+ irc::sockets::insp_sockaddr sock_us;
+ socklen_t uslen;
+ FileReader* index;
+
+ public:
+ MySQLListener(ModuleSQL* P, InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr), Parent(P)
+ {
+ uslen = sizeof(sock_us);
+ if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
+ {
+ throw ModuleException("Could not getsockname() to find out port number for ITC port");
+ }
+ }
+
+ virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
+ {
+ // XXX unsafe casts suck
+ new Notifier(this->Parent, this->ServerInstance, nfd, (char *)ipconnectedto.c_str());
+ }
-ModuleSQL::ModuleSQL(InspIRCd* Me) : Module::Module(Me), rehashing(false)
+ /* Using getsockname and ntohs, we can determine which port number we were allocated */
+ int GetPort()
+ {
+#ifdef IPV6
+ return ntohs(sock_us.sin6_port);
+#else
+ return ntohs(sock_us.sin_port);
+#endif
+ }
+};
+
+ModuleSQL::ModuleSQL(InspIRCd* Me) : Module(Me), rehashing(false)
{
ServerInstance->Modules->UseInterface("SQLutils");
PublicServerInstance = ServerInstance;
currid = 0;
- MessagePipe = new Notifier(ServerInstance, this);
+ /* Create a socket on a random port. Let the tcp stack allocate us an available port */
+#ifdef IPV6
+ MessagePipe = new MySQLListener(this, ServerInstance, 0, "::1");
+#else
+ MessagePipe = new MySQLListener(this, ServerInstance, 0, "127.0.0.1");
+#endif
+
+ LoggingMutex = ServerInstance->Mutexes->CreateMutex();
+ ConnMutex = ServerInstance->Mutexes->CreateMutex();
+
+ if (MessagePipe->GetFd() == -1)
+ {
+ delete ConnMutex;
+ ServerInstance->Modules->DoneWithInterface("SQLutils");
+ throw ModuleException("m_mysql: unable to create ITC pipe");
+ }
+ else
+ {
+ LoggingMutex->Lock();
+ ServerInstance->Logs->Log("m_mysql", DEBUG, "MySQL: Interthread comms port is %d", MessagePipe->GetPort());
+ LoggingMutex->Unlock();
+ }
Dispatcher = new DispatcherThread(ServerInstance, this);
ServerInstance->Threads->Create(Dispatcher);
- LoggingMutex = ServerInstance->Mutexes->CreateMutex();
ResultsMutex = ServerInstance->Mutexes->CreateMutex();
QueueMutex = ServerInstance->Mutexes->CreateMutex();
/* Tell worker thread to exit NOW,
* Automatically joins */
delete Dispatcher;
+ delete LoggingMutex;
+ delete ResultsMutex;
+ delete QueueMutex;
+ delete ConnMutex;
+ ServerInstance->Modules->DoneWithInterface("SQLutils");
throw ModuleException("m_mysql: Unable to publish feature 'SQL'");
}
delete LoggingMutex;
delete ResultsMutex;
delete QueueMutex;
+ delete ConnMutex;
}
unsigned long ModuleSQL::NewID()
SQLrequest* req = (SQLrequest*)request;
/* XXX: Lock */
- QueueMutex->Enable(true);
+ QueueMutex->Lock();
ConnMap::iterator iter;
const char* returnval = NULL;
+ ConnMutex->Lock();
if((iter = Connections.find(req->dbid)) != Connections.end())
{
req->id = NewID();
}
else
{
- req->error.Id(BAD_DBID);
+ req->error.Id(SQL_BAD_DBID);
}
- QueueMutex->Enable(false);
- /* XXX: Unlock */
+ ConnMutex->Unlock();
+ QueueMutex->Unlock();
return returnval;
}
return;
}
- insp_sockaddr addr;
+ irc::sockets::insp_sockaddr addr;
#ifdef IPV6
- insp_aton("::1", &addr.sin6_addr);
+ irc::sockets::insp_aton("::1", &addr.sin6_addr);
addr.sin6_family = AF_FAMILY;
addr.sin6_port = htons(MessagePipe->GetPort());
#else
- insp_inaddr ia;
- insp_aton("127.0.0.1", &ia);
+ irc::sockets::insp_inaddr ia;
+ irc::sockets::insp_aton("127.0.0.1", &ia);
addr.sin_family = AF_FAMILY;
addr.sin_addr = ia;
addr.sin_port = htons(MessagePipe->GetPort());
if (Parent->rehashing)
{
/* XXX: Lock */
- Parent->QueueMutex->Enable(true);
+ Parent->QueueMutex->Lock();
Parent->rehashing = false;
LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent);
- Parent->QueueMutex->Enable(false);
+ Parent->QueueMutex->Unlock();
/* XXX: Unlock */
}
SQLConnection* conn = NULL;
/* XXX: Lock here for safety */
- Parent->QueueMutex->Enable(true);
+ Parent->QueueMutex->Lock();
+ Parent->ConnMutex->Lock();
for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
{
if (i->second->queue.totalsize())
break;
}
}
- Parent->QueueMutex->Enable(false);
+ Parent->ConnMutex->Unlock();
+ Parent->QueueMutex->Unlock();
/* XXX: Unlock */
/* Theres an item! */
conn->DoLeadingQuery();
/* XXX: Lock */
- Parent->QueueMutex->Enable(true);
+ Parent->QueueMutex->Lock();
conn->queue.pop();
- Parent->QueueMutex->Enable(false);
+ Parent->QueueMutex->Unlock();
/* XXX: Unlock */
}
}
}
-MODULE_INIT(ModuleSQL)
+MODULE_INIT(ModuleSQL)
projects / user / henk / code / inspircd.git / blobdiff