X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=097f8c8d6595d77f9ea66eae6e547504c625c9c1;hb=a1a7b96a8c994eb09a3d071f3daf28252b8c188b;hp=f757fb80973d9cb8121bd8d16dcd2c6fd6ba0c96;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index f757fb809..097f8c8d6 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -2,27 +2,16 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <vector>
-#include "users.h"
-#include "channels.h"
 #include "inspircd.h"
-#include "modules.h"
-#include "wildcard.h"
 
 /* $ModDesc: Sets (and unsets) modes on users when they connect */
 
@@ -34,105 +23,81 @@ class ModuleModesOnConnect : public Module
 
  public:
 	ModuleModesOnConnect(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
-		
+
 		Conf = new ConfigReader(ServerInstance);
+		Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnPostConnect] = List[I_OnRehash] = 1;
-	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(User* user, const std::string &parameter)
 	{
-		DELETE(Conf);
+		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
-	
+
 	virtual ~ModuleModesOnConnect()
 	{
-		DELETE(Conf);
+		delete Conf;
 	}
-	
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
-	
-	virtual void OnPostConnect(userrec* user)
+
+	virtual void OnPostConnect(User* user)
 	{
 		if (!IS_LOCAL(user))
 			return;
 
-		ServerInstance->Log(DEBUG,"Post connect for mode setting");
+		// Backup and zero out the disabled usermodes, so that we can override them here.
+		char save[64];
+		memcpy(save, ServerInstance->Config->DisabledUModes,
+				sizeof(ServerInstance->Config->DisabledUModes));
+		memset(ServerInstance->Config->DisabledUModes, 0, 64);
+
 		for (int j = 0; j < Conf->Enumerate("connect"); j++)
 		{
 			std::string hostn = Conf->ReadValue("connect","allow",j);
-			if ((match(user->GetIPString(),hostn.c_str(),true)) || (match(user->host,hostn.c_str())))
+			/* XXX: Fixme: does not respect port, limit, etc */
+			if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn)) || (InspIRCd::Match(user->host,hostn)))
 			{
-				ServerInstance->Log(DEBUG,"Found matching connect block '%s'",hostn.c_str());
 				std::string ThisModes = Conf->ReadValue("connect","modes",j);
-				if (ThisModes != "")
+				if (!ThisModes.empty())
 				{
 					std::string buf;
-					stringstream ss(ThisModes);
+					std::stringstream ss(ThisModes);
 
-					vector<string> tokens;
+					std::vector<std::string> tokens;
 
 					// split ThisUserModes into modes and mode params
 					while (ss >> buf)
 						tokens.push_back(buf);
 
-					int size = tokens.size() + 1;
-					const char* modes[size];
-					modes[0] = user->nick;
-					modes[1] = tokens[0].c_str();
+					std::vector<std::string> modes;
+					modes.push_back(user->nick);
+					modes.push_back(tokens[0]);
 
 					if (tokens.size() > 1)
 					{
 						// process mode params
-						int i = 2;
 						for (unsigned int k = 1; k < tokens.size(); k++)
 						{
-							modes[i] = tokens[k].c_str();
-							i++;
+							modes.push_back(tokens[k]);
 						}
 					}
 
-					ServerInstance->Log(DEBUG,"Call mode handler to set modes");
-					ServerInstance->Parser->CallHandler("MODE", modes, size, user);
+					ServerInstance->Parser->CallHandler("MODE", modes, user);
 				}
 				break;
 			}
 		}
-	}
-};
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleModesOnConnectFactory : public ModuleFactory
-{
- public:
-	ModuleModesOnConnectFactory()
-	{
-	}
-	
-	~ModuleModesOnConnectFactory()
-	{
+		memcpy(ServerInstance->Config->DisabledUModes, save, 64);
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleModesOnConnect(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleModesOnConnectFactory;
-}
-
+MODULE_INIT(ModuleModesOnConnect)