-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/* +------------------------------------+
+ * | 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.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
#include "m_sqlv2.h"
/* $ModDesc: MsSQL provider */
+/* $CompileFlags: exec("grep VERSION_NO /usr/include/tdsver.h 2>/dev/null | perl -e 'print "-D_TDSVER=".((<> =~ /freetds v(\d+\.\d+)/i) ? $1*100 : 0);'") */
/* $LinkerFlags: -ltds */
/* $ModDep: m_sqlv2.h */
class SQLConn;
class MsSQLResult;
-class ResultNotifier;
+class ModuleMsSQL;
typedef std::map<std::string, SQLConn*> ConnMap;
-typedef std::deque<classbase*> paramlist;
typedef std::deque<MsSQLResult*> ResultQueue;
-ResultNotifier* resultnotify = NULL;
-ResultNotifier* resultdispatch = NULL;
-int QueueFD = -1;
-
-class ResultNotifier : public BufferedSocket
+unsigned long count(const char * const str, char a)
{
- Module* mod;
- insp_sockaddr sock_us;
- socklen_t uslen;
-
- public:
- /* Create a socket on a random port. Let the tcp stack allocate us an available port */
-#ifdef IPV6
- ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "::1", 0, true, 3000), mod(m)
-#else
- ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "127.0.0.1", 0, true, 3000), mod(m)
-#endif
- {
- uslen = sizeof(sock_us);
- if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
- {
- throw ModuleException("Could not create random listening port on localhost");
- }
- }
-
- ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m)
- {
- }
-
- /* 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)
+ unsigned long n = 0;
+ for (const char *p = str; *p; ++p)
{
- resultdispatch = new ResultNotifier(Instance, mod, newsock, ip);
- return true;
+ if (*p == '?')
+ ++n;
}
+ return n;
+}
- virtual bool OnDataReady()
- {
- char data = 0;
- if (Instance->SE->Recv(this, &data, 1, 0) > 0)
- {
- Dispatch();
- return true;
- }
- return false;
- }
+ConnMap connections;
+Mutex* ResultsMutex;
+Mutex* LoggingMutex;
- void Dispatch();
+class QueryThread : public SocketThread
+{
+ private:
+ ModuleMsSQL* Parent;
+ public:
+ QueryThread(ModuleMsSQL* mod)
+ : SocketThread(si), Parent(mod), {
+ }
+ ~QueryThread() { }
+ virtual void Run();
+ virtual void OnNotify();
};
-
class MsSQLResult : public SQLresult
{
private:
{
delete fl;
}
-
-
};
class SQLConn : public classbase
{
private:
ResultQueue results;
- InspIRCd* Instance;
Module* mod;
SQLhost host;
TDSLOGIN* login;
TDSCONTEXT* context;
public:
- SQLConn(InspIRCd* SI, Module* m, const SQLhost& hi)
- : Instance(SI), mod(m), host(hi), login(NULL), sock(NULL), context(NULL)
+ QueryQueue queue;
+
+ SQLConn(Module* m, const SQLhost& hi)
+ : mod(m), host(hi), login(NULL), sock(NULL), context(NULL)
{
if (OpenDB())
{
{
if (tds_process_simple_query(sock) != TDS_SUCCEED)
{
- Instance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
+ LoggingMutex->Lock();
+ ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
+ LoggingMutex->Unlock();
CloseDB();
}
}
else
{
- Instance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
+ LoggingMutex->Lock();
+ ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
+ LoggingMutex->Unlock();
CloseDB();
}
}
else
{
- Instance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not connect to DB with id: " + host.id);
+ LoggingMutex->Lock();
+ ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not connect to DB with id: " + host.id);
+ LoggingMutex->Unlock();
CloseDB();
}
}
SQLerror Query(SQLrequest &req)
{
if (!sock)
- return SQLerror(BAD_CONN, "Socket was NULL, check if SQL server is running.");
+ return SQLerror(SQL_BAD_CONN, "Socket was NULL, check if SQL server is running.");
/* Pointer to the buffer we screw around with substitution in */
char* query;
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;
+ /* 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;
- MsSQLResult* res = new MsSQLResult(mod, req.GetSource(), req.id);
+ MsSQLResult* res = new MsSQLResult((Module*)mod, req.GetSource(), req.id);
res->dbid = host.id;
res->query = req.query.q;
char* msquery = strdup(req.query.q.data());
- Instance->Logs->Log("m_mssql",DEBUG,"doing Query: %s",msquery);
+ 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()));
delete[] query;
delete res;
free(msquery);
- return SQLerror(QSEND_FAIL, error);
+ return SQLerror(SQL_QSEND_FAIL, error);
}
delete[] query;
free(msquery);
int tds_res;
while (tds_process_tokens(sock, &tds_res, NULL, TDS_TOKEN_RESULTS) == TDS_SUCCEED)
{
- //Instance->Logs->Log("m_mssql",DEBUG,"<******> result type: %d", tds_res);
- //Instance->Logs->Log("m_mssql",DEBUG,"AFFECTED ROWS: %d", sock->rows_affected);
+ //ServerInstance->Logs->Log("m_mssql",DEBUG,"<******> result type: %d", tds_res);
+ //ServerInstance->Logs->Log("m_mssql",DEBUG,"AFFECTED ROWS: %d", sock->rows_affected);
switch (tds_res)
{
case TDS_ROWFMT_RESULT:
unsigned char* src;
CONV_RESULT dres;
ctype = tds_get_conversion_type(col->column_type, col->column_size);
- src = &(sock->current_results->current_row[col->column_offset]);
+#if _TDSVER >= 82
+ src = col->column_data;
+#else
+ src = &(sock->current_results->current_row[col->column_offset]);
+#endif
srclen = col->column_cur_size;
tds_convert(sock->tds_ctx, ctype, (TDS_CHAR *) src, srclen, SYBCHAR, &dres);
data[j] = (char*)dres.ib;
break;
}
}
+ ResultsMutex->Lock();
results.push_back(res);
- SendNotify();
+ ResultsMutex->Unlock();
return SQLerror();
}
static int HandleMessage(const TDSCONTEXT * pContext, TDSSOCKET * pTdsSocket, TDSMESSAGE * pMessage)
{
SQLConn* sc = (SQLConn*)pContext->parent;
- sc->Instance->Logs->Log("m_mssql", DEBUG, "Message for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
+ LoggingMutex->Lock();
+ sc->ServerInstance->Logs->Log("m_mssql", DEBUG, "Message for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
+ LoggingMutex->Unlock();
return 0;
}
static int HandleError(const TDSCONTEXT * pContext, TDSSOCKET * pTdsSocket, TDSMESSAGE * pMessage)
{
SQLConn* sc = (SQLConn*)pContext->parent;
- sc->Instance->Logs->Log("m_mssql", DEFAULT, "Error for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
+ LoggingMutex->Lock();
+ sc->ServerInstance->Logs->Log("m_mssql", DEFAULT, "Error for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
+ LoggingMutex->Unlock();
return 0;
}
while (results.size())
{
MsSQLResult* res = results[0];
+ ResultsMutex->Lock();
if (res->GetDest())
{
res->Send();
delete res;
}
results.pop_front();
+ ResultsMutex->Unlock();
}
}
}
}
- void SendNotify()
+ void DoLeadingQuery()
{
- if (QueueFD < 0)
- {
- if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1)
- {
- /* crap, we're out of sockets... */
- return;
- }
-
- insp_sockaddr addr;
-
-#ifdef IPV6
- insp_aton("::1", &addr.sin6_addr);
- addr.sin6_family = AF_FAMILY;
- addr.sin6_port = htons(resultnotify->GetPort());
-#else
- insp_inaddr ia;
- insp_aton("127.0.0.1", &ia);
- addr.sin_family = AF_FAMILY;
- addr.sin_addr = ia;
- addr.sin_port = htons(resultnotify->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);
+ SQLrequest& req = queue.front();
+ req.error = Query(req);
}
};
class ModuleMsSQL : public Module
{
private:
- ConnMap connections;
unsigned long currid;
+ QueryThread* queryDispatcher;
public:
- ModuleMsSQL(InspIRCd* Me)
- : Module::Module(Me), currid(0)
+ ModuleMsSQL()
+ : currid(0)
{
+ LoggingMutex = new Mutex();
+ ResultsMutex = new Mutex();
+
ServerInstance->Modules->UseInterface("SQLutils");
if (!ServerInstance->Modules->PublishFeature("SQL", this))
throw ModuleException("m_mssql: Unable to publish feature 'SQL'");
}
- resultnotify = new ResultNotifier(ServerInstance, this);
-
ReadConf();
+ queryDispatcher = new QueryThread(this);
+ ServerInstance->Threads->Start(queryDispatcher);
+
ServerInstance->Modules->PublishInterface("SQL", this);
Implementation eventlist[] = { I_OnRequest, I_OnRehash };
ServerInstance->Modules->Attach(eventlist, this, 2);
virtual ~ModuleMsSQL()
{
+ queryDispatcher->join();
+ delete queryDispatcher;
ClearQueue();
ClearAllConnections();
- ServerInstance->SE->DelFd(resultnotify);
- resultnotify->Close();
- ServerInstance->BufferedSocketCull();
-
- if (QueueFD >= 0)
- {
- shutdown(QueueFD, 2);
- close(QueueFD);
- }
-
- if (resultdispatch)
- {
- ServerInstance->SE->DelFd(resultdispatch);
- resultdispatch->Close();
- ServerInstance->BufferedSocketCull();
- }
-
ServerInstance->Modules->UnpublishInterface("SQL", this);
ServerInstance->Modules->UnpublishFeature("SQL");
ServerInstance->Modules->DoneWithInterface("SQLutils");
- }
+ delete LoggingMutex;
+ delete ResultsMutex;
+ }
void SendQueue()
{
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;
{
if (HasHost(hi))
{
+ LoggingMutex->Lock();
ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: A MsSQL connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str());
+ LoggingMutex->Unlock();
return;
}
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)
{
+ queryDispatcher->LockQueue();
ReadConf();
+ queryDispatcher->UnlockQueueWakeup();
}
virtual const char* OnRequest(Request* request)
if(strcmp(SQLREQID, request->GetId()) == 0)
{
SQLrequest* req = (SQLrequest*)request;
+
+ queryDispatcher->LockQueue();
+
ConnMap::iterator iter;
+
+ const char* returnval = NULL;
+
if((iter = connections.find(req->dbid)) != connections.end())
{
req->id = NewID();
- req->error = iter->second->Query(*req);
- return SQLSUCCESS;
+ iter->second->queue.push(*req);
+ returnval= SQLSUCCESS;
}
else
{
- req->error.Id(BAD_DBID);
- return NULL;
+ req->error.Id(SQL_BAD_DBID);
}
+
+ queryDispatcher->UnlockQueueWakeup();
+
+ return returnval;
}
return NULL;
}
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()
{
- ((ModuleMsSQL*)mod)->SendQueue();
+ Parent->SendQueue();
+}
+
+void QueryThread::Run()
+{
+ this->LockQueue();
+ while (this->GetExitFlag() == false)
+ {
+ SQLConn* conn = NULL;
+ for (ConnMap::iterator i = connections.begin(); i != connections.end(); i++)
+ {
+ if (i->second->queue.totalsize())
+ {
+ conn = i->second;
+ break;
+ }
+ }
+ if (conn)
+ {
+ this->UnlockQueue();
+ conn->DoLeadingQuery();
+ this->NotifyParent();
+ this->LockQueue();
+ conn->queue.pop();
+ }
+ else
+ {
+ this->WaitForQueue();
+ }
+ }
+ this->UnlockQueue();
}
MODULE_INIT(ModuleMsSQL)
projects / user / henk / code / inspircd.git / blobdiff