X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=f6ef92af336e40fcca24c991fecd0dfb40119275;hb=08c199a4fe99eff5e3ec756acda18d4a292104fd;hp=d7671de3c8a5a6496cdb26ec1aaebb145a6ba908;hpb=2620d1258c6a2c249b9503a7c4a764e26a2da0f3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index d7671de3c..f6ef92af3 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -88,19 +88,19 @@ void User::StartDNSLookup()
 	try
 	{
 		bool cached;
-		const char* ip = this->GetIPString();
+		const char* sip = this->GetIPString();
 
 		/* Special case for 4in6 (Have i mentioned i HATE 4in6?) */
-		if (!strncmp(ip, "0::ffff:", 8))
-			res_reverse = new UserResolver(this->ServerInstance, this, ip + 8, DNS_QUERY_PTR4, cached);
+		if (!strncmp(sip, "0::ffff:", 8))
+			res_reverse = new UserResolver(this->ServerInstance, this, sip + 8, DNS_QUERY_PTR4, cached);
 		else
-			res_reverse = new UserResolver(this->ServerInstance, this, ip, this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6, cached);
+			res_reverse = new UserResolver(this->ServerInstance, this, sip, this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6, cached);
 
 		this->ServerInstance->AddResolver(res_reverse, cached);
 	}
 	catch (CoreException& e)
 	{
-		ServerInstance->Log(DEBUG,"Error in resolver: %s",e.GetReason());
+		ServerInstance->Logs->Log("USERS", DEBUG,"Error in resolver: %s",e.GetReason());
 	}
 }
 
