X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands.cpp;h=581dde34be8df465adf2b1aa3a30481a83eb2c99;hb=dc7927e17cffb2ee3c50ef9f037ed873d378f679;hp=e5d58bfbaac580644cecd7f3299b50c6a8b4e679;hpb=024c564e53b847e88b40258b2337bf7c3bf9a56c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands.cpp b/src/commands.cpp
index e5d58bfba..581dde34b 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -14,119 +14,15 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <unistd.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <cstdio>
-#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 <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
-#ifndef RUSAGE_SELF
-#define   RUSAGE_SELF     0
-#define   RUSAGE_CHILDREN     -1
-#endif
+#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"
 
-extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
-
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-
-const long duration_m = 60;
-const long duration_h = duration_m * 60;
-const long duration_d = duration_h * 24;
-const long duration_w = duration_d * 7;
-const long duration_y = duration_w * 52;
-
-extern user_hash clientlist;
-extern chan_hash chanlist;
-
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-
-// This table references users by file descriptor.
-// its an array to make it VERY fast, as all lookups are referenced
-// by an integer, meaning there is no need for a scan/search operation.
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
-
-
-void split_chlist(userrec* user, userrec* dest, const std::string &cl)
-{
-	std::string line;
-	std::ostringstream prefix;
-	std::string::size_type start, pos, length;
-	
-	prefix << ":" << Config->ServerName << " 319 " << user->nick << " " << dest->nick << " :";
-	line = prefix.str();
-	
-	for (start = 0; pos = cl.find(' ', start); start = pos+1)
-	{
-		length = (pos == std::string::npos) ? cl.length() : pos;
-		
-		if (line.length() + length - start > 510)
-		{
-			Write_NoFormat(user->fd, line.c_str());
-			line = prefix.str();
-		}
-		
-		if(pos == std::string::npos)
-		{
-			line += cl.substr(start, length - start);
-			break;
-		}
-		else
-		{
-			line += cl.substr(start, length - start + 1);
-		}
-	}
-	
-	if (line.length())
-	{
-		Write_NoFormat(user->fd, line.c_str());
-	}
-}
-
-/* XXX - these really belong in helperfuncs perhaps -- w00t */
-bool is_uline(const char* server)
+bool InspIRCd::ULine(const char* server)
 {
 	if (!server)
 		return false;
@@ -136,20 +32,20 @@ bool is_uline(const char* server)
 	return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
 }
 
-int operstrcmp(char* data,char* input)
+int InspIRCd::OperPassCompare(const char* data,const char* input)
 {
 	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnOperCompare,OnOperCompare(data,input))
-	log(DEBUG,"operstrcmp: %d",MOD_RESULT);
+	FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data,input))
+	Log(DEBUG,"OperPassCompare: %d",MOD_RESULT);
 	if (MOD_RESULT == 1)
 		return 0;
 	if (MOD_RESULT == -1)
 		return 1;
-	log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input));
+	Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input));
 	return strcmp(data,input);
 }
 
-long duration(const char* str)
+long InspIRCd::Duration(const char* str)
 {
 	char n_field[MAXBUF];
 	long total = 0;
@@ -159,7 +55,7 @@ long duration(const char* str)
 	{
 		std::string n = str;
 		n += 's';
-		return duration(n.c_str());
+		return Duration(n.c_str());
 	}
 	
 	for (char* i = (char*)str; *i; i++)
@@ -210,7 +106,7 @@ long duration(const char* str)
 
 /* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
 
-bool host_matches_everyone(const std::string &mask, userrec* user)
+bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
 {
 	char buffer[MAXBUF];
 	char itrigger[MAXBUF];
@@ -239,7 +135,7 @@ bool host_matches_everyone(const std::string &mask, userrec* user)
 	return false;
 }
 
-bool ip_matches_everyone(const std::string &ip, userrec* user)
+bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
 {
 	char itrigger[MAXBUF];
 	long matches = 0;
@@ -252,7 +148,7 @@ bool ip_matches_everyone(const std::string &ip, userrec* user)
 	
 	for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
 	{
-		if (match((char*)inet_ntoa(u->second->ip4),ip.c_str()))
+		if (match(u->second->GetIPString(),ip.c_str(),true))
 			matches++;
 	}
 	
@@ -265,7 +161,7 @@ bool ip_matches_everyone(const std::string &ip, userrec* user)
 	return false;
 }
 
-bool nick_matches_everyone(const std::string &nick, userrec* user)
+bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
 {
 	char itrigger[MAXBUF];
 	long matches = 0;