* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
class SQLConn;
class MsSQLResult;
-class ResultNotifier;
-class MsSQLListener;
class ModuleMsSQL;
typedef std::map<std::string, SQLConn*> ConnMap;
typedef std::deque<MsSQLResult*> ResultQueue;
-ResultNotifier* notifier = NULL;
-MsSQLListener* listener = NULL;
-int QueueFD = -1;
+unsigned long count(const char * const str, char a)
+{
+ unsigned long n = 0;
+ for (const char *p = str; *p; ++p)
+ {
+ if (*p == '?')
+ ++n;
+ }
+ return n;
+}
ConnMap connections;
-Mutex* QueueMutex;
Mutex* ResultsMutex;
Mutex* LoggingMutex;
-class QueryThread : public Thread
+class QueryThread : public SocketThread
{
private:
ModuleMsSQL* Parent;
- InspIRCd* ServerInstance;
public:
- QueryThread(InspIRCd* si, ModuleMsSQL* mod)
- : Thread(), Parent(mod), ServerInstance(si)
- {
+ QueryThread(ModuleMsSQL* mod)
+ : SocketThread(si), 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())
{
char* queryend;
/* Total length of the unescaped parameters */
- unsigned long paramlen;
+ unsigned long maxparamlen, paramcount;
- /* Total length of query, used for binary-safety */
- unsigned long querylength = 0;
+ /* The length of the longest parameter */
+ maxparamlen = 0;
- paramlen = 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
*/
- query = new char[req.query.q.length() + (paramlen*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++)
{
if(req.query.q[i] == '?')
{
- if(req.query.p.size())
+ /* We found a place to substitute..what fun.
+ * use mssql 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.
+ */
+
+ /* 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)
+ {
+ /* Custom escaping for this one. converting ' to '' should make SQL Server happy. Ugly but fast :]
+ */
+ char* escaped = new char[(paramscopy[paramnum].length() * 2) + 1];
+ char* escend = escaped;
+ for (std::string::iterator p = paramscopy[paramnum].begin(); p < paramscopy[paramnum].end(); p++)
+ {
+ if (*p == '\'')
+ {
+ *escend = *p;
+ escend++;
+ *escend = *p;
+ }
+ *escend = *p;
+ escend++;
+ }
+ *escend = 0;
+
+ for (char* n = escaped; *n; n++)
+ {
+ *queryend = *n;
+ queryend++;
+ }
+ delete[] escaped;
+ }
+ else if (req.query.p.size())
{
/* Custom escaping for this one. converting ' to '' should make SQL Server happy. Ugly but fast :]
*/
*queryend = req.query.q[i];
queryend++;
}
- querylength++;
}
*queryend = 0;
req.query.q = query;
ResultsMutex->Lock();
results.push_back(res);
ResultsMutex->Unlock();
- SendNotify();
return SQLerror();
}
}
}
- 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();
QueryThread* queryDispatcher;
public:
- ModuleMsSQL(InspIRCd* Me)
- : Module(Me), currid(0)
+ ModuleMsSQL()
+ : currid(0)
{
- LoggingMutex = ServerInstance->Mutexes->CreateMutex();
- ResultsMutex = ServerInstance->Mutexes->CreateMutex();
- QueueMutex = ServerInstance->Mutexes->CreateMutex();
+ LoggingMutex = new Mutex();
+ ResultsMutex = new Mutex();
ServerInstance->Modules->UseInterface("SQLutils");
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();
- }
-
ReadConf();
- queryDispatcher = new QueryThread(ServerInstance, this);
- ServerInstance->Threads->Create(queryDispatcher);
+ queryDispatcher = new QueryThread(this);
+ ServerInstance->Threads->Start(queryDispatcher);
ServerInstance->Modules->PublishInterface("SQL", this);
Implementation eventlist[] = { I_OnRequest, I_OnRehash };
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);
+ ConfigReader conf;
for(int i = 0; i < conf.Enumerate("database"); i++)
{
SQLhost host;
{
ClearOldConnections();
- ConfigReader conf(ServerInstance);
+ ConfigReader conf;
for(int i = 0; i < conf.Enumerate("database"); i++)
{
SQLhost host;
SQLConn* newconn;
- newconn = new SQLConn(ServerInstance, this, hi);
+ newconn = new SQLConn(this, hi);
connections.insert(std::make_pair(hi.id, newconn));
}
}
}
- 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)
{
SQLrequest* req = (SQLrequest*)request;
- QueueMutex->Lock();
+ queryDispatcher->LockQueue();
ConnMap::iterator iter;
req->error.Id(SQL_BAD_DBID);
}
- QueueMutex->Unlock();
+ queryDispatcher->UnlockQueueWakeup();
return returnval;
}
virtual Version GetVersion()
{
- return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+ return Version("MsSQL provider", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
}
};
-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