X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=6087f4d1cd579f03739758fc4071eb2f18ad96c0;hb=af6e4d13ee931ff5a63a9ef3cae920a6b422fc50;hp=15e1ab72b5ebf79e57d0f475863332e90b80a1bf;hpb=1735fc95bba84044d43d4490bd5916d0a52eb876;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 15e1ab72b..6087f4d1c 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -107,9 +107,7 @@ void User::StartDNSLookup()
 		const char* sip = this->GetIPString();
 		UserResolver *res_reverse;
 
-		QueryType resolvtype = strchr(sip, ':') ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4;
-		// when GetProtocolFamily() works correctly with 4in6, this can be replaced by
-		// this->GetProtocolFamily() == AF_INET ? DNS_QUERY_PTR4 : DNS_QUERY_PTR6;
+		QueryType resolvtype = this->client_sa.sa.sa_family == AF_INET6 ? DNS_QUERY_PTR6 : DNS_QUERY_PTR4;
 		res_reverse = new UserResolver(this->ServerInstance, this, sip, resolvtype, cached);
 
 		this->ServerInstance->AddResolver(res_reverse, cached);
@@ -208,17 +206,18 @@ void User::DecrementModes()
 
 User::User(InspIRCd* Instance, const std::string &uid) : ServerInstance(Instance)
 {
-	server = (char*)Instance->FindServerNamePtr(Instance->Config->ServerName);
+	server = Instance->FindServerNamePtr(Instance->Config->ServerName);
 	age = ServerInstance->Time();
 	Penalty = 0;
 	lastping = signon = idle_lastmsg = nping = registered = 0;
 	bytes_in = bytes_out = cmds_in = cmds_out = 0;
 	quietquit = quitting = exempt = haspassed = dns_done = false;
 	fd = -1;
+	server_sa.sa.sa_family = AF_UNSPEC;
+	client_sa.sa.sa_family = AF_UNSPEC;
 	recvq.clear();
 	sendq.clear();
 	Visibility = NULL;
-	ip = NULL;
 	MyClass = NULL;
 	AllowedPrivs = AllowedOperCommands = NULL;
 	chans.clear();
@@ -245,6 +244,8 @@ User::~User()
 	{
 		this->MyClass->RefCount--;
 		ServerInstance->Logs->Log("USERS", DEBUG, "User destructor -- connect refcount now: %lu", this->MyClass->RefCount);
+		if (MyClass->RefCount == 0)
+			delete MyClass;
 	}
 
 	if (this->AllowedOperCommands)
@@ -262,22 +263,9 @@ User::~User()
 	this->InvalidateCache();
 	this->DecrementModes();
 
-	if (ip)
-	{
+	if (client_sa.sa.sa_family != AF_UNSPEC)
 		ServerInstance->Users->RemoveCloneCounts(this);
 
-		if (this->GetProtocolFamily() == AF_INET)
-		{
-			delete (sockaddr_in*)ip;
-		}
-#ifdef SUPPORT_IP6LINKS
-		else
-		{
-			delete (sockaddr_in6*)ip;
-		}
-#endif
-	}
-
 	ServerInstance->Users->uuidlist->erase(uuid);
 }
 
@@ -330,7 +318,7 @@ void User::CloseSocket()
 	}
 }
 
-const std::string& User::GetFullHost()
+const std::string User::GetFullHost()
 {
 	if (!this->cached_fullhost.empty())
 		return this->cached_fullhost;
@@ -379,7 +367,7 @@ int User::ReadData(void* buffer, size_t size)
 }
 
 
