X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_sqlite3.cpp;h=deff0fe06a852f469853de583e3dbf4a31b5e15b;hb=caa89fb37c532930805f0b144e3298624ec1adec;hp=9795e9f8bad84c92af8a523dff06306d6d2d1e14;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 9795e9f8b..deff0fe06 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -23,7 +23,7 @@
 /* $CompileFlags: pkgconfversion("sqlite3","3.3") pkgconfincludes("sqlite3","/sqlite3.h","") */
 /* $LinkerFlags: pkgconflibs("sqlite3","/libsqlite3.so","-lsqlite3") */
 /* $ModDep: m_sqlv2.h */
-
+/* $NoPedantic */
 
 class SQLConn;
 class SQLite3Result;
@@ -36,7 +36,7 @@ typedef std::deque<SQLite3Result*> ResultQueue;
 ResultNotifier* resultnotify = NULL;
 
 
-class ResultNotifier : public InspSocket
+class ResultNotifier : public BufferedSocket
 {
 	Module* mod;
 	insp_sockaddr sock_us;
@@ -45,9 +45,9 @@ class ResultNotifier : public InspSocket
  public:
 	/* Create a socket on a random port. Let the tcp stack allocate us an available port */
 #ifdef IPV6
-	ResultNotifier(InspIRCd* SI, Module* m) : InspSocket(SI, "::1", 0, true, 3000), mod(m)
+	ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "::1", 0, true, 3000), mod(m)
 #else
-	ResultNotifier(InspIRCd* SI, Module* m) : InspSocket(SI, "127.0.0.1", 0, true, 3000), mod(m)
+	ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "127.0.0.1", 0, true, 3000), mod(m)
 #endif
 	{
 		uslen = sizeof(sock_us);
@@ -57,7 +57,7 @@ class ResultNotifier : public InspSocket
 		}
 	}
 
-	ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : InspSocket(SI, newfd, ip), mod(m)
+	ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m)
 	{
 	}
 
@@ -96,8 +96,8 @@ class SQLite3Result : public SQLresult
 	SQLfieldMap* fieldmap;
 
   public:
-	SQLite3Result(Module* self, Module* to, unsigned int id)
-	: SQLresult(self, to, id), currentrow(0), rows(0), cols(0), fieldlist(NULL), fieldmap(NULL)
+	SQLite3Result(Module* self, Module* to, unsigned int rid)
+	: SQLresult(self, to, rid), currentrow(0), rows(0), cols(0), fieldlist(NULL), fieldmap(NULL)
 	{
 	}
 
@@ -105,7 +105,7 @@ class SQLite3Result : public SQLresult
 	{
 	}
 
-	void AddRow(int colsnum, char **data, char **colname)
+	void AddRow(int colsnum, char **dat, char **colname)
 	{
 		colnames.clear();
 		cols = colsnum;
@@ -113,7 +113,7 @@ class SQLite3Result : public SQLresult
 		{
 			fieldlists.resize(fieldlists.size()+1);
 			colnames.push_back(colname[i]);
-			SQLfield sf(data[i] ? data[i] : "", data[i] ? false : true);
+			SQLfield sf(dat[i] ? dat[i] : "", dat[i] ? false : true);
 			fieldlists[rows].push_back(sf);
 		}
 		rows++;
@@ -264,7 +264,7 @@ class SQLConn : public classbase
 	{
 		if (OpenDB() != SQLITE_OK)
 		{
-			Instance->Log(DEFAULT, "WARNING: Could not open DB with id: " + host.id);
+			Instance->Logs->Log("m_sqlite3",DEFAULT, "WARNING: Could not open DB with id: " + host.id);
 			CloseDB();
 		}
 	}
@@ -480,6 +480,8 @@ class ModuleSQLite3 : public Module
 		ReadConf();
 
 		ServerInstance->Modules->PublishInterface("SQL", this);
+		Implementation eventlist[] = { I_OnRequest, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	virtual ~ModuleSQLite3()
@@ -496,10 +498,6 @@ class ModuleSQLite3 : public Module
 		ServerInstance->Modules->DoneWithInterface("SQLutils");
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRequest] = List[I_OnRehash] = 1;
-	}
 
 	void SendQueue()
 	{
@@ -539,7 +537,6 @@ class ModuleSQLite3 : public Module
 			host.name	= conf.ReadValue("database", "name", i);
 			host.user	= conf.ReadValue("database", "username", i);
 			host.pass	= conf.ReadValue("database", "password", i);
-			host.ssl	= conf.ReadFlag("database", "ssl", "0", i);
 			if (h == host)
 				return true;
 		}
@@ -561,7 +558,6 @@ class ModuleSQLite3 : public Module
 			host.name	= conf.ReadValue("database", "name", i);
 			host.user	= conf.ReadValue("database", "username", i);
 			host.pass	= conf.ReadValue("database", "password", i);
-			host.ssl	= conf.ReadFlag("database", "ssl", "0", i);
 
 			if (HasHost(host))
 				continue;
@@ -574,7 +570,7 @@ class ModuleSQLite3 : public Module
 	{
 		if (HasHost(hi))
 		{
-			ServerInstance->Log(DEFAULT, "WARNING: A sqlite connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str());
+			ServerInstance->Logs->Log("m_sqlite3",DEFAULT, "WARNING: A sqlite connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str());
 			return;
 		}
 
@@ -592,7 +588,7 @@ class ModuleSQLite3 : public Module
 		{
 			if (!HostInConf(iter->second->GetConfHost()))
 			{
-				DELETE(iter->second);
+				delete iter->second;
 				safei = iter;
 				--iter;
 				connections.erase(safei);
@@ -606,7 +602,7 @@ class ModuleSQLite3 : public Module
 		while ((i = connections.begin()) != connections.end())
 		{
 			connections.erase(i);
-			DELETE(i->second);
+			delete i->second;
 		}
 	}
 
@@ -615,7 +611,7 @@ class ModuleSQLite3 : public Module
 		ReadConf();
 	}
 
-	virtual char* OnRequest(Request* request)
+	virtual const char* OnRequest(Request* request)
 	{
 		if(strcmp(SQLREQID, request->GetId()) == 0)
 		{
@@ -646,7 +642,7 @@ class ModuleSQLite3 : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
+		return Version(1,2,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
 	}
 
 };
@@ -656,5 +652,5 @@ void ResultNotifier::Dispatch()
 	((ModuleSQLite3*)mod)->SendQueue();
 }
 
-MODULE_INIT(ModuleSQLite3);
+MODULE_INIT(ModuleSQLite3)