Changed channel user lists from vector to map

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2780 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 10 insertions, 17 deletions

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index b690c2d87..35626fbb9 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -646,7 +646,8 @@ int InspIRCd::Run()
 					uslen = sizeof(sock_us);
 					length = sizeof(client);
 					incomingSockfd = accept (activefds[activefd],(struct sockaddr*)&client,&length);
-					if (!getsockname(incomingSockfd,(sockaddr*)&sock_us,&uslen))
+					
+					if ((incomingSockfd > -1) && (!getsockname(incomingSockfd,(sockaddr*)&sock_us,&uslen)))
 					{
 						in_port = ntohs(sock_us.sin_port);
 						log(DEBUG,"Accepted socket %d",incomingSockfd);
@@ -655,29 +656,21 @@ int InspIRCd::Run()
 						 * using gethostbyaddr(). That is sucky and we
 						 * don't do that any more...
 						 */
-						if (incomingSockfd >= 0)
+						NonBlocking(incomingSockfd);
+						if (Config->GetIOHook(in_port))
 						{
-							NonBlocking(incomingSockfd);
-							if (Config->GetIOHook(in_port))
-							{
-								Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, target, in_port);
-							}
-							stats->statsAccept++;
-							AddClient(incomingSockfd, target, in_port, false, target);
-							log(DEBUG,"Adding client on port %lu fd=%lu",(unsigned long)in_port,(unsigned long)incomingSockfd);
-						}
-						else
-						{
-							WriteOpers("*** WARNING: accept() failed on port %lu (%s)",(unsigned long)in_port,target);
-							log(DEBUG,"accept failed: %lu",(unsigned long)in_port);
-							stats->statsRefused++;
+							Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, target, in_port);
 						}
+						stats->statsAccept++;
+						AddClient(incomingSockfd, target, in_port, false, target);
+						log(DEBUG,"Adding client on port %lu fd=%lu",(unsigned long)in_port,(unsigned long)incomingSockfd);
 					}
 					else
 					{
-						log(DEBUG,"Couldnt look up the port number for fd %lu (OS BROKEN?!)",incomingSockfd);
+						log(DEBUG,"Accept failed on fd %lu: %s",(unsigned long)incomingSockfd,strerror(errno));
 						shutdown(incomingSockfd,2);
 						close(incomingSockfd);
+						stats->statsRefused++;
 					}
 				break;