X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=a86c6f824aafdee5af99035e45f6c472bd02b1dd;hb=8096138d9a5d809f064090a82783d424be3d64b1;hp=f532b60d1c325e776b1820fb499a415be824db44;hpb=b2723d2577b124d5a3ed188b01136a3eae9e9343;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index f532b60d1..a86c6f824 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -886,7 +886,7 @@ void User::CheckClass()
 	this->MaxChans = a->GetMaxChans();
 }
 
-void User::CheckLines()
+bool User::CheckLines()
 {
 	const char* check[] = { "G" , "K", NULL };
 
@@ -899,10 +899,12 @@ void User::CheckLines()
 			if (r)
 			{
 				r->Apply(this);
-				return;
+				return true;
 			}
 		}
 	}
+
+	return false;
 }
 
 void User::FullConnect()
@@ -927,7 +929,8 @@ 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.c_str());
@@ -1098,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[40];
+
+	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:
+		{
+			struct in6_addr v6;
+	 
+			if(range > 128)
+			{
+				printf("Error, range given (%d) larger than address length (128)\n", range);
+				return 0;
+			}
+	 
+			if(inet_pton(AF_INET6, this->GetIPString(), &v6))
+			{
+				/* unsigned char s6_addr[16]; */
+				int i;
+				int bytestoblank;
+				int extrabits;
+				char buffer[64];
+
+				if(range > 0)
+				{
+					/* (128 - range) bits must be blanked, so ((128 - range) / 8) of the bytes, working backwards, must be blanked. */
+					bytestoblank = (128 - range) / 8;
+	 
+					/* ((128 - range) % 8) bits of the next byte must also be blanked. */
+					extrabits = (128 - range) % 8;
+					v6.s6_addr[15 - bytestoblank] = (v6.s6_addr[15 - bytestoblank] >> extrabits) << extrabits;
+
+					for(i = 0; i < bytestoblank; i++)
+					{
+						v6.s6_addr[15 - i] = 0;
+					}
+				}
+				else
+				{
+					for(i = 0; i < 15; i++)
+					{
+						v6.s6_addr[i] = 0;
+					}
+				}
+
+				sprintf(buf, "%s/%d\n", inet_ntop(AF_INET6, &v6, buffer, 64), range);
+				return buf;
+			}
+			else
+			{
+				throw "CIDR mask for v6 failed";
+			}
+
+		}
+		break;
+#endif
+		case AF_INET:
+		{
+			struct in_addr v4;
+
+			if (range > 32)
+				throw "more than 32 bits on an ipv4 connection, can't do that..";
+
+			if(inet_pton(AF_INET, this->GetIPString(), &v4))
+			{
+				char buffer[16];
+				uint32_t temp;
+
+				/* (32 - range) is the number of bits we are *ignoring*. We shift this left and then right to wipe off these bits. */
+
+				if(range > 0)
+				{
+					temp = ntohl(v4.s_addr);
+					temp = (temp >> (32 - range)) << (32 - range);
+					v4.s_addr = htonl(temp);
+				}
+				else
+				{
+					v4.s_addr = 0;
+				}
+
+				sprintf(buf, "%s/%d\n", inet_ntop(AF_INET, &v4, buffer, 16), range);
+				return buf;
+			}
+			else
+			{
+				throw "CIDR mask for v4 failed";
+			}
+		}
+		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 "";