-const std::string& User::GetFullRealHost()
+const std::string User::GetFullRealHost()
 {
 	if (!this->cached_fullrealhost.empty())
 		return this->cached_fullrealhost;
@@ -518,7 +506,6 @@ bool User::HasPermission(const std::string &command)
 
 bool User::HasPrivPermission(const std::string &privstr, bool noisy)
 {
-	ServerInstance->Logs->Log("PRIVS", DEBUG, "Checking if I have " + privstr);
 	if (!IS_LOCAL(this))
 	{
 		ServerInstance->Logs->Log("PRIVS", DEBUG, "Remote (yes)");
@@ -529,7 +516,6 @@ bool User::HasPrivPermission(const std::string &privstr, bool noisy)
 	{
 		if (noisy)
 			this->WriteServ("NOTICE %s :You are not an oper", this->nick.c_str());
-		ServerInstance->Logs->Log("PRIVS", DEBUG, "Not oper (no)");
 		return false;
 	}
 
@@ -537,7 +523,6 @@ bool User::HasPrivPermission(const std::string &privstr, bool noisy)
 	{
 		if (noisy)
 			this->WriteServ("NOTICE %s :Privset empty(!?)", this->nick.c_str());
-		ServerInstance->Logs->Log("PRIVS", DEBUG, "No privs(?) (no)");
 		return false;
 	}
 
@@ -758,6 +743,13 @@ void User::Oper(const std::string &opertype, const std::string &opername)
 	this->oper.assign(opertype, 0, 512);
 	ServerInstance->Users->all_opers.push_back(this);
 
+	/*
+	 * This might look like it's in the wrong place.
+	 * It is *not*!
+	 *
+	 * For multi-network servers, we may not have the opertypes of the remote server, but we still want to mark the user as an oper of that type.
+	 * -- w00t
+	 */
 	opertype_t::iterator iter_opertype = ServerInstance->Config->opertypes.find(this->oper.c_str());
 	if (iter_opertype != ServerInstance->Config->opertypes.end())
 	{
@@ -894,7 +886,7 @@ void User::CheckClass()
 {
 	ConnectClass* a = this->MyClass;
 
-	if ((!a) || (a->GetType() == CC_DENY))
+	if ((!a) || (a->type == CC_DENY))
 	{
 		ServerInstance->Users->QuitUser(this, "Unauthorised connection");
 		return;
@@ -993,11 +985,10 @@ 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.c_str(), this->GetIPString(), this->fullname.c_str());
+	ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]",
+		this->GetServerPort(), 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(), "", "");
 }
@@ -1068,81 +1059,22 @@ bool User::ForceNickChange(const char* newnick)
 	return false;
 }
 
-void User::SetSockAddr(int protocol_family, const char* sip, int port)
-{
-	this->cachedip = "";
-
-	switch (protocol_family)
-	{
-#ifdef SUPPORT_IP6LINKS
-		case AF_INET6:
-		{
-			sockaddr_in6* sin = new sockaddr_in6;
-			sin->sin6_family = AF_INET6;
-			sin->sin6_port = port;
-			inet_pton(AF_INET6, sip, &sin->sin6_addr);
-			this->ip = (sockaddr*)sin;
-		}
-		break;
-#endif
-		case AF_INET:
-		{
-			sockaddr_in* sin = new sockaddr_in;
-			sin->sin_family = AF_INET;
-			sin->sin_port = port;
-			inet_pton(AF_INET, sip, &sin->sin_addr);
-			this->ip = (sockaddr*)sin;
-		}
-		break;
-		default:
-			ServerInstance->Logs->Log("USERS",DEBUG,"Uh oh, I dont know protocol %d to be set on '%s'!", protocol_family, this->nick.c_str());
-		break;
-	}
-}
-
-int User::GetPort()
+int User::GetServerPort()
 {
-	if (this->ip == NULL)
-		return 0;
-
-	switch (this->GetProtocolFamily())
+	switch (this->server_sa.sa.sa_family)
 	{
-#ifdef SUPPORT_IP6LINKS
 		case AF_INET6:
-		{
-			sockaddr_in6* sin = (sockaddr_in6*)this->ip;
-			return sin->sin6_port;
-		}
-		break;
-#endif
+			return htons(this->server_sa.in6.sin6_port);
 		case AF_INET:
-		{
-			sockaddr_in* sin = (sockaddr_in*)this->ip;
-			return sin->sin_port;
-		}
-		break;
-		default:
-		break;
+			return htons(this->server_sa.in4.sin_port);
 	}
 	return 0;
 }
 
-int User::GetProtocolFamily()
-{
-	if (this->ip == NULL)
-		return 0;
-
-	sockaddr_in* sin = (sockaddr_in*)this->ip;
-	return sin->sin_family;
-}
-
 const char* User::GetCIDRMask(int range)
 {
 	static char buf[44];
 
-	if (this->ip == NULL)
-		return "";
-
 	if (range < 0)
 		throw "Negative range, sorry, no.";
 
@@ -1150,23 +1082,18 @@ const char* User::GetCIDRMask(int range)
 	 * Original code written by Oliver Lupton (Om).
 	 * Integrated by me. Thanks. :) -- w00t
 	 */
-	switch (this->GetProtocolFamily())
+	switch (this->client_sa.sa.sa_family)
 	{
-#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
@@ -1185,7 +1112,7 @@ const char* User::GetCIDRMask(int range)
 			 */
 			for(i = 0; i < (16 - bytestozero); i++)
 			{
-				v6.s6_addr[i] = sin->sin6_addr.s6_addr[i];
+				v6.s6_addr[i] = client_sa.in6.sin6_addr.s6_addr[i];
 			}
 
 			/* And zero all the remaining bytes in the IP. */
@@ -1201,19 +1128,16 @@ const char* User::GetCIDRMask(int 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;
+			v4.s_addr = client_sa.in4.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.
@@ -1243,53 +1167,32 @@ const char* User::GetCIDRMask(int range)
 	return ""; // unused, but oh well
 }
 
-const char* User::GetIPString()
+std::string User::GetServerIP()
 {
-	static char buf[40];
-
-	if (this->ip == NULL)
-		return "";
-
-	if (!this->cachedip.empty())
-		return this->cachedip.c_str();
+	int port;
+	std::string ip;
+	irc::sockets::satoap(&server_sa, ip, port);
+	return ip;
+}
 
-	switch (this->GetProtocolFamily())
+const char* User::GetIPString()
+{
+	int port;
+	if (cachedip.empty())
 	{
-#ifdef SUPPORT_IP6LINKS
-		case AF_INET6:
-		{
-			static char temp[1024];
-
-			sockaddr_in6* sin = (sockaddr_in6*)this->ip;
-			inet_ntop(sin->sin6_family, &sin->sin6_addr, buf, sizeof(buf));
-			/* IP addresses starting with a : on irc are a Bad Thing (tm) */
-			if (*buf == ':')
-			{
-				strlcpy(&temp[1], buf, sizeof(temp) - 1);
-				*temp = '0';
-				this->cachedip = temp;
-				return temp;
-			}
-
-			this->cachedip = buf;
-			return buf;
-		}
-		break;
-#endif
-		case AF_INET:
-		{
-			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;
+		irc::sockets::satoap(&client_sa, cachedip, port);
+		/* IP addresses starting with a : on irc are a Bad Thing (tm) */
+		if (cachedip.c_str()[0] == ':')
+			cachedip.insert(0,1,'0');
 	}
 
-	// Unreachable, probably
-	return "";
+	return cachedip.c_str();
+}
+
+bool User::SetClientIP(const char* sip)
+{
+	this->cachedip = "";
+	return irc::sockets::aptosa(sip, 0, &client_sa);
 }
 
 /** NOTE: We cannot pass a const reference to this method.
@@ -1832,10 +1735,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 		{
 			ConnectClass* c = *i;
 
-			if (c->GetDisabled())
-				continue; // can't possibly match, removed from conf
-
-			if (explicit_name == c->GetName())
+			if (explicit_name == c->name)
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Explicitly set to %s", explicit_name.c_str());
 				found = c;
@@ -1848,24 +1748,17 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 		{
 			ConnectClass* c = *i;
 
-			if (c->GetType() == CC_ALLOW)
+			if (c->type == CC_ALLOW)
 			{
-				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
+				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "ALLOW %s %d %s", c->host.c_str(), c->GetPort(), c->GetName().c_str());
 			}
 			else
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "DENY %s %d %s", c->GetHost().c_str(), c->GetPort(), c->GetName().c_str());
 			}
 
-			/* if it's disabled, we can't match this one. */
-			if (c->GetDisabled())
-			{
-				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Class disabled");
-				continue;
-			}
-
 			/* check if host matches.. */
-			if (!InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) &&
+			if (c->GetHost().length() && !InspIRCd::MatchCIDR(this->GetIPString(), c->GetHost(), NULL) &&
 			    !InspIRCd::MatchCIDR(this->host, c->GetHost(), NULL))
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "No host match (for %s)", c->GetHost().c_str());
@@ -1876,7 +1769,7 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 			 * deny change if change will take class over the limit check it HERE, not after we found a matching class,
 			 * because we should attempt to find another class if this one doesn't match us. -- w00t
 			 */
-			if (c->limit && (c->RefCount + 1 >= c->limit))
+			if (c->limit && (c->RefCount >= c->limit))
 			{
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "OOPS: Connect class limit (%lu) hit, denying", c->limit);
 				continue;
@@ -1888,9 +1781,9 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 				ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Requires port (%d)", c->GetPort());
 
 				/* and our port doesn't match, fail. */
-				if (this->GetPort() != c->GetPort())
+				if (this->GetServerPort() != c->GetPort())
 				{
-					ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetPort());
+					ServerInstance->Logs->Log("CONNECTCLASS", DEBUG, "Port match failed (%d)", this->GetServerPort());
 					continue;
 				}
 			}