@@ -156,16 +156,16 @@ const char* User::FormatModes()
 
 void User::DecrementModes()
 {
-	ServerInstance->Log(DEBUG,"DecrementModes()");
+	ServerInstance->Logs->Log("USERS", DEBUG, "DecrementModes()");
 	for (unsigned char n = 'A'; n <= 'z'; n++)
 	{
 		if (modes[n-65])
 		{
-			ServerInstance->Log(DEBUG,"DecrementModes() found mode %c", n);
+			ServerInstance->Logs->Log("USERS", DEBUG,"DecrementModes() found mode %c", n);
 			ModeHandler* mh = ServerInstance->Modes->FindMode(n, MODETYPE_USER);
 			if (mh)
 			{
-				ServerInstance->Log(DEBUG,"Found handler %c and call ChangeCount", n);
+				ServerInstance->Logs->Log("USERS", DEBUG,"Found handler %c and call ChangeCount", n);
 				mh->ChangeCount(-1);
 			}
 		}
@@ -181,7 +181,7 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance
 	Penalty = 0;
 	lines_in = lastping = signon = idle_lastmsg = nping = registered = 0;
 	ChannelCount = timeout = bytes_in = bytes_out = cmds_in = cmds_out = 0;
-	OverPenalty = ExemptFromPenalty = muted = exempt = haspassed = dns_done = false;
+	quietquit = OverPenalty = ExemptFromPenalty = quitting = exempt = haspassed = dns_done = false;
 	fd = -1;
 	recvq.clear();
 	sendq.clear();
@@ -196,18 +196,18 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance
 	memset(modes,0,sizeof(modes));
 	memset(snomasks,0,sizeof(snomasks));
 	/* Invalidate cache */
-	operquit = cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
+	cached_fullhost = cached_hostip = cached_makehost = cached_fullrealhost = NULL;
 
 	if (uid.empty())
 		strlcpy(uuid, Instance->GetUID().c_str(), UUID_LENGTH);
 	else
 		strlcpy(uuid, uid.c_str(), UUID_LENGTH);
 
-	ServerInstance->Log(DEBUG,"New UUID for user: %s (%s)", uuid, uid.empty() ? "allocated new" : "used remote");
+	ServerInstance->Logs->Log("USERS", DEBUG,"New UUID for user: %s (%s)", uuid, uid.empty() ? "allocated new" : "used remote");
 
-	user_hash::iterator finduuid = Instance->uuidlist->find(uuid);
-	if (finduuid == Instance->uuidlist->end())
-		(*Instance->uuidlist)[uuid] = this;
+	user_hash::iterator finduuid = Instance->Users->uuidlist->find(uuid);
+	if (finduuid == Instance->Users->uuidlist->end())
+		(*Instance->Users->uuidlist)[uuid] = this;
 	else
 		throw CoreException("Duplicate UUID "+std::string(uuid)+" in User constructor");
 }
@@ -218,7 +218,7 @@ User::~User()
 	if (this->MyClass)
 	{
 		this->MyClass->RefCount--;
-		ServerInstance->Log(DEBUG, "User destructor -- connect refcount now: %u", this->MyClass->RefCount);
+		ServerInstance->Logs->Log("USERS", DEBUG, "User destructor -- connect refcount now: %u", this->MyClass->RefCount);
 	}
 	if (this->AllowedOperCommands)
 	{
@@ -228,8 +228,7 @@ User::~User()
 
 	this->InvalidateCache();
 	this->DecrementModes();
-	if (operquit)
-		free(operquit);
+
 	if (ip)
 	{
 		ServerInstance->Users->RemoveCloneCounts(this);
@@ -246,7 +245,7 @@ User::~User()
 #endif
 	}
 
-	ServerInstance->uuidlist->erase(uuid);
+	ServerInstance->Users->uuidlist->erase(uuid);
 }
 
 char* User::MakeHost()
@@ -368,10 +367,20 @@ char* User::GetFullRealHost()
 
 bool User::IsInvited(const irc::string &channel)
 {
-	for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
+	time_t now = time(NULL);
+	InvitedList::iterator safei;
+	for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
 	{
-		if (channel == *i)
+		if (channel == i->first)
 		{
+			if (i->second != 0 && now > i->second)
+			{
+				/* Expired invite, remove it. */
+				safei = i;
+				--i;
+				invites.erase(safei);
+				continue;
+			}
 			return true;
 		}
 	}
@@ -380,19 +389,44 @@ bool User::IsInvited(const irc::string &channel)
 
 InvitedList* User::GetInviteList()
 {
+	time_t now = time(NULL);
+	/* Weed out expired invites here. */
+	InvitedList::iterator safei;
+	for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
+	{
+		if (i->second != 0 && now > i->second)
+		{
+			/* Expired invite, remove it. */
+			safei = i;
+			--i;
+			invites.erase(safei);
+		}
+	}
 	return &invites;
 }
 
-void User::InviteTo(const irc::string &channel)
+void User::InviteTo(const irc::string &channel, time_t invtimeout)
 {
-	invites.push_back(channel);
+	time_t now = time(NULL);
+	if (invtimeout != 0 && now > invtimeout) return; /* Don't add invites that are expired from the get-go. */
+	for (InvitedList::iterator i = invites.begin(); i != invites.end(); ++i)
+	{
+		if (channel == i->first)
+		{
+			if (i->second != 0 && invtimeout > i->second)
+			{
+				i->second = invtimeout;
+			}
+		}
+	}
+	invites.push_back(std::make_pair(channel, invtimeout));
 }
 
 void User::RemoveInvite(const irc::string &channel)
 {
 	for (InvitedList::iterator i = invites.begin(); i != invites.end(); i++)
 	{
-		if (channel == *i)
+		if (channel == i->first)
 		{
 			invites.erase(i);
 			return;
@@ -453,7 +487,7 @@ bool User::AddBuffer(std::string a)
 		if (this->MyClass && (recvq.length() > this->MyClass->GetRecvqMax()))
 		{
 			this->SetWriteError("RecvQ exceeded");
-			ServerInstance->WriteOpers("*** User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->MyClass->GetRecvqMax());
+			ServerInstance->SNO->WriteToSnoMask('A', "User %s RecvQ of %d exceeds connect class maximum of %d",this->nick,recvq.length(),this->MyClass->GetRecvqMax());
 			return false;
 		}
 
@@ -462,7 +496,7 @@ bool User::AddBuffer(std::string a)
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in User::AddBuffer()");
+		ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::AddBuffer()");
 		return false;
 	}
 }
@@ -512,7 +546,7 @@ std::string User::GetBuffer()
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in User::GetBuffer()");
+		ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::GetBuffer()");
 		return "";
 	}
 }
@@ -525,27 +559,19 @@ void User::AddWriteBuf(const std::string &data)
 	if (this->MyClass && (sendq.length() + data.length() > this->MyClass->GetSendqMax()))
 	{
 		/*
-		 * Fix by brain - Set the error text BEFORE calling writeopers, because
+		 * Fix by brain - Set the error text BEFORE calling, because
 		 * if we dont it'll recursively  call here over and over again trying
 		 * to repeatedly add the text to the sendq!
 		 */
 		this->SetWriteError("SendQ exceeded");
-		ServerInstance->WriteOpers("*** User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->MyClass->GetSendqMax());
+		ServerInstance->SNO->WriteToSnoMask('A', "User %s SendQ of %d exceeds connect class maximum of %d",this->nick,sendq.length() + data.length(),this->MyClass->GetSendqMax());
 		return;
 	}
 
-	try
-	{
-		if (data.length() > MAXBUF - 2) /* MAXBUF has a value of 514, to account for line terminators */
-			sendq.append(data.substr(0,MAXBUF - 4)).append("\r\n"); /* MAXBUF-4 = 510 */
-		else
-			sendq.append(data);
-	}
-	catch (...)
-	{
-		this->SetWriteError("SendQ exceeded");
-		ServerInstance->WriteOpers("*** User %s SendQ got an exception",this->nick);
-	}
+	if (data.length() > MAXBUF - 2) /* MAXBUF has a value of 514, to account for line terminators */
+		sendq.append(data.substr(0,MAXBUF - 4)).append("\r\n"); /* MAXBUF-4 = 510 */
+	else
+		sendq.append(data);
 }
 
 // send AS MUCH OF THE USERS SENDQ as we are able to (might not be all of it)
@@ -595,7 +621,7 @@ void User::FlushWriteBuf()
 
 	catch (...)
 	{
-		ServerInstance->Log(DEBUG,"Exception in User::FlushWriteBuf()");
+		ServerInstance->Logs->Log("USERS", DEBUG,"Exception in User::FlushWriteBuf()");
 	}
 
 	if (this->sendq.empty())
@@ -606,17 +632,9 @@ void User::FlushWriteBuf()
 
 void User::SetWriteError(const std::string &error)
 {
-	try
-	{
-		// don't try to set the error twice, its already set take the first string.
-		if (this->WriteError.empty())
-			this->WriteError = error;
-	}
-
-	catch (...)
-	{
-		ServerInstance->Log(DEBUG,"Exception in User::SetWriteError()");
-	}
+	// don't try to set the error twice, its already set take the first string.
+	if (this->WriteError.empty())
+		this->WriteError = error;
 }
 
 const char* User::GetWriteError()
@@ -635,9 +653,9 @@ void User::Oper(const std::string &opertype, const std::string &opername)
 		this->modes[UM_OPERATOR] = 1;
 		this->WriteServ("MODE %s :+o", this->nick);
 		FOREACH_MOD(I_OnOper, OnOper(this, opertype));
-		ServerInstance->Log(DEFAULT,"OPER: %s!%s@%s opered as type: %s", this->nick, this->ident, this->host, opertype.c_str());
+		ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick, this->ident, this->host, opertype.c_str());
 		strlcpy(this->oper, opertype.c_str(), NICKMAX - 1);
-		ServerInstance->all_opers.push_back(this);
+		ServerInstance->Users->all_opers.push_back(this);
 
 		opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper);
 		if (iter_opertype != ServerInstance->Config->opertypes.end())
