Fix STARTTLS sending the 670 numeric within the SSL session, not prior to it

[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 aba3c0930cc4ad4f9672b879d34d6c4c446d1add..e97e884ea4fc62c3cda7606b034274349c4f059b 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-2009 InspIRCd Development Team
+ *     InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -31,7 +31,7 @@ typedef std::map<std::string, SQLConn*> ConnMap;
 typedef std::deque<classbase*> paramlist;
 typedef std::deque<SQLite3Result*> ResultQueue;
 
-unsigned long count(const char * const str, char a)
+static unsigned long count(const char * const str, char a)
 {
        unsigned long n = 0;
        for (const char *p = str; *p; ++p)
@@ -42,61 +42,6 @@ unsigned long count(const char * const str, char a)
        return n;
 }
 
-ResultNotifier* notifier = NULL;
-SQLiteListener* listener = NULL;
-int QueueFD = -1;
-
-class ResultNotifier : public BufferedSocket
-{
-       ModuleSQLite3* mod;
-
- public:
-       ResultNotifier(ModuleSQLite3* m, int newfd) : BufferedSocket(newfd), mod(m)
-       {
-       }
-
-       void OnDataReady()
-       {
-               recvq.clear();
-               Dispatch();
-       }
-
-       void OnError(BufferedSocketError) {}
-
-       void Dispatch();
-};
-
-class SQLiteListener : public ListenSocketBase
-{
-       ModuleSQLite3* Parent;
-       irc::sockets::sockaddrs sock_us;
-       socklen_t uslen;
-       FileReader* index;
-
- public:
-       SQLiteListener(ModuleSQLite3* P, int port, const std::string &addr) : ListenSocketBase(port, addr, "ITC", "none"), 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");
-               }
-       }
-
-       void OnAcceptReady(int nfd)
-       {
-               new ResultNotifier(Parent, nfd);
-       }
-
-       int GetPort()
-       {
-               int port = 0;
-               std::string addr;
-               irc::sockets::satoap(&sock_us, addr, port);
-               return port;
-       }
-};
-
 class SQLite3Result : public SQLresult
 {
  private:
@@ -419,7 +364,7 @@ class SQLConn : public classbase
                delete[] query;
 
                results.push_back(res);
-               SendNotify();
+               SendResults();
                return SQLerror();
        }
 
@@ -493,29 +438,6 @@ class SQLConn : public classbase
                }
        }
 
-       void SendNotify()
-       {
-               if (QueueFD < 0)
-               {
-                       if ((QueueFD = socket(AF_INET, SOCK_STREAM, 0)) == -1)
-                       {
-                               /* crap, we're out of sockets... */
-                               return;
-                       }
-
-                       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;
-                       }
-               }
-               char id = 0;
-               send(QueueFD, &id, 1, 0);
-       }
-
 };
 
 
@@ -524,34 +446,15 @@ class ModuleSQLite3 : public Module
  private:
        ConnMap connections;
        unsigned long currid;
+       ServiceProvider sqlserv;
 
  public:
        ModuleSQLite3()
-       : currid(0)
+       : currid(0), sqlserv(this, "SQL/sqlite", SERVICE_DATA)
        {
-               ServerInstance->Modules->UseInterface("SQLutils");
-
-               if (!ServerInstance->Modules->PublishFeature("SQL", this))
-               {
-                       throw ModuleException("m_sqlite3: Unable to publish feature 'SQL'");
-               }
-
-               /* Create a socket on a random port. Let the tcp stack allocate us an available port */
-               listener = new SQLiteListener(this, 0, "127.0.0.1");
-
-               if (listener->GetFd() == -1)
-               {
-                       ServerInstance->Modules->DoneWithInterface("SQLutils");
-                       throw ModuleException("m_sqlite3: unable to create ITC pipe");
-               }
-               else
-               {
-                       ServerInstance->Logs->Log("m_sqlite3", DEBUG, "SQLite: Interthread comms port is %d", listener->GetPort());
-               }
 
                ReadConf();
 
-               ServerInstance->Modules->PublishInterface("SQL", this);
                Implementation eventlist[] = { I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 1);
        }
@@ -560,35 +463,6 @@ class ModuleSQLite3 : public Module
        {
                ClearQueue();
                ClearAllConnections();
-
-               ServerInstance->SE->DelFd(listener);
-
-               if (QueueFD >= 0)
-               {
-                       shutdown(QueueFD, 2);
-                       close(QueueFD);
-               }
-
-               if (notifier)
-               {
-                       ServerInstance->SE->DelFd(notifier);
-                       notifier->Close();
-               }
-
-               ServerInstance->GlobalCulls.Apply();
-
-               ServerInstance->Modules->UnpublishInterface("SQL", this);
-               ServerInstance->Modules->UnpublishFeature("SQL");
-               ServerInstance->Modules->DoneWithInterface("SQLutils");
-       }
-
-
-       void SendQueue()
-       {
-               for (ConnMap::iterator iter = connections.begin(); iter != connections.end(); iter++)
-               {
-                       iter->second->SendResults();
-               }
        }
 
        void ClearQueue()
@@ -723,14 +597,9 @@ class ModuleSQLite3 : public Module
 
        virtual Version GetVersion()
        {
-               return Version("sqlite3 provider", VF_VENDOR | VF_SERVICEPROVIDER);
+               return Version("sqlite3 provider", VF_VENDOR);
        }
 
 };
 
-void ResultNotifier::Dispatch()
-{
-       mod->SendQueue();
-}
-
 MODULE_INIT(ModuleSQLite3)