Fix excessive snomask sending on fitler add/removal

[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 d76bc97fe72f8891306091f429d3b252b5136396..548af82cc4715f320b0fa16464a73d627ccb2574 100644 (file)
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.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.
@@ -13,9 +13,6 @@
 
 #include "inspircd.h"
 #include <sqlite3.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "m_sqlv2.h"
 
 /* $ModDesc: sqlite3 provider */
@@ -34,6 +31,17 @@ 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)
+{
+       unsigned long n = 0;
+       for (const char *p = reinterpret_cast<const char *>(str); *p; ++p)
+       {
+               if (*p == '?')
+                       ++n;
+       }
+       return n;
+}
+
 ResultNotifier* notifier = NULL;
 SQLiteListener* listener = NULL;
 int QueueFD = -1;
@@ -296,30 +304,84 @@ 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 sqlite 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)
+                               {
+                                       char* escaped;
+                                       escaped = sqlite3_mprintf("%q", paramscopy[paramnum].c_str());
+                                       for (char* n = escaped; *n; n++)
+                                       {
+                                               *queryend = *n;
+                                               queryend++;
+                                       }
+                                       sqlite3_free(escaped);
+                               }
+                               else if (req.query.p.size())
                                {
                                        char* escaped;
                                        escaped = sqlite3_mprintf("%q", req.query.p.front().c_str());
@@ -339,7 +401,6 @@ class SQLConn : public classbase
                                *queryend = req.query.q[i];
                                queryend++;
                        }
-                       querylength++;
                }
                *queryend = 0;
                req.query.q = query;
@@ -393,7 +454,7 @@ class SQLConn : public classbase
 
        int OpenDB()
        {
-               return sqlite3_open(host.host.c_str(), &conn);
+               return sqlite3_open_v2(host.host.c_str(), &conn, SQLITE_OPEN_READWRITE, 0);
        }
 
        void CloseDB()
@@ -650,7 +711,7 @@ class ModuleSQLite3 : public Module
                }
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                ReadConf();
        }