@@ -680,37 +698,36 @@ void User::Oper(const std::string &opertype, const std::string &opername)
 
 void User::UnOper()
 {
-	try
+	if (IS_OPER(this))
 	{
-		if (IS_OPER(this))
-		{
-			// unset their oper type (what IS_OPER checks), and remove +o
-			*this->oper = 0;
-			this->modes[UM_OPERATOR] = 0;
+		// unset their oper type (what IS_OPER checks), and remove +o
+		*this->oper = 0;
+		this->modes[UM_OPERATOR] = 0;
 			
-			// remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404
-			ServerInstance->all_opers.remove(this);
+		// remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404
+		ServerInstance->Users->all_opers.remove(this);
 
-			if (AllowedOperCommands)
-			{
-				delete AllowedOperCommands;
-				AllowedOperCommands = NULL;
-			}
+		if (AllowedOperCommands)
+		{
+			delete AllowedOperCommands;
+			AllowedOperCommands = NULL;
 		}
 	}
-
-	catch (...)
-	{
-		ServerInstance->Log(DEBUG,"Exception in User::UnOper()");
-	}
 }
 
 void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreason, const char* operreason)
 {
-	Instance->Log(DEBUG,"QuitUser: %s '%s'", user->nick, quitreason.c_str());
+	Instance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", user->nick, quitreason.c_str());
 	user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, *operreason ? operreason : quitreason.c_str());
