X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=b53dcaca345342492ef7565749f7cddb59878cf6;hb=513a6fe20da8b51a939fe517ca712666b32d72ac;hp=7523c1ff833ac1efccaa7545e44791ecfd578870;hpb=19e6882591a46c35a1c2e5b4b37479ff073b5957;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 7523c1ff8..b53dcaca3 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -99,6 +99,7 @@ void User::StartDNSLookup()
 	{
 		bool cached = false;
 		const char* sip = this->GetIPString(false);
+		UserResolver *res_reverse;
 
 		/* Special case for 4in6 (Have i mentioned i HATE 4in6?) */
 		if (!strncmp(sip, "0::ffff:", 8))
@@ -157,16 +158,28 @@ void User::SetMode(unsigned char m, bool value)
 	modes[m-65] = value;
 }
 
-const char* User::FormatModes()
+const char* User::FormatModes(bool showparameters)
 {
 	static char data[MAXBUF];
+	std::string params;
 	int offset = 0;
-	for (int n = 0; n < 64; n++)
+
+	for (unsigned char n = 0; n < 64; n++)
 	{
 		if (modes[n])
-			data[offset++] = n+65;
+		{
+			data[offset++] = n + 65;
+			ModeHandler* mh = ServerInstance->Modes->FindMode(n + 65, MODETYPE_USER);
+			if (showparameters && mh && mh->GetNumParams(true))
+			{
+				std::string p = mh->GetUserParameter(this);
+				if (p.length())
+					params.append(" ").append(p);
+			}
+		}
 	}
 	data[offset] = 0;
+	strlcat(data, params.c_str(), MAXBUF);
 	return data;
 }
 
@@ -200,13 +213,9 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance
 	fd = -1;
 	recvq.clear();
 	sendq.clear();
-	res_forward = res_reverse = NULL;
 	Visibility = NULL;
 	ip = NULL;
 	MyClass = NULL;
-	io = NULL;
-	AllowedUserModes = NULL;
-	AllowedChanModes = NULL;
 	AllowedOperCommands = NULL;
 	chans.clear();
 	invites.clear();
@@ -239,18 +248,6 @@ User::~User()
 		AllowedOperCommands = NULL;
 	}
 
-	if (this->AllowedUserModes)
-	{
-		delete[] AllowedUserModes;
-		AllowedUserModes = NULL;
-	}
-
-	if (this->AllowedChanModes)
-	{
-		delete[] AllowedChanModes;
-		AllowedChanModes = NULL;
-	}
-
 	this->InvalidateCache();
 	this->DecrementModes();
 
@@ -472,8 +469,7 @@ bool User::HasModePermission(unsigned char mode, ModeType type)
 	if (!IS_OPER(this))
 		return false;
 
-	if (!AllowedUserModes || !AllowedChanModes)
-		return false;
+	if (mode < 'A' || mode > ('A' + 64)) return false;
 
 	return ((type == MODETYPE_USER ? AllowedUserModes : AllowedChanModes))[(mode - 'A')];
 	
