X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=05bc7fa0d24623c6d0b010e56670fac5d73cf6bf;hb=9fc9227cf51585dd2e44c2fcd0014c8da8f8739f;hp=85aad0c57feb577ea7a6a198a3faa258195445fe;hpb=829b139abdef2e07254f7237e4fbb8481a0b62ca;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index 85aad0c57..05bc7fa0d 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -1,9 +1,110 @@
-#include "inspircd_config.h" 
-#include "channels.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *           	  <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
-#include <stdio.h>
+#include "inspircd_io.h"
+#include "inspircd_util.h"
+#include "inspircd_config.h"
+#include <unistd.h>
+#include <fcntl.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 <errno.h>
+#include <deque>
+#include <errno.h>
+#include <unistd.h>
+#include <sched.h>
+#include "connection.h"
+#include "users.h"
+#include "servers.h"
+#include "ctables.h"
+#include "globals.h"
+#include "modules.h"
+#include "dynamic.h"
+#include "wildcard.h"
+#include "message.h"
+#include "mode.h"
+#include "xline.h"
+#include "inspstring.h"
+
+#ifdef GCC3
+#define nspace __gnu_cxx
+#else
+#define nspace std
+#endif
+
+using namespace std;
+
+extern int MODCOUNT;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
+
+extern int LogLevel;
+extern char ServerName[MAXBUF];
+extern char Network[MAXBUF];
+extern char ServerDesc[MAXBUF];
+extern char AdminName[MAXBUF];
+extern char AdminEmail[MAXBUF];
+extern char AdminNick[MAXBUF];
+extern char diepass[MAXBUF];
+extern char restartpass[MAXBUF];
+extern char motd[MAXBUF];
+extern char rules[MAXBUF];
+extern char list[MAXBUF];
+extern char PrefixQuit[MAXBUF];
+extern char DieValue[MAXBUF];
+
+extern int debugging;
+extern int WHOWAS_STALE;
+extern int WHOWAS_MAX;
+extern int DieDelay;
+extern time_t startup_time;
+extern int NetBufferSize;
+int MaxWhoResults;
+extern time_t nb_start;
+
+extern std::vector<int> fd_reap;
+extern std::vector<std::string> module_names;
+
+extern int boundPortCount;
+extern int portCount;
+extern int UDPportCount;
+extern int ports[MAXSOCKS];
+extern int defaultRoute;
+
+extern std::vector<long> auth_cookies;
+extern std::stringstream config_f;
+
+extern serverrec* me[32];
+
+extern FILE *log_file;
+
+extern time_t TIME;
 
 using namespace std;
 
@@ -28,33 +129,31 @@ void chanrec::SetCustomMode(char mode,bool mode_on)
 		m[1] = '\0';
 		if (!strchr(this->custom_modes,mode))
 		{
-			strncat(custom_modes,m,MAXMODES);
+			strlcat(custom_modes,m,MAXMODES);
 		}
 		log(DEBUG,"Custom mode %c set",mode);
 	}
 	else {
-		char temp[MAXBUF];
-		int count = 0;
-		for (int q = 0; q < strlen(custom_modes); q++) {
-			if (custom_modes[q] != mode) {
-				temp[count++] = mode;
-			}
-		}
-		temp[count] = '\0';
-		strncpy(custom_modes,temp,MAXMODES);
-		log(DEBUG,"Custom mode %c removed",mode);
+
+		std::string a = this->custom_modes;
+		int pos = a.find(mode);
+		a.erase(pos,1);
+		strncpy(this->custom_modes,a.c_str(),MAXMODES);
+
+		log(DEBUG,"Custom mode %c removed: modelist='%s'",mode,this->custom_modes);
 		this->SetCustomModeParam(mode,"",false);
 	}
 }
 
+
 void chanrec::SetCustomModeParam(char mode,char* parameter,bool mode_on)
 {
 
 	log(DEBUG,"SetCustomModeParam called");
 	ModeParameter M;
 	M.mode = mode;
-	strcpy(M.channel,this->name);
-	strcpy(M.parameter,parameter);
+	strlcpy(M.channel,this->name,CHANMAX);
+	strlcpy(M.parameter,parameter,MAXBUF);
 	if (mode_on)
 	{
 		log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);