X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=e7564c3ea6ceddac42aa347dbf7edd47675039fa;hb=3382adb9e9a79748b4db09bb41a296861800fa2d;hp=d50841de7e7e0858d96c73a56556072ca0341ae5;hpb=9bc04a302572eb311a147a32ff1d36f1d91f2d7a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index d50841de7..e7564c3ea 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -32,17 +32,11 @@ using namespace std;
 #include "dynamic.h"
 #include "commands.h"
 #include "wildcard.h"
-#include "message.h"
 #include "mode.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "helperfuncs.h"
-#include "typedefs.h"
 
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
+#include "typedefs.h"
 
 chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
 {
@@ -62,7 +56,7 @@ void chanrec::SetMode(char mode,bool mode_on)
 
 void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
 {
-	log(DEBUG,"SetModeParam called");
+	ServerInstance->Log(DEBUG,"SetModeParam called");
 	
 	CustomModeList::iterator n = custom_mode_params.find(mode);	
 
@@ -71,11 +65,11 @@ void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
 		if (n == custom_mode_params.end())
 		{
 			custom_mode_params[mode] = strdup(parameter);
-			log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
+			ServerInstance->Log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
 		}
 		else
 		{
-			log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second);
+			ServerInstance->Log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second);
 		}
 	}
 	else
@@ -224,11 +218,11 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 	int MOD_RESULT = 0;
 	strlcpy(cname,cn,CHANMAX);
 
-	chanrec* Ptr = FindChan(cname);
+	chanrec* Ptr = Instance->FindChan(cname);
 
 	if (!Ptr)
 	{
-		if (user->fd > -1)
+		if (IS_LOCAL(user))
 		{
 			MOD_RESULT = 0;
 			FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname));
@@ -242,11 +236,11 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 
 		strlcpy(Ptr->name, cname,CHANMAX);
 		Ptr->modes[CM_TOPICLOCK] = Ptr->modes[CM_NOEXTERNAL] = 1;
-		Ptr->created = TIME;
+		Ptr->created = Instance->Time();
 		*Ptr->topic = 0;
 		strlcpy(Ptr->setby, user->nick,NICKMAX-1);
 		Ptr->topicset = 0;
-		log(DEBUG,"chanrec::JoinUser(): created: %s",cname);
+		Instance->Log(DEBUG,"chanrec::JoinUser(): created: %s",cname);
 		/*
 		 * set created to 2 to indicate user
 		 * is the first in the channel
@@ -282,7 +276,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 					{
 						if (!key)
 						{
-							log(DEBUG,"chanrec::JoinUser(): no key given in JOIN");
+							Instance->Log(DEBUG,"chanrec::JoinUser(): no key given in JOIN");
 							user->WriteServ("475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name);
 							return NULL;
 						}
@@ -290,7 +284,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 						{
 							if (strcmp(key,Ptr->key))
 							{
-								log(DEBUG,"chanrec::JoinUser(): bad key given in JOIN");
+								Instance->Log(DEBUG,"chanrec::JoinUser(): bad key given in JOIN");
 								user->WriteServ("475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name);
 								return NULL;
 							}
@@ -356,7 +350,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 		}
 		else
 		{
-			log(DEBUG,"chanrec::JoinUser(): Overridden checks");
+			Instance->Log(DEBUG,"chanrec::JoinUser(): Overridden checks");
 		}
 		created = 1;
 	}
@@ -397,7 +391,7 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 
 	if (created == 2)
 	{
-		log(DEBUG,"BLAMMO, Whacking channel.");
+		Instance->Log(DEBUG,"BLAMMO, Whacking channel.");
 		/* Things went seriously pear shaped, so take this away. bwahaha. */
 		chan_hash::iterator n = Instance->chanlist.find(cname);
 		if (n != Instance->chanlist.end())
@@ -436,6 +430,7 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* u
 		/* first user in is given ops */
 		a->uc_modes = UCMODE_OP;
 		Ptr->AddOppedUser(user);
+		Ptr->SetPrefix(user, '@', OP_VALUE, true);
 	}
 	else
 	{
@@ -449,13 +444,12 @@ chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* u
 	/* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */
 	if (IS_LOCAL(user))
 	{
-		log(DEBUG,"Sent JOIN to client");
 		if (Ptr->topicset)
 		{
 			user->WriteServ("332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
 			user->WriteServ("333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
 		}
-		userlist(user,Ptr);
+		Ptr->UserList(user);
 		user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
 	}
 	FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user,Ptr));
@@ -488,6 +482,7 @@ long chanrec::PartUser(userrec *user, const char* reason)
 			}
 			user->chans[i]->uc_modes = 0;
 			user->chans[i]->channel = NULL;
+			this->RemoveAllPrefixes(user);
 			break;
 		}
 	}