@@ -697,12 +693,8 @@ void User::FlushWriteBuf()
 
 void User::Oper(const std::string &opertype, const std::string &opername)
 {
-	char* mycmd;
-	char* savept;
-	char* savept2;
-
-	if (user->IsModeSet('o'))
-		user->Deoper();
+	if (this->IsModeSet('o'))
+		this->UnOper();
 
 	this->modes[UM_OPERATOR] = 1;
 	this->WriteServ("MODE %s :+o", this->nick.c_str());
@@ -724,36 +716,27 @@ void User::Oper(const std::string &opertype, const std::string &opername)
 		else
 			AllowedOperCommands = new std::map<std::string, bool>;
 
-		if (!AllowedChanModes)
-			AllowedChanModes = new bool[64];
-
-		if (!AllowedUserModes)
-			AllowedUserModes = new bool[64];
-
-		memset(AllowedUserModes, 0, 64);
-		memset(AllowedChanModes, 0, 64);
+		AllowedUserModes.reset();
+		AllowedChanModes.reset();
+		this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
 
-		char* Classes = strdup(iter_opertype->second);
-		char* myclass = strtok_r(Classes," ",&savept);
-		while (myclass)
+		std::string myclass, mycmd;
+		irc::spacesepstream Classes(iter_opertype->second);
+		while (Classes.GetToken(myclass))
 		{
-			operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass);
+			operclass_t::iterator iter_operclass = ServerInstance->Config->operclass.find(myclass.c_str());
 			if (iter_operclass != ServerInstance->Config->operclass.end())
 			{
-				char* CommandList = strdup(iter_operclass->second.commandlist);
-				mycmd = strtok_r(CommandList," ",&savept2);
-				while (mycmd)
+				irc::spacesepstream CommandList(iter_operclass->second.commandlist);
+				while (CommandList.GetToken(mycmd))
 				{
 					this->AllowedOperCommands->insert(std::make_pair(mycmd, true));
-					mycmd = strtok_r(NULL," ",&savept2);
 				}
-				free(CommandList);
-				this->AllowedUserModes['o' - 'A'] = true; // Call me paranoid if you want.
 				for (unsigned char* c = (unsigned char*)iter_operclass->second.umodelist; *c; ++c)
 				{
 					if (*c == '*')
 					{
-						memset(this->AllowedUserModes, (int)(true), 64);
+						this->AllowedUserModes.set();
 					}
 					else
 					{
@@ -764,7 +747,7 @@ void User::Oper(const std::string &opertype, const std::string &opername)
 				{
 					if (*c == '*')
 					{
-						memset(this->AllowedChanModes, (int)(true), 64);
+						this->AllowedChanModes.set();
 					}
 					else
 					{
@@ -772,9 +755,7 @@ void User::Oper(const std::string &opertype, const std::string &opername)
 					}
 				}
 			}
-			myclass = strtok_r(NULL," ",&savept);
 		}
-		free(Classes);
 	}
 
 	FOREACH_MOD(I_OnPostOper,OnPostOper(this, opertype, opername));
@@ -784,6 +765,13 @@ void User::UnOper()
 {
 	if (IS_OPER(this))
 	{
+		/*
+		 * unset their oper type (what IS_OPER checks).
+		 * note, order is important - this must come before modes as -o attempts
+		 * to call UnOper. -- w00t
+		 */
+		this->oper.clear();
+
 		/* Remove all oper only modes from the user when the deoper - Bug #466*/
 		std::string moderemove("-");
 
@@ -799,9 +787,6 @@ void User::UnOper()
 		parameters.push_back(moderemove);
 
 		ServerInstance->Parser->CallHandler("MODE", parameters, this);
-
-		/* unset their oper type (what IS_OPER checks), and remove +o */
-		this->oper.clear();
 			
 		/* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */
 		ServerInstance->Users->all_opers.remove(this);
@@ -811,17 +796,9 @@ void User::UnOper()
 			delete AllowedOperCommands;
 			AllowedOperCommands = NULL;
 		}
-		if (AllowedUserModes)
-		{
-			delete[] AllowedUserModes;
-			AllowedUserModes = NULL;
-		}
-		if (AllowedChanModes)
-		{
-			delete[] AllowedChanModes;
-			AllowedChanModes = NULL;
-		}
 
+		AllowedUserModes.reset();
+		AllowedChanModes.reset();
 	}
 }
 
@@ -865,10 +842,10 @@ void User::CheckClass()
 	this->nping = ServerInstance->Time() + a->GetPingTime() + ServerInstance->Config->dns_timeout;
 }
 
-bool User::CheckLines()
+bool User::CheckLines(bool doZline)
 {
-	const char* check[] = { "G" , "K", NULL };
-
+	const char* check[] = { "G" , "K", (doZline) ? "Z" : NULL, NULL };
+	
 	if (!this->exempt)
 	{
 		for (int n = 0; check[n]; ++n)
@@ -968,8 +945,8 @@ User* User::UpdateNickHash(const char* New)
 		return NULL; /* doesnt exist */
 
 	User* olduser = oldnick->second;
-	(*(ServerInstance->Users->clientlist))[New] = olduser;
 	ServerInstance->Users->clientlist->erase(oldnick);
+	(*(ServerInstance->Users->clientlist))[New] = olduser;
 	return olduser;
 }
 
@@ -1264,14 +1241,14 @@ void User::Write(std::string text)
 		return;
 	}
 
-	if (this->io)
+	if (this->GetIOHook())
 	{
 		/* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
 		 * implement their own buffering mechanisms
 		 */
 		try
 		{
-			this->io->OnRawSocketWrite(this->fd, text.data(), text.length());
+			this->GetIOHook()->OnRawSocketWrite(this->fd, text.data(), text.length());
 		}
 		catch (CoreException& modexcept)
 		{
@@ -1629,7 +1606,10 @@ bool User::ChangeDisplayedHost(const char* shost)
 		FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,shost));
 	}
 
-	if (this->ServerInstance->Config->CycleHosts)
+	int MOD_RESULT = 0;
+	FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this));
+
+	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
 		this->WriteCommonExcept("QUIT :Changing hosts");
 
 	/* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */
@@ -1637,7 +1617,7 @@ bool User::ChangeDisplayedHost(const char* shost)
 
 	this->InvalidateCache();
 
-	if (this->ServerInstance->Config->CycleHosts)
+	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
 	{
 		for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
 		{
@@ -1656,17 +1636,20 @@ bool User::ChangeDisplayedHost(const char* shost)
 
 bool User::ChangeIdent(const char* newident)
 {
-	if (!this->ident.compare(newident))
+	if (this->ident == newident)
 		return true;
 
-	if (this->ServerInstance->Config->CycleHosts)
+        int MOD_RESULT = 0;
+	FOREACH_RESULT(I_OnHostCycle, OnHostCycle(this));
+
+	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
 		this->WriteCommonExcept("%s","QUIT :Changing ident");
 
 	this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax + 1);
 
 	this->InvalidateCache();
 
-	if (this->ServerInstance->Config->CycleHosts)
+	if (this->ServerInstance->Config->CycleHosts && !MOD_RESULT)
 	{
 		for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
 		{