-	user->muted = true;
-	Instance->GlobalCulls.AddItem(user, quitreason.c_str(), operreason);
+	user->quietquit = false;
+	user->quitmsg = quitreason;
+
+	if (!*operreason)
+		user->operquitmsg = quitreason;
+	else
+		user->operquitmsg = operreason;
+
+	Instance->GlobalCulls.AddItem(user);
 }
 
 /* adds or updates an entry in the whowas list */
@@ -740,13 +757,13 @@ void User::CheckClass()
 	else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
 	{
 		User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (local)");
-		ServerInstance->WriteOpers("*** WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
+		ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
 		return;
 	}
 	else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal()))
 	{
 		User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (global)");
-		ServerInstance->WriteOpers("*** WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
+		ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
 		return;
 	}
 
@@ -783,7 +800,6 @@ void User::FullConnect()
 
 		if (r)
 		{
-			this->muted = true;
 			r->Apply(this);
 			return;
 		}
@@ -792,7 +808,6 @@ void User::FullConnect()
 
 		if (n)
 		{
-			this->muted = true;
 			n->Apply(this);
 			return;
 		}
@@ -812,8 +827,8 @@ void User::FullConnect()
 	this->ShowMOTD();
 
 	/* Now registered */
-	if (ServerInstance->unregistered_count)
-		ServerInstance->unregistered_count--;
+	if (ServerInstance->Users->unregistered_count)
+		ServerInstance->Users->unregistered_count--;
 
 	/* Trigger LUSERS output, give modules a chance too */
 	int MOD_RESULT = 0;
@@ -832,8 +847,7 @@ void User::FullConnect()
 	FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
 
 	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString(), this->fullname);
-
-	ServerInstance->Log(DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString());
+	ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString());
 	ServerInstance->BanCache->AddHit(this->GetIPString(), "", "");
 }
 
@@ -843,28 +857,19 @@ void User::FullConnect()
  */
 User* User::UpdateNickHash(const char* New)
 {
-	try
-	{
-		//user_hash::iterator newnick;
-		user_hash::iterator oldnick = ServerInstance->clientlist->find(this->nick);
+	//user_hash::iterator newnick;
+	user_hash::iterator oldnick = ServerInstance->Users->clientlist->find(this->nick);
 
-		if (!strcasecmp(this->nick,New))
-			return oldnick->second;
+	if (!strcasecmp(this->nick,New))
+		return oldnick->second;
 
-		if (oldnick == ServerInstance->clientlist->end())
-			return NULL; /* doesnt exist */
+	if (oldnick == ServerInstance->Users->clientlist->end())
+		return NULL; /* doesnt exist */
 
-		User* olduser = oldnick->second;
-		(*(ServerInstance->clientlist))[New] = olduser;
-		ServerInstance->clientlist->erase(oldnick);
-		return olduser;
-	}
-
-	catch (...)
-	{
-		ServerInstance->Log(DEBUG,"Exception in User::UpdateNickHash()");
-		return NULL;
-	}
+	User* olduser = oldnick->second;
+	(*(ServerInstance->Users->clientlist))[New] = olduser;
+	ServerInstance->Users->clientlist->erase(oldnick);
+	return olduser;
 }
 
 void User::InvalidateCache()
@@ -883,7 +888,13 @@ void User::InvalidateCache()
 
 bool User::ForceNickChange(const char* newnick)
 {
-	try
+	/*
+	 * XXX this makes no sense..
+	 * why do we do nothing for change on users not REG_ALL?
+	 * why do we trigger events twice for everyone previously (and just them now)
+	 * i think the first if () needs removing totally, or? -- w00t
+	 */
+	if (this->registered != REG_ALL)
 	{
 		int MOD_RESULT = 0;
 
@@ -902,31 +913,28 @@ bool User::ForceNickChange(const char* newnick)
 			ServerInstance->stats->statsCollisions++;
 			return false;
 		}
-
-		if (this->registered == REG_ALL)
+	}
+	else
+	{
+		std::deque<classbase*> dummy;
+		Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
+		if (nickhandler) // wtfbbq, when would this not be here
 		{
-			std::deque<classbase*> dummy;
-			Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
-			if (nickhandler)
-			{
-				nickhandler->HandleInternal(1, dummy);
-				bool result = (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS);
-				nickhandler->HandleInternal(0, dummy);
-				return result;
-			}
+			nickhandler->HandleInternal(1, dummy);
+			bool result = (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS);
+			nickhandler->HandleInternal(0, dummy);
+			return result;
 		}
-		return false;
 	}
 
