X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=f7b6467548062d75184aa174cd83ee856fd2a4e9;hb=f08e4a94e46dbbb64e2f29a8147355355e572108;hp=aa9d570ac55abbfb1c627826e7478cc844dc09d3;hpb=4b856bda135a08e800b96c970a10b0b6a34d433a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index aa9d570ac..f7b646754 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -82,7 +82,7 @@ std::string User::ProcessNoticeMasks(const char *sm)
 					}
 				}
 				else
-					this->WriteNumeric(501, "%s %c :is unknown snomask char to me", this->nick.c_str(), *c);
+					this->WriteNumeric(ERR_UNKNOWNSNOMASK, "%s %c :is unknown snomask char to me", this->nick.c_str(), *c);
 
 				oldadding = adding;
 			break;
@@ -185,7 +185,6 @@ void User::DecrementModes()
 
 User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
 {
-	*host = 0;
 	server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
 	reset_due = ServerInstance->Time();
 	age = ServerInstance->Time();
@@ -211,9 +210,9 @@ User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance
 	memset(snomasks,0,sizeof(snomasks));
 
 	if (uid.empty())
-		uuid.assign(Instance->GetUID(), 0, UUID_LENGTH);
+		uuid.assign(Instance->GetUID(), 0, UUID_LENGTH - 1);
 	else
-		uuid.assign(uid, 0, UUID_LENGTH);
+		uuid.assign(uid, 0, UUID_LENGTH - 1);
 
 	ServerInstance->Logs->Log("USERS", DEBUG,"New UUID for user: %s (%s)", uuid.c_str(), uid.empty() ? "allocated new" : "used remote");
 
@@ -283,7 +282,7 @@ const std::string& User::MakeHost()
 	for(const char* n = ident.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '@';
-	for(const char* n = host; *n; n++)
+	for(const char* n = host.c_str(); *n; n++)
 		*t++ = *n;
 	*t = 0;
 
@@ -383,7 +382,7 @@ const std::string& User::GetFullRealHost()
 	for(const char* n = ident.c_str(); *n; n++)
 		*t++ = *n;
 	*t++ = '@';
-	for(char* n = host; *n; n++)
+	for(const char* n = host.c_str(); *n; n++)
 		*t++ = *n;
 	*t = 0;
 
@@ -721,8 +720,8 @@ void User::Oper(const std::string &opertype, const std::string &opername)
 		this->modes[UM_OPERATOR] = 1;
 		this->WriteServ("MODE %s :+o", this->nick.c_str());
 		FOREACH_MOD(I_OnOper, OnOper(this, opertype));
-		ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host, opertype.c_str());
-		this->oper.assign(opertype, 0, NICKMAX - 1);
+		ServerInstance->Logs->Log("OPER", DEFAULT, "%s!%s@%s opered as type: %s", this->nick.c_str(), this->ident.c_str(), this->host.c_str(), opertype.c_str());
+		this->oper.assign(opertype, 0, 512);
 		ServerInstance->Users->all_opers.push_back(this);
 
 		opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str());
@@ -887,7 +886,7 @@ void User::CheckClass()
 	this->MaxChans = a->GetMaxChans();
 }
 
-void User::CheckLines()
+bool User::CheckLines()
 {
 	const char* check[] = { "G" , "K", NULL };
 
@@ -900,10 +899,12 @@ void User::CheckLines()
 			if (r)
 			{
 				r->Apply(this);
-				return;
+				return true;
 			}
 		}
 	}
+
+	return false;
 }
 
 void User::FullConnect()
@@ -928,16 +929,17 @@ void User::FullConnect()
 		return;
 	}
 
-	CheckLines();
+	if (this->CheckLines())
+		return;
 
 	this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network);
