X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=693685428bb3340b219cffe20a15b0dd6e624a6f;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=0ad39701fa119c5bebbb75019d56267bdd20d4d1;hpb=cf8a24cd6baf4f8b101fc1d1edf6c0046d2b9b09;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 0ad39701f..693685428 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -25,7 +25,6 @@
 #include "message.h"
 
 extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
 extern time_t TIME;
 
 /* Used when comparing CIDR masks for the modulus bits left over.
@@ -49,10 +48,6 @@ bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mas
 	unsigned int modulus = mask_bits % 8; /* Number of whole bytes in the mask */
 	unsigned int divisor = mask_bits / 8; /* Remaining bits in the mask after whole bytes are dealt with */
 
-	/* We shouldnt match anything, /0 is always valid */
-	if (!mask_bits)
-		return true;
-
 	/* First compare the whole bytes, if they dont match, return false */
 	if (memcmp(address, mask, divisor))
 		return false;
@@ -97,9 +92,10 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern
 		 * of the @ symbol in each */
 		char* address_dupe = strdup(address);
 		char* cidr_dupe = strdup(cidr_mask);
-		
-		char* username_mask_pos = strchr(cidr_dupe, '@');
-		char* username_addr_pos = strchr(address_dupe, '@');
+	
+		/* Use strchr not strrchr, because its going to be nearer to the left */
+		char* username_mask_pos = strrchr(cidr_dupe, '@');
+		char* username_addr_pos = strrchr(address_dupe, '@');
 
 		/* Both strings have an @ symbol in them */
 		if (username_mask_pos && username_addr_pos)
@@ -142,7 +138,8 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern
 	in_addr  mask_in4;
 
 
-	char* bits_chars = strchr(mask,'/');
+	/* Use strrchr for this, its nearer to the right */
+	char* bits_chars = strrchr(mask,'/');
 
 	if (bits_chars)
 	{
@@ -211,6 +208,19 @@ bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_usern
 	return MatchCIDRBits(addr_raw, mask_raw, bits);
 }
 
+inline void Blocking(int s)
+{
+	int flags = fcntl(s, F_GETFL, 0);
+	fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
+}
+
+inline void NonBlocking(int s)
+{
+	int flags = fcntl(s, F_GETFL, 0);
+	fcntl(s, F_SETFL, flags | O_NONBLOCK);
+}
+
+
 /** This will bind a socket to a port. It works for UDP/TCP.
  * It can only bind to IP addresses, if you wish to bind to hostnames
  * you should first resolve them using class 'Resolver'.
@@ -262,7 +272,7 @@ bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port
 	else
 	{
 		log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port);
-		if (listen(sockfd, Config->MaxConn) == -1)
+		if (listen(sockfd, ServerInstance->Config->MaxConn) == -1)
 		{
 			log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
 			return false;
@@ -301,6 +311,7 @@ int OpenTCPSocket()
 
 bool HasPort(int port, char* addr)
 {
+	ServerConfig* Config = ServerInstance->Config;
 	for (unsigned long count = 0; count < ServerInstance->stats->BoundPortCount; count++)
 	{
 		if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr)))
@@ -317,6 +328,7 @@ int BindPorts(bool bail)
 	insp_sockaddr client, server;
 	int clientportcount = 0;
 	int BoundPortCount = 0;
+	ServerConfig* Config = ServerInstance->Config;
 
 	if (!bail)
 	{
@@ -349,19 +361,27 @@ int BindPorts(bool bail)
 				if ((Config->openSockfd[count] = OpenTCPSocket()) == ERROR)
 				{
 					log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[count],Config->addrs[count],Config->ports[count]);
-					return ERROR;
-				}
-				if (!BindSocket(Config->openSockfd[count],client,server,Config->ports[count],Config->addrs[count]))
-				{
-					log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
 				}
 				else
 				{
-					/* Associate the new open port with a slot in the socket engine */
-					if (Config->openSockfd[count] > -1)
+					if (!BindSocket(Config->openSockfd[count],client,server,Config->ports[count],Config->addrs[count]))
+					{
+						log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
+					}
+					else
 					{
-						ServerInstance->SE->AddFd(Config->openSockfd[count],true,X_LISTEN);
-						BoundPortCount++;
+						/* Associate the new open port with a slot in the socket engine */
+						if (Config->openSockfd[count] > -1)
+						{
+							if (!ServerInstance->SE->AddFd(Config->openSockfd[count],true,X_LISTEN))
+							{
+								log(DEFAULT,"ERK! Failed to add listening port to socket engine!");
+								shutdown(Config->openSockfd[count],2);
+								close(Config->openSockfd[count]);
+							}
+							else
+								BoundPortCount++;
+						}
 					}
 				}
 			}
@@ -405,28 +425,20 @@ int BindPorts(bool bail)
 		if ((Config->openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR)
 		{
 			log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[BoundPortCount],Config->addrs[count],Config->ports[count]);
-			return ERROR;
-		}
-
-		if (!BindSocket(Config->openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count]))
-		{
-			log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
 		}
 		else
 		{
-			/* well we at least bound to one socket so we'll continue */
-			BoundPortCount++;
+			if (!BindSocket(Config->openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count]))
+			{
+				log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
+			}
+			else
+			{
+				/* well we at least bound to one socket so we'll continue */
+				BoundPortCount++;
+			}
 		}
 	}
-
-	/* if we didn't bind to anything then abort */
-	if (!BoundPortCount)
-	{
-		log(DEFAULT,"No ports bound, bailing!");
-		printf("\nERROR: Could not bind any of %d ports! Please check your configuration.\n\n", PortCount);
-		return ERROR;
-	}
-
 	return BoundPortCount;
 }