@@ -498,7 +493,7 @@ long chanrec::PartUser(userrec *user, const char* reason)
 		/* kill the record */
 		if (iter != ServerInstance->chanlist.end())
 		{
-			log(DEBUG,"del_channel: destroyed: %s", this->name);
+			ServerInstance->Log(DEBUG,"del_channel: destroyed: %s", this->name);
 			FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
 			ServerInstance->chanlist.erase(iter);
 		}
@@ -534,6 +529,7 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven
 			this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason);
 			user->chans[i]->uc_modes = 0;
 			user->chans[i]->channel = NULL;
+			this->RemoveAllPrefixes(user);
 			break;
 		}
 	}
@@ -565,14 +561,14 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
 			src->WriteServ("441 %s %s %s :They are not on that channel",src->nick, user->nick, this->name);
 			return this->GetUserCounter();
 		}
-		if ((is_uline(user->server)) && (!is_uline(src->server)))
+		if ((ServerInstance->ULine(user->server)) && (!ServerInstance->ULine(src->server)))
 		{
 			src->WriteServ("482 %s %s :Only a u-line may kick a u-line from a channel.",src->nick, this->name);
 			return this->GetUserCounter();
 		}
 		int MOD_RESULT = 0;
 
-		if (!is_uline(src->server))
+		if (!ServerInstance->ULine(src->server))
 		{
 			MOD_RESULT = 0;
 			FOREACH_RESULT(I_OnUserPreKick,OnUserPreKick(src,user,this,reason));
@@ -583,13 +579,13 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
 		if (MOD_RESULT != -1)
 		{
 			FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,this,AC_KICK));
-			if ((MOD_RESULT == ACR_DENY) && (!is_uline(src->server)))
+			if ((MOD_RESULT == ACR_DENY) && (!ServerInstance->ULine(src->server)))
 				return this->GetUserCounter();
 	
-			if ((MOD_RESULT == ACR_DEFAULT) || (!is_uline(src->server)))
+			if ((MOD_RESULT == ACR_DEFAULT) || (!ServerInstance->ULine(src->server)))
 			{
-				int them = cstatus(src, this);
-				int us = cstatus(user, this);
+				int them = this->GetStatus(src);
+				int us = this->GetStatus(user);
    			 	if ((them < STATUS_HOP) || (them < us))
 				{
 					if (them == STATUS_HOP)
@@ -616,6 +612,7 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
 			this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
 			(*i)->uc_modes = 0;
 			(*i)->channel = NULL;
+			this->RemoveAllPrefixes(user);
 			break;
 		}
 	}
@@ -661,7 +658,7 @@ void chanrec::WriteChannel(userrec* user, const std::string &text)
 
 	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 	{
-		if (i->second->fd != FD_MAGIC_NUMBER)
+		if (IS_LOCAL(i->second))
 			user->WriteTo(i->second,text);
 	}
 }
@@ -739,3 +736,289 @@ void chanrec::WriteAllExceptSender(userrec* user, char status, const std::string
 	}
 }
 