-	catch (...)
-	{
-		ServerInstance->Log(DEBUG,"Exception in User::ForceNickChange()");
-		return false;
-	}
+	// Unreachable.
+	return false;
 }
 
-void User::SetSockAddr(int protocol_family, const char* ip, int port)
+void User::SetSockAddr(int protocol_family, const char* sip, int port)
 {
+	this->cachedip = "";
+
 	switch (protocol_family)
 	{
 #ifdef SUPPORT_IP6LINKS
@@ -935,7 +943,7 @@ void User::SetSockAddr(int protocol_family, const char* ip, int port)
 			sockaddr_in6* sin = new sockaddr_in6;
 			sin->sin6_family = AF_INET6;
 			sin->sin6_port = port;
-			inet_pton(AF_INET6, ip, &sin->sin6_addr);
+			inet_pton(AF_INET6, sip, &sin->sin6_addr);
 			this->ip = (sockaddr*)sin;
 		}
 		break;
@@ -945,7 +953,7 @@ void User::SetSockAddr(int protocol_family, const char* ip, int port)
 			sockaddr_in* sin = new sockaddr_in;
 			sin->sin_family = AF_INET;
 			sin->sin_port = port;
-			inet_pton(AF_INET, ip, &sin->sin_addr);
+			inet_pton(AF_INET, sip, &sin->sin_addr);
 			this->ip = (sockaddr*)sin;
 		}
 		break;
@@ -1002,6 +1010,9 @@ const char* User::GetIPString()
 	if (this->ip == NULL)
 		return "";
 
+	if (!this->cachedip.empty())
+		return this->cachedip.c_str();
+
 	switch (this->GetProtocolFamily())
 	{
 #ifdef SUPPORT_IP6LINKS
@@ -1016,8 +1027,11 @@ const char* User::GetIPString()
 			{
 				strlcpy(&temp[1], buf, sizeof(temp) - 1);
 				*temp = '0';
+				this->cachedip = temp;
 				return temp;
 			}
+			
+			this->cachedip = buf;
 			return buf;
 		}
 		break;
@@ -1026,12 +1040,15 @@ const char* User::GetIPString()
 		{
 			sockaddr_in* sin = (sockaddr_in*)this->ip;
 			inet_ntop(sin->sin_family, &sin->sin_addr, buf, sizeof(buf));
+			this->cachedip = buf;
 			return buf;
 		}
 		break;
 		default:
 		break;
 	}
+	
+	// Unreachable, probably
 	return "";
 }
 
@@ -1048,11 +1065,7 @@ void User::Write(std::string text)
 
 	try
 	{
-		/* ServerInstance->Log(DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
-		 * WARNING: The above debug line is VERY loud, do NOT
-		 * enable it till we have a good way of filtering it
-		 * out of the logs (e.g. 1.2 would be good).
-		 */
+		ServerInstance->Logs->Log("USEROUTPUT", DEBUG,"C[%d] O %s", this->GetFd(), text.c_str());
 		text.append("\r\n");
 	}
 	catch (...)