-	this->WriteNumeric(001, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick.c_str(), ServerInstance->Config->Network, this->nick.c_str(), this->ident.c_str(), this->host);
-	this->WriteNumeric(002, "%s :Your host is %s, running version InspIRCd-1.2",this->nick.c_str(),ServerInstance->Config->ServerName);
-	this->WriteNumeric(003, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__);
-	this->WriteNumeric(004, "%s %s InspIRCd-1.2 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
+	this->WriteNumeric(RPL_WELCOME, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick.c_str(), ServerInstance->Config->Network, this->nick.c_str(), this->ident.c_str(), this->host.c_str());
+	this->WriteNumeric(RPL_YOURHOSTIS, "%s :Your host is %s, running version InspIRCd-1.2",this->nick.c_str(),ServerInstance->Config->ServerName);
+	this->WriteNumeric(RPL_SERVERCREATED, "%s :This server was created %s %s", this->nick.c_str(), __TIME__, __DATE__);
+	this->WriteNumeric(RPL_SERVERVERSION, "%s %s InspIRCd-1.2 %s %s %s", this->nick.c_str(), ServerInstance->Config->ServerName, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
 
 	ServerInstance->Config->Send005(this);
-	this->WriteNumeric(42, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
+	this->WriteNumeric(RPL_YOURUUID, "%s %s :your unique ID", this->nick.c_str(), this->uuid.c_str());
 
 
 	this->ShowMOTD();
@@ -948,9 +950,11 @@ void User::FullConnect()
 
 	/* Trigger LUSERS output, give modules a chance too */
 	int MOD_RESULT = 0;
-	FOREACH_RESULT(I_OnPreCommand, OnPreCommand("LUSERS", std::vector<std::string>(), this, true, "LUSERS"));
+	std::string command("LUSERS");
+	std::vector<std::string> parameters;
+	FOREACH_RESULT(I_OnPreCommand, OnPreCommand(command, parameters, this, true, "LUSERS"));
 	if (!MOD_RESULT)
-		ServerInstance->CallCommandHandler("LUSERS", std::vector<std::string>(), this);
+		ServerInstance->CallCommandHandler(command, parameters, this);
 
 	/*
 	 * We don't set REG_ALL until triggering OnUserConnect, so some module events don't spew out stuff
@@ -960,9 +964,11 @@ void User::FullConnect()
 
 	this->registered = REG_ALL;
 
+	ServerInstance->PI->Introduce(this);
+
 	FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
 
-	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick.c_str(), this->ident.c_str(), this->host, this->GetIPString(), this->fullname.c_str());
+	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick.c_str(), this->ident.c_str(), this->host.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(), "", "");
 }
@@ -1095,13 +1101,116 @@ int User::GetProtocolFamily()
 	return sin->sin_family;
 }
 
-/*
- * XXX the duplication here is horrid..
- * do we really need two methods doing essentially the same thing?
- */
+const char* User::GetCIDRMask(int range)
+{
+	static char buf[44];
+
+	if (this->ip == NULL)
+		return "";
+
+	if (range < 0)
+		throw "Negative range, sorry, no.";
+
+	/*
+	 * Original code written by Oliver Lupton (Om).
+	 * Integrated by me. Thanks. :) -- w00t
+	 */
+	switch (this->GetProtocolFamily())
+	{
+#ifdef SUPPORT_IP6LINKS
+		case AF_INET6:
+		{
+			/* unsigned char s6_addr[16]; */
+			struct in6_addr v6;
+			sockaddr_in6* sin;
+			int i, bytestozero, extrabits;
+			char buffer[40];
+			
+			if(range > 128)
+				throw "CIDR mask width greater than address width (IPv6, 128 bit)";
+
+			/* Access the user's IP structure directly */
+			sin = (sockaddr_in6*)this->ip;
+
+			/* To create the CIDR mask we want to set all the bits after 'range' bits of the address
+			 * to zero. This means the last (128 - range) bits of the address must be set to zero.
+			 * Hence this number divided by 8 is the number of whole bytes from the end of the address
+			 * which must be set to zero.
+			 */
+			bytestozero = (128 - range) / 8;
+			
+			/* Some of the least significant bits of the next most significant byte may also have to
+			 * be zeroed. The number of bits is the remainder of the above division.
+			 */
+			extrabits = (128 - range) % 8;
+			
+			/* Populate our working struct with the parts of the user's IP which are required in the
+			 * final CIDR mask. Set all the subsequent bytes to zero.
+			 * (16 - bytestozero) is the number of bytes which must be populated with actual IP data.
+			 */
+			for(i = 0; i < (16 - bytestozero); i++)
+			{
+				v6.s6_addr[i] = sin->sin6_addr.s6_addr[i];
+			}
+			
+			/* And zero all the remaining bytes in the IP. */
+			for(; i < 16; i++)
+			{
+				v6.s6_addr[i] = 0;
+			}
+					
+			/* And finally, zero the extra bits required. */
+			v6.s6_addr[15 - bytestozero] = (v6.s6_addr[15 - bytestozero] >> extrabits) << extrabits;
+
+			snprintf(buf, 44, "%s/%d", inet_ntop(AF_INET6, &v6, buffer, 40), range);
+			return buf;
+		}
+		break;
+#endif
+		case AF_INET:
+		{
+			struct in_addr v4;
+			sockaddr_in* sin;
+			char buffer[16];
+
+			if (range > 32)
+				throw "CIDR mask width greater than address width (IPv4, 32 bit)";
+
+			/* Users already have a sockaddr* pointer (User::ip) which contains either a v4 or v6 structure */
+			sin = (sockaddr_in*)this->ip;
+			v4.s_addr = sin->sin_addr.s_addr;
+
+			/* To create the CIDR mask we want to set all the bits after 'range' bits of the address
+			 * to zero. This means the last (32 - range) bits of the address must be set to zero.
+			 * This is done by shifting the value right and then back left by (32 - range) bits.
+			 */
+			if(range > 0)
+			{
+				v4.s_addr = ntohl(v4.s_addr);
+				v4.s_addr = (v4.s_addr >> (32 - range)) << (32 - range);
+				v4.s_addr = htonl(v4.s_addr);
+			}
+			else
+			{
+				/* a range of zero would cause a 32 bit value to be shifted by 32 bits.
+				 * this has undefined behaviour, but for CIDR purposes the resulting mask
+				 * from a.b.c.d/0 is 0.0.0.0/0
+				 */
+				v4.s_addr = 0;
+			}
+
+			snprintf(buf, 44, "%s/%d", inet_ntop(AF_INET, &v4, buffer, 16), range);
+			return buf;
+		}
+		break;
+	}
+
+	return ""; // unused, but oh well
+}
+
 const char* User::GetIPString(bool translate4in6)
 {
-	static char buf[1024];
+	static char buf[40];
 
 	if (this->ip == NULL)
 		return "";
@@ -1522,14 +1631,14 @@ bool User::ChangeName(const char* gecos)
 			return false;
 		FOREACH_MOD(I_OnChangeName,OnChangeName(this,gecos));
 	}
-	this->fullname.assign(gecos, 0, MAXGECOS+1);
+	this->fullname.assign(gecos, 0, ServerInstance->Config->Limits.MaxGecos);
 
 	return true;
 }
 
 bool User::ChangeDisplayedHost(const char* shost)
 {
-	if (!this->dhost.compare(shost))
+	if (dhost == shost)
 		return true;
 
 	if (IS_LOCAL(this))
@@ -1553,15 +1662,15 @@ bool User::ChangeDisplayedHost(const char* shost)
 	{
 		for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
 		{
-			i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name);
+			i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name.c_str());
 			std::string n = this->ServerInstance->Modes->ModeString(this, i->first);
 			if (n.length() > 0)
-				i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name, n.c_str());
+				i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name.c_str(), n.c_str());
 		}
 	}
 
 	if (IS_LOCAL(this))
