-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2008-2009 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008-2009 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
#include <tds.h>
#include <tdsconvert.h>
class SQLConn;
class MsSQLResult;
-class ResultNotifier;
-class MsSQLListener;
class ModuleMsSQL;
typedef std::map<std::string, SQLConn*> ConnMap;
unsigned long count(const char * const str, char a)
{
unsigned long n = 0;
- for (const char *p = reinterpret_cast<const char *>(str); *p; ++p)
+ for (const char *p = str; *p; ++p)
{
if (*p == '?')
++n;
return n;
}
-ResultNotifier* notifier = NULL;
-MsSQLListener* listener = NULL;
-int QueueFD = -1;
-
ConnMap connections;
-Mutex* QueueMutex;
Mutex* ResultsMutex;
Mutex* LoggingMutex;
-class QueryThread : public Thread
+class QueryThread : public SocketThread
{
private:
- ModuleMsSQL* Parent;
- InspIRCd* ServerInstance;
+ ModuleMsSQL* const Parent;
public:
- QueryThread(InspIRCd* si, ModuleMsSQL* mod)
- : Thread(), Parent(mod), ServerInstance(si)
- {
- }
+ QueryThread(ModuleMsSQL* mod) : Parent(mod) { }
~QueryThread() { }
virtual void Run();
+ virtual void OnNotify();
};
-class ResultNotifier : public BufferedSocket
-{
- ModuleMsSQL* mod;
-
- public:
- ResultNotifier(ModuleMsSQL* m, InspIRCd* SI, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m)
- {
- }
-
- virtual bool OnDataReady()
- {
- char data = 0;
- if (ServerInstance->SE->Recv(this, &data, 1, 0) > 0)
- {
- Dispatch();
- return true;
- }
- return false;
- }
-
- void Dispatch();
-};
-
-class MsSQLListener : public ListenSocketBase
-{
- ModuleMsSQL* Parent;
- irc::sockets::insp_sockaddr sock_us;
- socklen_t uslen;
- FileReader* index;
-
- public:
- MsSQLListener(ModuleMsSQL* 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)
- {
- new ResultNotifier(this->Parent, this->ServerInstance, nfd, (char *)ipconnectedto.c_str()); // XXX unsafe casts suck
- }
-
- /* 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
- }
-};
-
-
class MsSQLResult : public SQLresult
{
private:
{
delete fl;
}
-
-
};
class SQLConn : public classbase
{
private:
ResultQueue results;
- InspIRCd* ServerInstance;
Module* mod;
SQLhost host;
TDSLOGIN* login;
public:
QueryQueue queue;
- SQLConn(InspIRCd* SI, Module* m, const SQLhost& hi)
- : ServerInstance(SI), mod(m), host(hi), login(NULL), sock(NULL), context(NULL)
+ SQLConn(Module* m, const SQLhost& hi)
+ : mod(m), host(hi), login(NULL), sock(NULL), context(NULL)
{
if (OpenDB())
{
CloseDB();
}
- SQLerror Query(SQLrequest &req)
+ SQLerror Query(SQLrequest* req)
{
if (!sock)
return SQLerror(SQL_BAD_CONN, "Socket was NULL, check if SQL server is running.");
/* The length of the longest parameter */
maxparamlen = 0;
- for(ParamL::iterator i = req.query.p.begin(); i != req.query.p.end(); i++)
+ for(ParamL::iterator i = req->query.p.begin(); i != req->query.p.end(); i++)
{
if (i->size() > maxparamlen)
maxparamlen = i->size();
}
/* How many params are there in the query? */
- paramcount = count(req.query.q.c_str(), '?');
+ 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);
+ ParamL paramscopy(req->query.p);
/* To avoid a lot of allocations, allocate enough memory for the biggest the escaped query could possibly be.
* sizeofquery + (maxtotalparamlength*2) + 1
* The +1 is for null-terminating the string
*/
- query = new char[req.query.q.length() + (maxparamlen*paramcount*2) + 1];
+ query = new char[req->query.q.length() + (maxparamlen*paramcount*2) + 1];
queryend = query;
- for(unsigned long i = 0; i < req.query.q.length(); i++)
+ for(unsigned long i = 0; i < req->query.q.length(); i++)
{
- if(req.query.q[i] == '?')
+ if(req->query.q[i] == '?')
{
/* We found a place to substitute..what fun.
* use mssql calls to escape and write the
/* 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'))
+ 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';
+ paramnum = paramnum * 10 + req->query.q[i] - '0';
}
if (paramnum > paramscopy.size() - 1)
}
delete[] escaped;
}
- else if (req.query.p.size())
+ else if (req->query.p.size())
{
/* Custom escaping for this one. converting ' to '' should make SQL Server happy. Ugly but fast :]
*/
- char* escaped = new char[(req.query.p.front().length() * 2) + 1];
+ char* escaped = new char[(req->query.p.front().length() * 2) + 1];
char* escend = escaped;
- for (std::string::iterator p = req.query.p.front().begin(); p < req.query.p.front().end(); p++)
+ for (std::string::iterator p = req->query.p.front().begin(); p < req->query.p.front().end(); p++)
{
if (*p == '\'')
{
queryend++;
}
delete[] escaped;
- req.query.p.pop_front();
+ req->query.p.pop_front();
}
else
break;
}
else
{
- *queryend = req.query.q[i];
+ *queryend = req->query.q[i];
queryend++;
}
}
*queryend = 0;
- req.query.q = query;
+ req->query.q = query;
- MsSQLResult* res = new MsSQLResult((Module*)mod, req.GetSource(), req.id);
+ MsSQLResult* res = new MsSQLResult((Module*)mod, req->source, req->id);
res->dbid = host.id;
- res->query = req.query.q;
+ res->query = req->query.q;
- char* msquery = strdup(req.query.q.data());
+ char* msquery = strdup(req->query.q.data());
LoggingMutex->Lock();
ServerInstance->Logs->Log("m_mssql",DEBUG,"doing Query: %s",msquery);
LoggingMutex->Unlock();
if (tds_submit_query(sock, msquery) != TDS_SUCCEED)
{
- std::string error("failed to execute: "+std::string(req.query.q.data()));
+ std::string error("failed to execute: "+std::string(req->query.q.data()));
delete[] query;
delete res;
free(msquery);
ResultsMutex->Lock();
results.push_back(res);
ResultsMutex->Unlock();
- SendNotify();
return SQLerror();
}
{
SQLConn* sc = (SQLConn*)pContext->parent;
LoggingMutex->Lock();
- sc->ServerInstance->Logs->Log("m_mssql", DEBUG, "Message for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
+ ServerInstance->Logs->Log("m_mssql", DEBUG, "Message for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
LoggingMutex->Unlock();
return 0;
}
{
SQLConn* sc = (SQLConn*)pContext->parent;
LoggingMutex->Lock();
- sc->ServerInstance->Logs->Log("m_mssql", DEFAULT, "Error for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
+ ServerInstance->Logs->Log("m_mssql", DEFAULT, "Error for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
LoggingMutex->Unlock();
return 0;
}
{
MsSQLResult* res = results[0];
ResultsMutex->Lock();
- if (res->GetDest())
+ if (res->dest)
{
res->Send();
}
}
}
- void SendNotify()
- {
- if (QueueFD < 0)
- {
- if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1)
- {
- /* crap, we're out of sockets... */
- return;
- }
-
- irc::sockets::insp_sockaddr addr;
-
-#ifdef IPV6
- irc::sockets::insp_aton("::1", &addr.sin6_addr);
- addr.sin6_family = AF_FAMILY;
- addr.sin6_port = htons(listener->GetPort());
-#else
- 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(listener->GetPort());
-#endif
-
- if (connect(QueueFD, (sockaddr*)&addr,sizeof(addr)) == -1)
- {
- /* wtf, we cant connect to it, but we just created it! */
- return;
- }
- }
- char id = 0;
- send(QueueFD, &id, 1, 0);
- }
-
void DoLeadingQuery()
{
- SQLrequest& req = queue.front();
- req.error = Query(req);
+ SQLrequest* req = queue.front();
+ req->error = Query(req);
}
};
private:
unsigned long currid;
QueryThread* queryDispatcher;
+ ServiceProvider sqlserv;
public:
- ModuleMsSQL(InspIRCd* Me)
- : Module(Me), currid(0)
+ ModuleMsSQL()
+ : currid(0), sqlserv(this, "SQL/mssql", SERVICE_DATA)
{
- LoggingMutex = ServerInstance->Mutexes->CreateMutex();
- ResultsMutex = ServerInstance->Mutexes->CreateMutex();
- QueueMutex = ServerInstance->Mutexes->CreateMutex();
-
- ServerInstance->Modules->UseInterface("SQLutils");
-
- if (!ServerInstance->Modules->PublishFeature("SQL", this))
- {
- throw ModuleException("m_mssql: Unable to publish feature 'SQL'");
- }
-
- /* Create a socket on a random port. Let the tcp stack allocate us an available port */
-#ifdef IPV6
- listener = new MsSQLListener(this, ServerInstance, 0, "::1");
-#else
- listener = new MsSQLListener(this, ServerInstance, 0, "127.0.0.1");
-#endif
-
- if (listener->GetFd() == -1)
- {
- ServerInstance->Modules->DoneWithInterface("SQLutils");
- throw ModuleException("m_mssql: unable to create ITC pipe");
- }
- else
- {
- LoggingMutex->Lock();
- ServerInstance->Logs->Log("m_mssql", DEBUG, "MsSQL: Interthread comms port is %d", listener->GetPort());
- LoggingMutex->Unlock();
- }
+ LoggingMutex = new Mutex();
+ ResultsMutex = new Mutex();
+ queryDispatcher = new QueryThread(this);
+ }
+ void init()
+ {
ReadConf();
- queryDispatcher = new QueryThread(ServerInstance, this);
- ServerInstance->Threads->Create(queryDispatcher);
+ ServerInstance->Threads->Start(queryDispatcher);
- ServerInstance->Modules->PublishInterface("SQL", this);
- Implementation eventlist[] = { I_OnRequest, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, this, 2);
+ Implementation eventlist[] = { I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, 1);
+ ServerInstance->Modules->AddService(sqlserv);
}
virtual ~ModuleMsSQL()
{
+ queryDispatcher->join();
delete queryDispatcher;
ClearQueue();
ClearAllConnections();
- ServerInstance->SE->DelFd(listener);
- ServerInstance->BufferedSocketCull();
-
- if (QueueFD >= 0)
- {
- shutdown(QueueFD, 2);
- close(QueueFD);
- }
-
- if (notifier)
- {
- ServerInstance->SE->DelFd(notifier);
- notifier->Close();
- ServerInstance->BufferedSocketCull();
- }
-
- ServerInstance->Modules->UnpublishInterface("SQL", this);
- ServerInstance->Modules->UnpublishFeature("SQL");
- ServerInstance->Modules->DoneWithInterface("SQLutils");
-
delete LoggingMutex;
delete ResultsMutex;
- delete QueueMutex;
}
-
void SendQueue()
{
for (ConnMap::iterator iter = connections.begin(); iter != connections.end(); iter++)
bool HostInConf(const SQLhost &h)
{
- ConfigReader conf(ServerInstance);
- for(int i = 0; i < conf.Enumerate("database"); i++)
+ ConfigTagList tags = ServerInstance->Config->ConfTags("database");
+ for (ConfigIter i = tags.first; i != tags.second; ++i)
{
+ ConfigTag* tag = i->second;
SQLhost host;
- host.id = conf.ReadValue("database", "id", i);
- host.host = conf.ReadValue("database", "hostname", i);
- host.port = conf.ReadInteger("database", "port", "1433", i, true);
- host.name = conf.ReadValue("database", "name", i);
- host.user = conf.ReadValue("database", "username", i);
- host.pass = conf.ReadValue("database", "password", i);
+ host.id = tag->getString("id");
+ host.host = tag->getString("hostname");
+ host.port = tag->getInt("port", 1433);
+ host.name = tag->getString("name");
+ host.user = tag->getString("username");
+ host.pass = tag->getString("password");
if (h == host)
return true;
}
{
ClearOldConnections();
- ConfigReader conf(ServerInstance);
- for(int i = 0; i < conf.Enumerate("database"); i++)
+ ConfigTagList tags = ServerInstance->Config->ConfTags("database");
+ for (ConfigIter i = tags.first; i != tags.second; ++i)
{
+ ConfigTag* tag = i->second;
SQLhost host;
- host.id = conf.ReadValue("database", "id", i);
- host.host = conf.ReadValue("database", "hostname", i);
- host.port = conf.ReadInteger("database", "port", "1433", i, true);
- host.name = conf.ReadValue("database", "name", i);
- host.user = conf.ReadValue("database", "username", i);
- host.pass = conf.ReadValue("database", "password", i);
+ host.id = tag->getString("id");
+ host.host = tag->getString("hostname");
+ host.port = tag->getInt("port", 1433);
+ host.name = tag->getString("name");
+ host.user = tag->getString("username");
+ host.pass = tag->getString("password");
if (HasHost(host))
continue;
SQLConn* newconn;
- newconn = new SQLConn(ServerInstance, this, hi);
+ newconn = new SQLConn(this, hi);
connections.insert(std::make_pair(hi.id, newconn));
}
void ClearAllConnections()
{
- ConnMap::iterator i;
- while ((i = connections.begin()) != connections.end())
- {
- connections.erase(i);
+ for(ConnMap::iterator i = connections.begin(); i != connections.end(); ++i)
delete i->second;
- }
+ connections.clear();
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
- QueueMutex->Lock();
+ queryDispatcher->LockQueue();
ReadConf();
- QueueMutex->Unlock();
+ queryDispatcher->UnlockQueueWakeup();
}
- virtual const char* OnRequest(Request* request)
+ void OnRequest(Request& request)
{
- if(strcmp(SQLREQID, request->GetId()) == 0)
+ if(strcmp(SQLREQID, request.id) == 0)
{
- SQLrequest* req = (SQLrequest*)request;
+ SQLrequest* req = (SQLrequest*)&request;
- QueueMutex->Lock();
+ queryDispatcher->LockQueue();
ConnMap::iterator iter;
- const char* returnval = NULL;
-
if((iter = connections.find(req->dbid)) != connections.end())
{
req->id = NewID();
- iter->second->queue.push(*req);
- returnval= SQLSUCCESS;
+ iter->second->queue.push(new SQLrequest(*req));
}
else
{
req->error.Id(SQL_BAD_DBID);
}
-
- QueueMutex->Unlock();
-
- return returnval;
+ queryDispatcher->UnlockQueueWakeup();
}
- return NULL;
}
unsigned long NewID()
virtual Version GetVersion()
{
- return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+ return Version("MsSQL provider", VF_VENDOR);
}
};
-void ResultNotifier::Dispatch()
+void QueryThread::OnNotify()
{
- mod->SendQueue();
+ Parent->SendQueue();
}
void QueryThread::Run()
{
+ this->LockQueue();
while (this->GetExitFlag() == false)
{
SQLConn* conn = NULL;
- QueueMutex->Lock();
for (ConnMap::iterator i = connections.begin(); i != connections.end(); i++)
{
if (i->second->queue.totalsize())
break;
}
}
- QueueMutex->Unlock();
if (conn)
{
+ this->UnlockQueue();
conn->DoLeadingQuery();
- QueueMutex->Lock();
+ this->NotifyParent();
+ this->LockQueue();
conn->queue.pop();
- QueueMutex->Unlock();
}
- usleep(1000);
+ else
+ {
+ this->WaitForQueue();
+ }
}
+ this->UnlockQueue();
}
MODULE_INIT(ModuleMsSQL)
projects / user / henk / code / inspircd.git / blobdiff