@@ -1063,11 +1076,11 @@ void User::Write(std::string text)
 
 	if (ServerInstance->Config->GetIOHook(this->GetPort()))
 	{
+		/* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
+		 * implement their own buffering mechanisms
+		 */
 		try
 		{
-			/* XXX: The lack of buffering here is NOT a bug, modules implementing this interface have to
-			 * implement their own buffering mechanisms
-			 */
 			ServerInstance->Config->GetIOHook(this->GetPort())->OnRawSocketWrite(this->fd, text.data(), text.length());
 		}
 		catch (CoreException& modexcept)
@@ -1183,47 +1196,39 @@ void User::WriteCommon(const char* text, ...)
 
 void User::WriteCommon(const std::string &text)
 {
-	try
-	{
-		bool sent_to_at_least_one = false;
-		char tb[MAXBUF];
+	bool sent_to_at_least_one = false;
+	char tb[MAXBUF];
 
-		if (this->registered != REG_ALL)
-			return;
+	if (this->registered != REG_ALL)
+		return;
 
-		uniq_id++;
+	uniq_id++;
 
-		/* We dont want to be doing this n times, just once */
-		snprintf(tb,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
-		std::string out = tb;
+	/* We dont want to be doing this n times, just once */
+	snprintf(tb,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
+	std::string out = tb;
 
-		for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+	for (UCListIter v = this->chans.begin(); v != this->chans.end(); v++)
+	{
+		CUList* ulist = v->first->GetUsers();
+		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			CUList* ulist = v->first->GetUsers();
-			for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+			if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
 			{
-				if ((IS_LOCAL(i->first)) && (already_sent[i->first->fd] != uniq_id))
-				{
-					already_sent[i->first->fd] = uniq_id;
-					i->first->Write(out);
-					sent_to_at_least_one = true;
-				}
+				already_sent[i->first->fd] = uniq_id;
+				i->first->Write(out);
+				sent_to_at_least_one = true;
 			}
 		}
-
-		/*
-		 * if the user was not in any channels, no users will receive the text. Make sure the user
-		 * receives their OWN message for WriteCommon
-		 */
-		if (!sent_to_at_least_one)
-		{
-			this->Write(std::string(tb));
-		}
 	}
 
-	catch (...)
+	/*
+	 * if the user was not in any channels, no users will receive the text. Make sure the user
+	 * receives their OWN message for WriteCommon
+	 */
+	if (!sent_to_at_least_one)
 	{
-		ServerInstance->Log(DEBUG,"Exception in User::WriteCommon()");
+		this->Write(std::string(tb));
 	}
 }
 
@@ -1313,7 +1318,7 @@ void User::WriteWallOps(const std::string &text)
 	std::string wallop("WALLOPS :");
 	wallop.append(text);
 
-	for (std::vector<User*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+	for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
 	{
 		User* t = *i;
 		if (t->IsModeSet('w'))
@@ -1380,24 +1385,25 @@ bool User::ChangeName(const char* gecos)
 	return true;
 }
 
-bool User::ChangeDisplayedHost(const char* host)
+bool User::ChangeDisplayedHost(const char* shost)
 {
-	if (!strcmp(host, this->dhost))
+	if (!strcmp(shost, this->dhost))
 		return true;
 
 	if (IS_LOCAL(this))
 	{
 		int MOD_RESULT = 0;
-		FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,host));
+		FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(this,shost));
 		if (MOD_RESULT)
 			return false;
-		FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,host));
+		FOREACH_MOD(I_OnChangeHost,OnChangeHost(this,shost));
 	}
+
 	if (this->ServerInstance->Config->CycleHosts)
 		this->WriteCommonExcept("QUIT :Changing hosts");
 
 	/* Fix by Om: User::dhost is 65 long, this was truncating some long hosts */
-	strlcpy(this->dhost,host,64);
+	strlcpy(this->dhost,shost,64);
 
 	this->InvalidateCache();
 
@@ -1426,7 +1432,7 @@ bool User::ChangeIdent(const char* newident)
 	if (this->ServerInstance->Config->CycleHosts)
 		this->WriteCommonExcept("%s","QUIT :Changing ident");
 
-	strlcpy(this->ident, newident, IDENTMAX+2);
+	strlcpy(this->ident, newident, IDENTMAX+1);
 
 	this->InvalidateCache();
 
@@ -1444,7 +1450,7 @@ bool User::ChangeIdent(const char* newident)
 	return true;
 }
 