@@ -1913,6 +1806,8 @@ ConnectClass* User::SetClass(const std::string &explicit_name)
 				return this->MyClass;
 			this->MyClass->RefCount--;
 			ServerInstance->Logs->Log("USERS", DEBUG, "Untying user from connect class -- refcount: %lu", this->MyClass->RefCount);
+			if (MyClass->RefCount == 0)
+				delete MyClass;
 		}
 
 		this->MyClass = found;
@@ -2045,6 +1940,26 @@ void User::DecreasePenalty(int decrease)
 	this->Penalty -= decrease;
 }
 
+void FakeUser::SetFakeServer(std::string name)
+{
+	this->nick = name;
+	this->server = nick.c_str();
+}
+
+const std::string FakeUser::GetFullHost()
+{
+	if (*ServerInstance->Config->HideWhoisServer)
+		return ServerInstance->Config->HideWhoisServer;
+	return nick;
+}
+
+const std::string FakeUser::GetFullRealHost()
+{
+	if (*ServerInstance->Config->HideWhoisServer)
+		return ServerInstance->Config->HideWhoisServer;
+	return nick;
+}
+
 VisData::VisData()
 {
 }
@@ -2057,3 +1972,29 @@ bool VisData::VisibleTo(User* user)
 {
 	return true;
 }