+/*
+ * return a count of the users on a specific channel accounting for
+ * invisible users who won't increase the count. e.g. for /LIST
+ */
+int chanrec::CountInvisible()
+{
+	int count = 0;
+	CUList *ulist= this->GetUsers();
+	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+	{
+		if (!(i->second->modes[UM_INVISIBLE]))
+			count++;
+	}
+
+	return count;
+}
+
+char* chanrec::ChanModes(bool showkey)
+{
+	static char scratch[MAXBUF];
+	static char sparam[MAXBUF];
+	char* offset = scratch;
+	std::string extparam = "";
+
+	*scratch = '\0';
+	*sparam = '\0';
+
+	/* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */
+	for(int n = 0; n < 64; n++)
+	{
+		if(this->modes[n])
+		{
+			*offset++ = n + 65;
+			extparam = "";
+			switch (n)
+			{
+				case CM_KEY:
+					extparam = (showkey ? this->key : "<key>");
+				break;
+				case CM_LIMIT:
+					extparam = ConvToStr(this->limit);
+				break;
+				case CM_NOEXTERNAL:
+				case CM_TOPICLOCK:
+				case CM_INVITEONLY:
+				case CM_MODERATED:
+				case CM_SECRET:
+				case CM_PRIVATE:
+					/* We know these have no parameters */
+				break;
+				default:
+					extparam = this->GetModeParameter(n + 65);
+				break;
+			}
+			if (extparam != "")
+			{
+				charlcat(sparam,' ',MAXBUF);
+				strlcat(sparam,extparam.c_str(),MAXBUF);
+			}
+		}
+	}
+
+	/* Null terminate scratch */
+	*offset = '\0';
+	strlcat(scratch,sparam,MAXBUF);
+	return scratch;
+}
+
+/* compile a userlist of a channel into a string, each nick seperated by
+ * spaces and op, voice etc status shown as @ and +, and send it to 'user'
+ */
+void chanrec::UserList(userrec *user)
+{
+	char list[MAXBUF];
+	size_t dlen, curlen;
+
+	dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
+
+	int numusers = 0;
+	char* ptr = list + dlen;
+
+	CUList *ulist= this->GetUsers();
+
+	/* Improvement by Brain - this doesnt change in value, so why was it inside
+	 * the loop?
+	 */
+	bool has_user = this->HasUser(user);
+
+	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+	{
+		if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
+		{
+			/*
+			 * user is +i, and source not on the channel, does not show
+			 * nick in NAMES list
+			 */
+			continue;
+		}
+
+		size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->second), i->second->nick);
+
+		curlen += ptrlen;
+		ptr += ptrlen;
+
+		numusers++;
+
+		if (curlen > (480-NICKMAX))
+		{
+			/* list overflowed into multiple numerics */
+			user->WriteServ(list);
+
+			/* reset our lengths */
+			dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
+			ptr = list + dlen;
+
+			ptrlen = 0;
+			numusers = 0;
+		}
+	}
+
+	/* if whats left in the list isnt empty, send it */
+	if (numusers)
+	{
+		user->WriteServ(list);
+	}
+}
+
+long chanrec::GetMaxBans()
+{
+	std::string x;
+	for (std::map<std::string,int>::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++)
+	{
+		x = n->first;
+		if (match(this->name,x.c_str()))
+		{
+			return n->second;
+		}
+	}
+	return 64;
+}
+
+
+/* returns the status character for a given user on a channel, e.g. @ for op,
+ * % for halfop etc. If the user has several modes set, the highest mode
+ * the user has must be returned.
+ */
+const char* chanrec::GetPrefixChar(userrec *user)
+{
+	static char px[2];
+	unsigned int mx = 0;
+
+	*px = 0;
+	*(px+1) = 0;
+
+	prefixlist::iterator n = prefixes.find(user);
+	if (n != prefixes.end())
+	{
+		for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
+		{
+			if (x->second > mx)
+			{
+				*px = x->first;
+				mx  = x->second;
+			}
+		}
+	}
+
+	return px;
+}
+
+const char* chanrec::GetAllPrefixChars(userrec* user)
+{
+	static char prefix[MAXBUF];
+	int ctr = 0;
+	*prefix = 0;
+
+	prefixlist::iterator n = prefixes.find(user);
+	if (n != prefixes.end())
+	{
+		for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
+		{
+			prefix[ctr++] = x->first;
+		}
+	}
+
+	prefix[ctr] = 0;
+
+	return prefix;
+}
+
+unsigned int chanrec::GetPrefixValue(userrec* user)
+{
+	unsigned int mx = 0;
+
+	prefixlist::iterator n = prefixes.find(user);
+	if (n != prefixes.end())
+	{
+		for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
+		{
+			if (x->second > mx)
+				mx  = x->second;
+		}
+	}
+
+	return mx;
+}
+
+
+int chanrec::GetStatusFlags(userrec *user)
+{
+	for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
+	{
+		if ((*i)->channel == this)
+		{
+			return (*i)->uc_modes;
+		}
+	}
+	return 0;
+}
+
+
+int chanrec::GetStatus(userrec *user)
+{
+	if (ServerInstance->ULine(user->server))
+		return STATUS_OP;
+
+	for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
+	{
+		if ((*i)->channel == this)
+		{
+			if (((*i)->uc_modes & UCMODE_OP) > 0)
+			{
+				return STATUS_OP;
+			}
+			if (((*i)->uc_modes & UCMODE_HOP) > 0)
+			{
+				return STATUS_HOP;
+			}
+			if (((*i)->uc_modes & UCMODE_VOICE) > 0)
+			{
+				return STATUS_VOICE;
+			}
+			return STATUS_NORMAL;
+		}
+	}
+	return STATUS_NORMAL;
+}
+
+void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, bool adding)
+{
+	prefixlist::iterator n = prefixes.find(user);
+	prefixtype pfx = std::make_pair(prefix,prefix_value);
+	if (adding)
+	{
+		if (n != prefixes.end())
+		{
+			if (std::find(n->second.begin(), n->second.end(), pfx) == n->second.end())
+			{
+				n->second.push_back(pfx);
+			}
+		}
+		else
+		{
+			pfxcontainer one;
+			one.push_back(pfx);
+			prefixes.insert(std::make_pair<userrec*,pfxcontainer>(user, one));
+		}
+	}
+	else
+	{
+		if (n != prefixes.end())
+		{
+			pfxcontainer::iterator x = std::find(n->second.begin(), n->second.end(), pfx);
+			if (x != n->second.end())
+				n->second.erase(x);
+		}
+	}
+}
+
+void chanrec::RemoveAllPrefixes(userrec* user)
+{
+	prefixlist::iterator n = prefixes.find(user);
+	if (n != prefixes.end())
+		prefixes.erase(n);
+}
+