X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fusers.cpp;h=92276d07c2d555372f8dd9684d810c6c688fe3ce;hb=20ea635c9fcd0d559ff6fc2863ab581591bc4ef8;hp=020c1a9bf17d745761aaa5d393005aef1ccafea4;hpb=f89e68d78684dab66f9c99aaf8bd8a37ec62bfce;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 020c1a9bf..92276d07c 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -222,11 +222,12 @@ LocalUser::LocalUser(int myfd, irc::sockets::sockaddrs* client, irc::sockets::so
 	bytes_in(0), bytes_out(0), cmds_in(0), cmds_out(0), nping(0), CommandFloodPenalty(0),
 	already_sent(0)
 {
+	ident = "unknown";
 	lastping = 0;
 	eh.SetFd(myfd);
-
-	SetClientIP(client);
+	memcpy(&client_sa, client, sizeof(irc::sockets::sockaddrs));
 	memcpy(&server_sa, servaddr, sizeof(irc::sockets::sockaddrs));
+	dhost = host = GetIPString();
 }
 
 User::~User()
@@ -587,7 +588,7 @@ void User::Oper(OperInfo* info)
 		nick.c_str(), ident.c_str(), host.c_str(), oper->NameStr(), opername.c_str());
 	this->WriteNumeric(381, "%s :You are now %s %s", nick.c_str(), strchr("aeiouAEIOU", oper->name[0]) ? "an" : "a", oper->NameStr());
 
-	ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), oper->NameStr());
+	ServerInstance->Logs->Log("OPER", DEFAULT, "%s opered as type: %s", GetFullRealHost().c_str(), oper->NameStr());
 	ServerInstance->Users->all_opers.push_back(this);
 
 	// Expand permissions from config for faster lookup
@@ -622,7 +623,8 @@ void OperInfo::init()
 			AllowedPrivs.insert(mypriv);
 		}
 
-		for (unsigned char* c = (unsigned char*)tag->getString("usermodes").c_str(); *c; ++c)
+		std::string modes = tag->getString("usermodes");
+		for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c)
 		{
 			if (*c == '*')
 			{
@@ -634,7 +636,8 @@ void OperInfo::init()
 			}
 		}
 
-		for (unsigned char* c = (unsigned char*)tag->getString("chanmodes").c_str(); *c; ++c)
+		modes = tag->getString("chanmodes");
+		for (std::string::const_iterator c = modes.begin(); c != modes.end(); ++c)
 		{
 			if (*c == '*')
 			{
@@ -771,11 +774,16 @@ void LocalUser::FullConnect()
 	if (quitting)
 		return;
 
-	this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network.c_str());
-	this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick.c_str(), ServerInstance->Config->Network.c_str(), this->nick.c_str(), this->ident.c_str(), this->host.c_str());
-	this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-2.0",this->nick.c_str(),ServerInstance->Config->ServerName.c_str());
+	if (ServerInstance->Config->WelcomeNotice)
+		this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network.c_str());
+	this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s",this->nick.c_str(), ServerInstance->Config->Network.c_str(), GetFullRealHost().c_str());
+	this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version %s",this->nick.c_str(),ServerInstance->Config->ServerName.c_str(),BRANCH);
 	this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__);
-	this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-2.0 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
+
+	std::string umlist = ServerInstance->Modes->UserModeList();
+	std::string cmlist = ServerInstance->Modes->ChannelModeList();
+	std::string pmlist = ServerInstance->Modes->ParaModeList();
+	this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName.c_str(), BRANCH, umlist.c_str(), cmlist.c_str(), pmlist.c_str());
 
 	ServerInstance->Config->Send005(this);
 	this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
@@ -790,13 +798,13 @@ void LocalUser::FullConnect()
 	std::vector<std::string> parameters;
 	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
 	if (!MOD_RESULT)
-		ServerInstance->CallCommandHandler(command, parameters, this);
+		ServerInstance->Parser->CallHandler(command, parameters, this);
 
 	MOD_RESULT = MOD_RES_PASSTHRU;
 	command = "LUSERS";
 	FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, parameters, this, true, command));
 	if (!MOD_RESULT)
-		ServerInstance->CallCommandHandler(command, parameters, this);
+		ServerInstance->Parser->CallHandler(command, parameters, this);
 
 	if (ServerInstance->Config->RawLog)
 		WriteServ("PRIVMSG %s :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.", nick.c_str());
@@ -811,8 +819,8 @@ void LocalUser::FullConnect()
 
 	FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
 
-	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d (class %s): %s!%s@%s (%s) [%s]",
-		this->GetServerPort(), this->MyClass->name.c_str(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), this->GetIPString(), this->fullname.c_str());
+	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d (class %s): %s (%s) [%s]",
+		this->GetServerPort(), this->MyClass->name.c_str(), GetFullRealHost().c_str(), this->GetIPString(), this->fullname.c_str());
 	ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString());
 	ServerInstance->BanCache->AddHit(this->GetIPString(), "", "");
 	// reset the flood penalty (which could have been raised due to things like auto +x)
@@ -867,8 +875,8 @@ bool User::ChangeNick(const std::string& newnick, bool force)
 			{
 				if (this->registered == REG_ALL)
 				{
-					ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s!%s@%s: %s",
-						newnick.c_str(), this->nick.c_str(), this->ident.c_str(), this->host.c_str(), mq->reason.c_str());
+					ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s: %s",
+						newnick.c_str(), GetFullRealHost().c_str(), mq->reason.c_str());
 				}
 				this->WriteNumeric(432, "%s %s :Invalid nickname: %s",this->nick.c_str(), newnick.c_str(), mq->reason.c_str());
 				return false;
@@ -978,24 +986,38 @@ irc::sockets::cidr_mask User::GetCIDRMask()
 	return irc::sockets::cidr_mask(client_sa, range);
 }
 
-bool User::SetClientIP(irc::sockets::sockaddrs *sa)
+bool User::SetClientIP(const char* sip)
 {
-	memcpy(&client_sa, sa, sizeof(irc::sockets::sockaddrs));
-
-	FOREACH_MOD(I_OnSetClientIP, OnSetClientIP(this));
+	cachedip.clear();
+	cached_hostip.clear();
+	return irc::sockets::aptosa(sip, 0, client_sa);
+}
 
-	return true;
+void User::SetClientIP(const irc::sockets::sockaddrs& sa)
+{
+	cachedip.clear();
+	cached_hostip.clear();
+	memcpy(&client_sa, &sa, sizeof(irc::sockets::sockaddrs));
 }
 
-bool User::SetClientIP(const char* sip)
+bool LocalUser::SetClientIP(const char* sip)
 {
 	irc::sockets::sockaddrs sa;
-
-	this->cachedip = "";
 	if (!irc::sockets::aptosa(sip, 0, sa))
+		// Invalid
 		return false;
 
-	return SetClientIP(&sa);
+	LocalUser::SetClientIP(sa);
+	return true;
+}
+
+void LocalUser::SetClientIP(const irc::sockets::sockaddrs& sa)
+{
+	if (sa != client_sa)
+	{
+		User::SetClientIP(sa);
+		FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(this));
+	}
 }
 
 static std::string wide_newline("\r\n");
@@ -1484,7 +1506,8 @@ void User::SendAll(const char* command, const char* text, ...)
 
 	for (std::vector<LocalUser*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
 	{
-		(*i)->Write(fmt);
+		if ((*i)->registered == REG_ALL)
+			(*i)->Write(fmt);
 	}
 }