-		this->WriteNumeric(396, "%s %s :is now your displayed host",this->nick.c_str(),this->dhost.c_str());
+		this->WriteNumeric(RPL_YOURDISPLAYEDHOST, "%s %s :is now your displayed host",this->nick.c_str(),this->dhost.c_str());
 
 	return true;
 }
@@ -1574,7 +1683,7 @@ bool User::ChangeIdent(const char* newident)
 	if (this->ServerInstance->Config->CycleHosts)
 		this->WriteCommonExcept("%s","QUIT :Changing ident");
 
-	this->ident.assign(newident, 0, IDENTMAX + 1);
+	this->ident.assign(newident, 0, ServerInstance->Config->Limits.IdentMax + 1);
 
 	this->InvalidateCache();
 
@@ -1582,10 +1691,10 @@ bool User::ChangeIdent(const char* newident)
 	{
 		for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
 		{
-			i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name);
+			i->first->WriteAllExceptSender(this, false, 0, "JOIN %s", i->first->name.c_str());
 			std::string n = this->ServerInstance->Modes->ModeString(this, i->first);
 			if (n.length() > 0)
-				i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name, n.c_str());
+				i->first->WriteAllExceptSender(this, true, 0, "MODE %s +%s", i->first->name.c_str(), n.c_str());
 		}
 	}
 
