X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mssql.cpp;h=9cc7a567c80afaf5153e563fbfcdb0c45f5b961b;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=814f02691015bc924586fb309d6294d0a0abfb6a;hpb=134206328f802ddc8273cfba9a472e41e6ddc483;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp
index 814f02691..9cc7a567c 100644
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -2,8 +2,8 @@
  *		 | 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.
@@ -21,98 +21,47 @@
 #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 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 = reinterpret_cast<const char *>(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* Instance;
+	InspIRCd* ServerInstance;
   public:
 	QueryThread(InspIRCd* si, ModuleMsSQL* mod)
-	: Thread(), Parent(mod), Instance(si)
+	: SocketThread(si), Parent(mod), ServerInstance(si)
 	{
 	}
 	~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 (Instance->SE->Recv(this, &data, 1, 0) > 0)
-		{
-			Dispatch();
-			return true;
-		}
-		return false;
-	}
-
-	void Dispatch();
-};
-
-class MsSQLListener : public ListenSocketBase
-{
-	ModuleMsSQL* Parent;
-	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:
@@ -277,15 +226,13 @@ class MsSQLResult : public SQLresult
 	{
 		delete fl;
 	}
-
-
 };
 
 class SQLConn : public classbase
 {
  private:
 	ResultQueue results;
-	InspIRCd* Instance;
+	InspIRCd* ServerInstance;
 	Module* mod;
 	SQLhost host;
 	TDSLOGIN* login;
@@ -296,7 +243,7 @@ class SQLConn : public classbase
 	QueryQueue queue;
 
 	SQLConn(InspIRCd* SI, Module* m, const SQLhost& hi)
-	: Instance(SI), mod(m), host(hi), login(NULL), sock(NULL), context(NULL)
+	: ServerInstance(SI), mod(m), host(hi), login(NULL), sock(NULL), context(NULL)
 	{
 		if (OpenDB())
 		{
@@ -306,7 +253,7 @@ class SQLConn : public classbase
 				if (tds_process_simple_query(sock) != TDS_SUCCEED)
 				{
 					LoggingMutex->Lock();
-					Instance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
+					ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
 					LoggingMutex->Unlock();
 					CloseDB();
 				}
@@ -314,7 +261,7 @@ class SQLConn : public classbase
 			else
 			{
 				LoggingMutex->Lock();
-				Instance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
+				ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
 				LoggingMutex->Unlock();
 				CloseDB();
 			}
@@ -322,7 +269,7 @@ class SQLConn : public classbase
 		else
 		{
 			LoggingMutex->Lock();
-			Instance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not connect to DB with id: " + host.id);
+			ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not connect to DB with id: " + host.id);
 			LoggingMutex->Unlock();
 			CloseDB();
 		}
@@ -345,30 +292,98 @@ class SQLConn : public classbase
 		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 :]
 					 */
@@ -403,7 +418,6 @@ class SQLConn : public classbase
 				*queryend = req.query.q[i];
 				queryend++;
 			}
-			querylength++;
 		}
 		*queryend = 0;
 		req.query.q = query;
@@ -414,7 +428,7 @@ class SQLConn : public classbase
 
 		char* msquery = strdup(req.query.q.data());
 		LoggingMutex->Lock();
-		Instance->Logs->Log("m_mssql",DEBUG,"doing Query: %s",msquery);
+		ServerInstance->Logs->Log("m_mssql",DEBUG,"doing Query: %s",msquery);
 		LoggingMutex->Unlock();
 		if (tds_submit_query(sock, msquery) != TDS_SUCCEED)
 		{
@@ -430,8 +444,8 @@ class SQLConn : public classbase
 		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:
@@ -469,7 +483,11 @@ class SQLConn : public classbase
 								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;
@@ -486,7 +504,6 @@ class SQLConn : public classbase
 		ResultsMutex->Lock();
 		results.push_back(res);
 		ResultsMutex->Unlock();
-		SendNotify();
 		return SQLerror();
 	}
 
@@ -494,7 +511,7 @@ class SQLConn : public classbase
 	{
 		SQLConn* sc = (SQLConn*)pContext->parent;
 		LoggingMutex->Lock();
-		sc->Instance->Logs->Log("m_mssql", DEBUG, "Message for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
+		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;
 	}
@@ -503,7 +520,7 @@ class SQLConn : public classbase
 	{
 		SQLConn* sc = (SQLConn*)pContext->parent;
 		LoggingMutex->Lock();
-		sc->Instance->Logs->Log("m_mssql", DEFAULT, "Error for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
+		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;
 	}
@@ -610,40 +627,6 @@ class SQLConn : public classbase
 		}
 	}
 
-	void SendNotify()
-	{
-		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(listener->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(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();
@@ -663,9 +646,8 @@ class ModuleMsSQL : public Module
 	ModuleMsSQL(InspIRCd* Me)
 	: Module(Me), currid(0)
 	{
-		LoggingMutex = ServerInstance->Mutexes->CreateMutex();
-		ResultsMutex = ServerInstance->Mutexes->CreateMutex();
-		QueueMutex = ServerInstance->Mutexes->CreateMutex();
+		LoggingMutex = new Mutex();
+		ResultsMutex = new Mutex();
 
 		ServerInstance->Modules->UseInterface("SQLutils");
 
@@ -674,29 +656,10 @@ class ModuleMsSQL : public Module
 			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);
+		ServerInstance->Threads->Start(queryDispatcher);
 
 		ServerInstance->Modules->PublishInterface("SQL", this);
 		Implementation eventlist[] = { I_OnRequest, I_OnRehash };
@@ -705,37 +668,19 @@ class ModuleMsSQL : public Module
 
 	virtual ~ModuleMsSQL()
 	{
+		queryDispatcher->join();
 		delete queryDispatcher;
 		ClearQueue();
 		ClearAllConnections();
 
-		ServerInstance->SE->DelFd(listener);
-		//listener->Close();
-		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++)
@@ -845,11 +790,11 @@ class ModuleMsSQL : public Module
 		}
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
-		QueueMutex->Lock();
+		queryDispatcher->LockQueue();
 		ReadConf();
-		QueueMutex->Unlock();
+		queryDispatcher->UnlockQueueWakeup();
 	}
 
 	virtual const char* OnRequest(Request* request)
@@ -858,7 +803,7 @@ class ModuleMsSQL : public Module
 		{
 			SQLrequest* req = (SQLrequest*)request;
 
-			QueueMutex->Lock();
+			queryDispatcher->LockQueue();
 
 			ConnMap::iterator iter;
 
@@ -875,7 +820,7 @@ class ModuleMsSQL : public Module
 				req->error.Id(SQL_BAD_DBID);
 			}
 
-			QueueMutex->Unlock();
+			queryDispatcher->UnlockQueueWakeup();
 
 			return returnval;
 		}
@@ -897,17 +842,17 @@ class ModuleMsSQL : public Module
 
 };
 
-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())
@@ -916,16 +861,20 @@ void QueryThread::Run()
 				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)