-void User::SendAll(const char* command, char* text, ...)
+void User::SendAll(const char* command, const char* text, ...)
 {
 	char textbuffer[MAXBUF];
 	char formatbuffer[MAXBUF];
@@ -1457,7 +1463,7 @@ void User::SendAll(const char* command, char* text, ...)
 	snprintf(formatbuffer,MAXBUF,":%s %s $* :%s", this->GetFullHost(), command, textbuffer);
 	std::string fmt = formatbuffer;
 
-	for (std::vector<User*>::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++)
+	for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
 	{
 		(*i)->Write(fmt);
 	}
@@ -1466,27 +1472,21 @@ void User::SendAll(const char* command, char* text, ...)
 
 std::string User::ChannelList(User* source)
 {
-	try
+	std::string list;
+
+	for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
 	{
-		std::string list;
-		for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
+		/* If the target is the same as the sender, let them see all their channels.
+		 * If the channel is NOT private/secret OR the user shares a common channel
+		 * If the user is an oper, and the <options:operspywhois> option is set.
+		 */
+		if ((source == this) || (IS_OPER(source) && ServerInstance->Config->OperSpyWhois) || (((!i->first->IsModeSet('p')) && (!i->first->IsModeSet('s'))) || (i->first->HasUser(source))))
 		{
-			/* If the target is the same as the sender, let them see all their channels.
-			 * If the channel is NOT private/secret OR the user shares a common channel
-			 * If the user is an oper, and the <options:operspywhois> option is set.
-			 */
-			if ((source == this) || (IS_OPER(source) && ServerInstance->Config->OperSpyWhois) || (((!i->first->IsModeSet('p')) && (!i->first->IsModeSet('s'))) || (i->first->HasUser(source))))
-			{
-				list.append(i->first->GetPrefixChar(this)).append(i->first->name).append(" ");
-			}
+			list.append(i->first->GetPrefixChar(this)).append(i->first->name).append(" ");
 		}
-		return list;
-	}
-	catch (...)
-	{
-		ServerInstance->Log(DEBUG,"Exception in User::ChannelList()");
-		return "";
 	}
+
+	return list;
 }
 
 void User::SplitChanList(User* dest, const std::string &cl)
@@ -1495,42 +1495,34 @@ void User::SplitChanList(User* dest, const std::string &cl)
 	std::ostringstream prefix;
 	std::string::size_type start, pos, length;
 
-	try
+	prefix << this->nick << " " << dest->nick << " :";
+	line = prefix.str();
+	int namelen = strlen(ServerInstance->Config->ServerName) + 6;
+
+	for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
 	{
-		prefix << this->nick << " " << dest->nick << " :";
-		line = prefix.str();
-		int namelen = strlen(ServerInstance->Config->ServerName) + 6;
+		length = (pos == std::string::npos) ? cl.length() : pos;
 
-		for (start = 0; (pos = cl.find(' ', start)) != std::string::npos; start = pos+1)
+		if (line.length() + namelen + length - start > 510)
 		{
-			length = (pos == std::string::npos) ? cl.length() : pos;
-
-			if (line.length() + namelen + length - start > 510)
-			{
-				ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());
-				line = prefix.str();
-			}
-
-			if(pos == std::string::npos)
-			{
-				line.append(cl.substr(start, length - start));
-				break;
-			}
-			else
-			{
-				line.append(cl.substr(start, length - start + 1));
-			}
+			ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());
+			line = prefix.str();
 		}
 
-		if (line.length())
+		if(pos == std::string::npos)
 		{
-			ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());
+			line.append(cl.substr(start, length - start));
+			break;
+		}
+		else
+		{
+			line.append(cl.substr(start, length - start + 1));
 		}
 	}
 
-	catch (...)
+	if (line.length())
 	{
-		ServerInstance->Log(DEBUG,"Exception in User::SplitChanList()");
+		ServerInstance->SendWhoisLine(this, dest, 319, "%s", line.c_str());
 	}
 }
 
@@ -1700,6 +1692,9 @@ void User::ShowRULES()
 
 void User::HandleEvent(EventType et, int errornum)
 {
+	if (this->quitting) // drop everything, user is due to be quit
+		return;
+
 	/* WARNING: May delete this user! */
 	int thisfd = this->GetFd();
 
@@ -1736,15 +1731,12 @@ void User::HandleEvent(EventType et, int errornum)
 
 void User::SetOperQuit(const std::string &oquit)
 {
-	if (operquit)
-		return;
-
-	operquit = strdup(oquit.c_str());
+	operquitmsg = oquit;
 }
 
 const char* User::GetOperQuit()
 {
-	return operquit ? operquit : "";
+	return operquitmsg.c_str();
 }
 
 void User::IncreasePenalty(int increase)