Update Event and Request APIs

[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 86b2cb3789d1c1997ba86a3954aea9084f22ed96..680053bf1e08ff1a31c6a617634fc814a37de6be 100644 (file)
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -51,33 +51,30 @@ class ResultNotifier : public BufferedSocket
        ModuleSQLite3* mod;
 
  public:
-       ResultNotifier(ModuleSQLite3* m, InspIRCd* SI, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m)
+       ResultNotifier(ModuleSQLite3* m, int newfd) : BufferedSocket(newfd), mod(m)
        {
        }
 
-       virtual bool OnDataReady()
+       void OnDataReady()
        {
-               char data = 0;
-               if (ServerInstance->SE->Recv(this, &data, 1, 0) > 0)
-               {
-                       Dispatch();
-                       return true;
-               }
-               return false;
+               recvq.clear();
+               Dispatch();
        }
 
+       void OnError(BufferedSocketError) {}
+
        void Dispatch();
 };
 
 class SQLiteListener : public ListenSocketBase
 {
        ModuleSQLite3* Parent;
-       irc::sockets::insp_sockaddr sock_us;
+       irc::sockets::sockaddrs sock_us;
        socklen_t uslen;
        FileReader* index;
 
  public:
-       SQLiteListener(ModuleSQLite3* P, InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr), Parent(P)
+       SQLiteListener(ModuleSQLite3* P, int port, const std::string &addr) : ListenSocketBase(port, addr), Parent(P)
        {
                uslen = sizeof(sock_us);
                if (getsockname(this->fd,(sockaddr*)&sock_us,&uslen))
@@ -86,19 +83,17 @@ class SQLiteListener : public ListenSocketBase
                }
        }
 
-       virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
+       void OnAcceptReady(int nfd)
        {
-               new ResultNotifier(this->Parent, this->ServerInstance, nfd, (char *)ipconnectedto.c_str()); // XXX unsafe casts suck
+               new ResultNotifier(Parent, nfd);
        }
 
-       /* 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
+               int port = 0;
+               std::string addr;
+               irc::sockets::satoap(&sock_us, addr, port);
+               return port;
        }
 };
 
@@ -274,14 +269,13 @@ class SQLConn : public classbase
 {
  private:
        ResultQueue results;
-       InspIRCd* ServerInstance;
        Module* mod;
        SQLhost host;
        sqlite3* conn;
 
  public:
-       SQLConn(InspIRCd* SI, Module* m, const SQLhost& hi)
-       : ServerInstance(SI), mod(m), host(hi)
+       SQLConn(Module* m, const SQLhost& hi)
+       : mod(m), host(hi)
        {
                if (OpenDB() != SQLITE_OK)
                {
@@ -405,7 +399,7 @@ class SQLConn : public classbase
                *queryend = 0;
                req.query.q = query;
 
-               SQLite3Result* res = new SQLite3Result(mod, req.GetSource(), req.id);
+               SQLite3Result* res = new SQLite3Result(mod, req.source, req.id);
                res->dbid = host.id;
                res->query = req.query.q;
                paramlist params;
@@ -473,7 +467,7 @@ class SQLConn : public classbase
                while (results.size())
                {
                        SQLite3Result* res = results[0];
-                       if (res->GetDest())
+                       if (res->dest)
                        {
                                res->Send();
                        }
@@ -503,27 +497,16 @@ class SQLConn : public classbase
        {
                if (QueueFD < 0)
                {
-                       if ((QueueFD = socket(AF_FAMILY, SOCK_STREAM, 0)) == -1)
+                       if ((QueueFD = socket(AF_INET, 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)
+                       irc::sockets::sockaddrs addr;
+                       irc::sockets::aptosa("127.0.0.1", listener->GetPort(), &addr);
+
+                       if (connect(QueueFD, &addr.sa, sa_size(addr)) == -1)
                        {
                                /* wtf, we cant connect to it, but we just created it! */
                                return;
@@ -543,8 +526,8 @@ class ModuleSQLite3 : public Module
        unsigned long currid;
 
  public:
-       ModuleSQLite3(InspIRCd* Me)
-       : Module(Me), currid(0)
+       ModuleSQLite3()
+       : currid(0)
        {
                ServerInstance->Modules->UseInterface("SQLutils");
 
@@ -554,11 +537,7 @@ class ModuleSQLite3 : public Module
                }
 
                /* Create a socket on a random port. Let the tcp stack allocate us an available port */
-#ifdef IPV6
-               listener = new SQLiteListener(this, ServerInstance, 0, "::1");
-#else
-               listener = new SQLiteListener(this, ServerInstance, 0, "127.0.0.1");
-#endif
+               listener = new SQLiteListener(this, 0, "127.0.0.1");
 
                if (listener->GetFd() == -1)
                {
@@ -573,8 +552,8 @@ class ModuleSQLite3 : public Module
                ReadConf();
 
                ServerInstance->Modules->PublishInterface("SQL", this);
-               Implementation eventlist[] = { I_OnRequest, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
        virtual ~ModuleSQLite3()
@@ -583,7 +562,6 @@ class ModuleSQLite3 : public Module
                ClearAllConnections();
 
                ServerInstance->SE->DelFd(listener);
-               ServerInstance->BufferedSocketCull();
 
                if (QueueFD >= 0)
                {
@@ -595,9 +573,10 @@ class ModuleSQLite3 : public Module
                {
                        ServerInstance->SE->DelFd(notifier);
                        notifier->Close();
-                       ServerInstance->BufferedSocketCull();
                }
 
+               ServerInstance->GlobalCulls.Apply();
+
                ServerInstance->Modules->UnpublishInterface("SQL", this);
                ServerInstance->Modules->UnpublishFeature("SQL");
                ServerInstance->Modules->DoneWithInterface("SQLutils");
@@ -632,7 +611,7 @@ class ModuleSQLite3 : public Module
 
        bool HostInConf(const SQLhost &h)
        {
-               ConfigReader conf(ServerInstance);
+               ConfigReader conf;
                for(int i = 0; i < conf.Enumerate("database"); i++)
                {
                        SQLhost host;
@@ -652,7 +631,7 @@ class ModuleSQLite3 : public Module
        {
                ClearOldConnections();
 
-               ConfigReader conf(ServerInstance);
+               ConfigReader conf;
                for(int i = 0; i < conf.Enumerate("database"); i++)
                {
                        SQLhost host;
@@ -681,7 +660,7 @@ class ModuleSQLite3 : public Module
 
                SQLConn* newconn;
 
-               newconn = new SQLConn(ServerInstance, this, hi);
+               newconn = new SQLConn(this, hi);
 
                connections.insert(std::make_pair(hi.id, newconn));
        }
@@ -716,25 +695,22 @@ class ModuleSQLite3 : public Module
                ReadConf();
        }
 
-       virtual const char* OnRequest(Request* request)
+       void OnRequest(Request& request)
        {
-               if(strcmp(SQLREQID, request->GetId()) == 0)
+               if(strcmp(SQLREQID, request.id) == 0)
                {
-                       SQLrequest* req = (SQLrequest*)request;
+                       SQLrequest* req = (SQLrequest*)&request;
                        ConnMap::iterator iter;
                        if((iter = connections.find(req->dbid)) != connections.end())
                        {
                                req->id = NewID();
                                req->error = iter->second->Query(*req);
-                               return SQLSUCCESS;
                        }
                        else
                        {
                                req->error.Id(SQL_BAD_DBID);
-                               return NULL;
                        }
                }
-               return NULL;
        }
 
        unsigned long NewID()