X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_user.cpp;h=b889455fde541f46cabc76fe164a235ecc0ae057;hb=b844d1cbbe79585facc69b9247baa8427cff0b62;hp=4e09d60ee158b73fc00ccfdb4382a7ab3dbb955e;hpb=293df6a8b55e89c127e60e92711ef0ef1027bff8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index 4e09d60ee..b889455fd 100644
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -2,98 +2,64 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
- *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_user.h"
+#include "commands/cmd_user.h"
+
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
 
-void cmd_user::Handle (char **parameters, int pcnt, userrec *user)
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_user(Instance);
+}
+
+CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	log(DEBUG,"Handling USER from cmd_user class!");
-	if (user->registered < 3)
+	if (user->registered < REG_NICKUSER)
 	{
-		if (isident(parameters[0]) == 0) {
+		if (!ServerInstance->IsIdent(parameters[0])) {
 			// This kinda Sucks, According to the RFC thou, its either this,
 			// or "You have already registered" :p -- Craig
-			WriteServ(user->fd,"461 %s USER :Not enough parameters",user->nick);
+			user->WriteServ("461 %s USER :Not enough parameters",user->nick);
+			return CMD_FAILURE;
 		}
 		else {
 			/* We're not checking ident, but I'm not sure I like the idea of '~' prefixing.. */
-			/* XXX - Should this IDENTMAX + 1 be IDENTMAX - 1? Ok, users.h has it defined as
-			 * char ident[IDENTMAX+2]; - WTF?
+			/* XXX - The ident field is IDENTMAX+2 in size to account for +1 for the optional
+			 * ~ character, and +1 for null termination, therefore we can safely use up to
+			 * IDENTMAX here.
 			 */
-			snprintf(user->ident, IDENTMAX+1, "~%s", parameters[0]);
+			strlcpy(user->ident, parameters[0], IDENTMAX);
 			strlcpy(user->fullname,parameters[3],MAXGECOS);
-			user->registered = (user->registered | 1);
+			user->registered = (user->registered | REG_USER);
 		}
 	}
 	else
 	{
-		WriteServ(user->fd,"462 %s :You may not reregister",user->nick);
-		return;
+		user->WriteServ("462 %s :You may not reregister",user->nick);
+		return CMD_FAILURE;
 	}
 	/* parameters 2 and 3 are local and remote hosts, ignored when sent by client connection */
-	if (user->registered == 3)
+	if (user->registered == REG_NICKUSER)
 	{
+		int MOD_RESULT = 0;
 		/* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-		FOREACH_MOD OnUserRegister(user);
-		ConnectUser(user);
+		if (ServerInstance->next_call > ServerInstance->Time() + ServerInstance->Config->dns_timeout)
+			ServerInstance->next_call = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
+		FOREACH_RESULT(I_OnUserRegister,OnUserRegister(user));
+		if (MOD_RESULT > 0)
+			return CMD_FAILURE;
+
 	}
-}
-	
 
+	return CMD_SUCCESS;
+}