More stuff so that freebsd users can still use the ports version of openssl if they...

[user/henk/code/inspircd.git] / src / modules / extra / m_sqlite3.cpp

diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 4a46108ef5fb6063a790f72ba93f73e0941a60a2..deff0fe06a852f469853de583e3dbf4a31b5e15b 100644 (file)
--- 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
@@ -11,24 +11,19 @@
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <deque>
-#include <map>
+#include "inspircd.h"
 #include <sqlite3.h>
-
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
-#include "configreader.h"
 
 #include "m_sqlv2.h"
 
 /* $ModDesc: sqlite3 provider */
-/* $CompileFlags: pkgconfincludes("sqlite3","/sqlite3.h","") */
+/* $CompileFlags: pkgconfversion("sqlite3","3.3") pkgconfincludes("sqlite3","/sqlite3.h","") */
 /* $LinkerFlags: pkgconflibs("sqlite3","/libsqlite3.so","-lsqlite3") */
 /* $ModDep: m_sqlv2.h */
-
+/* $NoPedantic */
 
 class SQLConn;
 class SQLite3Result;
@@ -41,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;
@@ -50,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);
@@ -62,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)
        {
        }
 
@@ -101,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)
        {
        }
 
@@ -110,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;
@@ -118,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++;
@@ -269,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();
                }
        }
@@ -371,7 +366,7 @@ class SQLConn : public classbase
        {
                paramlist* p = (paramlist*)params;
                ((SQLConn*)(*p)[0])->AffectedReady(((SQLite3Result*)(*p)[1]));
-       }\r
+       }
 
        void ResultReady(SQLite3Result *res, int cols, char **data, char **colnames)
        {
@@ -473,9 +468,9 @@ class ModuleSQLite3 : public Module
        ModuleSQLite3(InspIRCd* Me)
        : Module::Module(Me), currid(0)
        {
-               ServerInstance->UseInterface("SQLutils");
+               ServerInstance->Modules->UseInterface("SQLutils");
 
-               if (!ServerInstance->PublishFeature("SQL", this))
+               if (!ServerInstance->Modules->PublishFeature("SQL", this))
                {
                        throw ModuleException("m_sqlite3: Unable to publish feature 'SQL'");
                }
@@ -484,7 +479,9 @@ class ModuleSQLite3 : public Module
 
                ReadConf();
 
-               ServerInstance->PublishInterface("SQL", this);
+               ServerInstance->Modules->PublishInterface("SQL", this);
+               Implementation eventlist[] = { I_OnRequest, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual ~ModuleSQLite3()
@@ -496,15 +493,11 @@ class ModuleSQLite3 : public Module
                resultnotify->OnError(I_ERR_SOCKET);
                resultnotify->ClosePending = true;
                delete resultnotify;
-               ServerInstance->UnpublishInterface("SQL", this);
-               ServerInstance->UnpublishFeature("SQL");
-               ServerInstance->DoneWithInterface("SQLutils");
+               ServerInstance->Modules->UnpublishInterface("SQL", this);
+               ServerInstance->Modules->UnpublishFeature("SQL");
+               ServerInstance->Modules->DoneWithInterface("SQLutils");
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRequest] = List[I_OnRehash] = 1;
-       }
 
        void SendQueue()
        {
@@ -544,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;
                }
@@ -566,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;
@@ -579,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;
                }
 
@@ -597,7 +588,7 @@ class ModuleSQLite3 : public Module
                {
                        if (!HostInConf(iter->second->GetConfHost()))
                        {
-                               DELETE(iter->second);
+                               delete iter->second;
                                safei = iter;
                                --iter;
                                connections.erase(safei);
@@ -611,16 +602,16 @@ class ModuleSQLite3 : public Module
                while ((i = connections.begin()) != connections.end())
                {
                        connections.erase(i);
-                       DELETE(i->second);
+                       delete i->second;
                }
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                ReadConf();
        }
 
-       virtual char* OnRequest(Request* request)
+       virtual const char* OnRequest(Request* request)
        {
                if(strcmp(SQLREQID, request->GetId()) == 0)
                {
@@ -651,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);
        }
 
 };
@@ -661,24 +652,5 @@ void ResultNotifier::Dispatch()
        ((ModuleSQLite3*)mod)->SendQueue();
 }
 
-class ModuleSQLite3Factory : public ModuleFactory
-{
-  public:
-       ModuleSQLite3Factory()
-       {
-       }
-
-       ~ModuleSQLite3Factory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSQLite3(Me);
-       }
-};
+MODULE_INIT(ModuleSQLite3)
 
-extern "C" void * init_module( void )
-{
-       return new ModuleSQLite3Factory;
-}