+
+
+ConnectClass::ConnectClass(char t, const std::string& mask)
+	: type(t), name("unnamed"), registration_timeout(0), host(mask), pingtime(0), pass(""), hash(""), sendqmax(0), recvqmax(0), maxlocal(0), maxglobal(0), maxchans(0), port(0), limit(0), RefCount(1)
+{
+}
+
+ConnectClass::ConnectClass(char t, const std::string& mask, const ConnectClass& parent)
+	: type(t), name("unnamed"), registration_timeout(parent.registration_timeout), host(mask), pingtime(parent.pingtime), pass(parent.pass), hash(parent.hash), sendqmax(parent.sendqmax), recvqmax(parent.recvqmax), maxlocal(parent.maxlocal), maxglobal(parent.maxglobal), maxchans(parent.maxchans), port(parent.port), limit(parent.limit), RefCount(1)
+{
+}
+
+void ConnectClass::Update(const ConnectClass* src)
+{
+	name = src->name;
+	registration_timeout = src->registration_timeout;
+	host = src->host;
+	pingtime = src->pingtime;
+	pass = src->pass;
+	hash = src->hash;
+	sendqmax = src->sendqmax;
+	recvqmax = src->recvqmax;
+	maxlocal = src->maxlocal;
+	maxglobal = src->maxglobal;
+	limit = src->limit;
+}