Fix potential for duplicate SID if the SID is auto generated.

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

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 76c8ccf81ee0f065c0e9ca8baa244b2742d23d6a..fd51e4d61767b1ee066698dc1b83b4fc95869680 100644 (file)
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -11,12 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <vector>
-#include <string.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Povides support for the /DCCALLOW command */
@@ -57,6 +51,7 @@ class cmd_dccallow : public command_t
        {
                this->source = "m_dccallow.so";
                syntax = "{[+|-]<nick> <time>|HELP|LIST}";
+               /* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */
        }
 
        CmdResult Handle(const char **parameters, int pcnt, userrec *user)
@@ -164,7 +159,7 @@ class cmd_dccallow : public command_t
                                        long length;
                                        if (pcnt < 2)
                                        {
-                                               length = ServerInstance->Duration(default_length.c_str());
+                                               length = ServerInstance->Duration(default_length);
                                        } 
                                        else if (!atoi(parameters[1]))
                                        {
@@ -190,7 +185,8 @@ class cmd_dccallow : public command_t
                                        {
                                                user->WriteServ("994 %s %s :Added %s to DCCALLOW list for this session", user->nick, user->nick, target->nick);
                                        }
-                               
+
+                                       /* route it. */
                                        return CMD_SUCCESS;
                                }
                        }
@@ -253,7 +249,7 @@ class ModuleDCCAllow : public Module
  public:
 
        ModuleDCCAllow(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                Conf = new ConfigReader(ServerInstance);
                mycommand = new cmd_dccallow(ServerInstance);
@@ -272,7 +268,7 @@ class ModuleDCCAllow : public Module
                Conf = new ConfigReader(ServerInstance);
        }
 
-       virtual void OnUserQuit(userrec* user, const std::string &reason)
+       virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
        {
                dccallowlist* dl;
        
@@ -304,8 +300,9 @@ class ModuleDCCAllow : public Module
 
        virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               Expire();
-       
+               if (!IS_LOCAL(user))
+                       return 0;
+
                if (target_type == TYPE_USER)
                {
                        userrec* u = (userrec*)dest;
@@ -316,6 +313,8 @@ class ModuleDCCAllow : public Module
                
                        if ((text.length()) && (text[0] == '\1'))
                        {
+                               Expire();
+
                                // :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :DCC SEND m_dnsbl.cpp 3232235786 52650 9676
                                // :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :VERSION
                                        
@@ -323,24 +322,17 @@ class ModuleDCCAllow : public Module
                                {
                                        u->GetExt("dccallow_list", dl);
                
-                                       if (dl)
+                                       if (dl && dl->size())
                                        {
-                                               if (dl->size())
-                                               {
-                                                       for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
-                                                       {
-                                                               if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
-                                                               {
-                                                                       return 0;
-                                                               }
-                                                       }
-                                               }
+                                               for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
+                                                       if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
+                                                               return 0;
                                        }
                
                                        // tokenize
-                                       stringstream ss(text);
+                                       std::stringstream ss(text);
                                        std::string buf;
-                                       vector<string> tokens;
+                                       std::vector<std::string> tokens;
                
                                        while (ss >> buf)
                                                tokens.push_back(buf);
@@ -355,29 +347,24 @@ class ModuleDCCAllow : public Module
                                                std::string filename = tokens[2];
                                        
                                                if (defaultaction == "allow") 
-                                               {
                                                        return 0;
-                                               }
                                
                                                for (unsigned int i = 0; i < bfl.size(); i++)
                                                {
                                                        if (ServerInstance->MatchText(filename, bfl[i].filemask))
                                                        {
-                                                               if (strcmp(bfl[i].action.c_str(), "allow") == 0)
-                                                               {
+                                                               if (bfl[i].action == "allow")
                                                                        return 0;
-                                                               }
                                                        }
                                                        else
                                                        {
                                                                if (defaultaction == "allow")
-                                                               {
                                                                        return 0;
-                                                               }
                                                        }
                                                        user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick, u->nick, filename.c_str());
                                                        u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick, user->nick, user->ident, user->dhost, filename.c_str());
                                                        u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick);
+                                                       return 1;
                                                }
                                        }
                                        else if ((type == "CHAT") && (blockchat))
@@ -385,8 +372,8 @@ class ModuleDCCAllow : public Module
                                                user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick, u->nick);
                                                u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick, user->nick, user->ident, user->dhost);
                                                u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick);
+                                               return 1;
                                        }
-                                       return 1;
                                }
                        }
                }
@@ -493,29 +480,8 @@ class ModuleDCCAllow : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON,API_VERSION);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
-class ModuleDCCAllowFactory : public ModuleFactory
-{
- public:
-       ModuleDCCAllowFactory()
-       {
-       }
-
-       ~ModuleDCCAllowFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleDCCAllow(Me);
-       }
-
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleDCCAllowFactory;
-}
+MODULE_INIT(ModuleDCCAllow)