@@ -1838,31 +1947,31 @@ void User::ShowMOTD()
 {
 	if (!ServerInstance->Config->MOTD.size())
 	{
-		this->WriteNumeric(422, "%s :Message of the day file is missing.",this->nick.c_str());
+		this->WriteNumeric(ERR_NOMOTD, "%s :Message of the day file is missing.",this->nick.c_str());
 		return;
 	}
-	this->WriteNumeric(375, "%s :%s message of the day", this->nick.c_str(), ServerInstance->Config->ServerName);
+	this->WriteNumeric(RPL_MOTDSTART, "%s :%s message of the day", this->nick.c_str(), ServerInstance->Config->ServerName);
 
 	for (file_cache::iterator i = ServerInstance->Config->MOTD.begin(); i != ServerInstance->Config->MOTD.end(); i++)
-		this->WriteNumeric(372, "%s :- %s",this->nick.c_str(),i->c_str());
+		this->WriteNumeric(RPL_MOTD, "%s :- %s",this->nick.c_str(),i->c_str());
 
-	this->WriteNumeric(376, "%s :End of message of the day.", this->nick.c_str());
+	this->WriteNumeric(RPL_ENDOFMOTD, "%s :End of message of the day.", this->nick.c_str());
 }
 
 void User::ShowRULES()
 {
 	if (!ServerInstance->Config->RULES.size())
 	{
-		this->WriteNumeric(434, "%s :RULES File is missing",this->nick.c_str());
+		this->WriteNumeric(ERR_NORULES, "%s :RULES File is missing",this->nick.c_str());
 		return;
 	}
 
-	this->WriteNumeric(308, "%s :- %s Server Rules -",this->nick.c_str(),ServerInstance->Config->ServerName);
+	this->WriteNumeric(RPL_RULESTART, "%s :- %s Server Rules -",this->nick.c_str(),ServerInstance->Config->ServerName);
 
 	for (file_cache::iterator i = ServerInstance->Config->RULES.begin(); i != ServerInstance->Config->RULES.end(); i++)
-		this->WriteNumeric(232, "%s :- %s",this->nick.c_str(),i->c_str());
+		this->WriteNumeric(RPL_RULES, "%s :- %s",this->nick.c_str(),i->c_str());
 
-	this->WriteNumeric(309, "%s :End of RULES command.",this->nick.c_str());
+	this->WriteNumeric(RPL_RULESEND, "%s :End of RULES command.",this->nick.c_str());
 }
 
 void User::HandleEvent(EventType et, int errornum)