X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine_select.cpp;h=ef5f2071f82aa2853f9cab99e4435daf36a23db0;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=7a21fab84f086573d3f31bc773dc48b75b261cae;hpb=2a31fe603884449ff08f300fa43dc7c0770b71e2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp
index 7a21fab84..ef5f2071f 100644
--- a/src/socketengine_select.cpp
+++ b/src/socketengine_select.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -21,7 +18,6 @@
 
 SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
-	ServerInstance->Log(DEBUG,"SelectEngine::SelectEngine()");
 	EngineHandle = 0;
 	CurrentSetSize = 0;
 	memset(writeable, 0, sizeof(writeable));
@@ -29,22 +25,16 @@ SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance)
 
 SelectEngine::~SelectEngine()
 {
-	ServerInstance->Log(DEBUG,"SelectEngine::~SelectEngine()");
 }
 
 bool SelectEngine::AddFd(EventHandler* eh)
 {
 	int fd = eh->GetFd();
 	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
-	{
-		ServerInstance->Log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
 		return false;
-	}
+
 	if (GetRemainingFds() <= 1)
-	{
-		ServerInstance->Log(DEFAULT,"ERROR: System out of file descriptors!");
 		return false;
-	}
 
 	fds[fd] = fd;
 
@@ -52,39 +42,33 @@ bool SelectEngine::AddFd(EventHandler* eh)
 		return false;
 
 	ref[fd] = eh;
-	ServerInstance->Log(DEBUG,"Add socket %d",fd);
 
 	CurrentSetSize++;
+
+	ServerInstance->Log(DEBUG,"New file descriptor: %d", fd);
 	return true;
 }
 
 void SelectEngine::WantWrite(EventHandler* eh)
 {
-	int fd = eh->GetFd();
-
-	writeable[fd] = true;
-
-	ServerInstance->Log(DEBUG,"Set %d to writeable", fd);
+	writeable[eh->GetFd()] = true;
 }
 
-bool SelectEngine::DelFd(EventHandler* eh)
+bool SelectEngine::DelFd(EventHandler* eh, bool force)
 {
 	int fd = eh->GetFd();
 
-	ServerInstance->Log(DEBUG,"SelectEngine::DelFd(%d)",fd);
-
 	if ((fd < 0) || (fd > MAX_DESCRIPTORS))
 		return false;
 
 	std::map<int,int>::iterator t = fds.find(fd);
 	if (t != fds.end())
-	{
 		fds.erase(t);
-		ServerInstance->Log(DEBUG,"Deleted fd %d",fd);
-	}
 
 	CurrentSetSize--;
 	ref[fd] = NULL;
+
+	ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
 	return true;
 }
 
@@ -104,9 +88,12 @@ int SelectEngine::DispatchEvents()
 	timeval tval;
 	int sresult = 0;
 	EventHandler* ev[MAX_DESCRIPTORS];
+	socklen_t codesize;
+	int errcode;
 
 	FD_ZERO(&wfdset);
 	FD_ZERO(&rfdset);
+	FD_ZERO(&errfdset);
 
 	for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
 	{
@@ -116,15 +103,17 @@ int SelectEngine::DispatchEvents()
 			FD_SET (a->second, &wfdset);
 		if (writeable[a->second])
 			FD_SET (a->second, &wfdset);
+
+		FD_SET (a->second, &errfdset);
 	}
-	tval.tv_sec = 0;
-	tval.tv_usec = 50L;
-	sresult = select(FD_SETSIZE, &rfdset, &wfdset, NULL, &tval);
+	tval.tv_sec = 1;
+	tval.tv_usec = 0;
+	sresult = select(FD_SETSIZE, &rfdset, &wfdset, &errfdset, &tval);
 	if (sresult > 0)
 	{
 		for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
 		{
-			if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)))
+			if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)) || FD_ISSET (a->second, &errfdset))
 			{
 				ev[result++] = ref[a->second];
 			}
@@ -138,16 +127,34 @@ int SelectEngine::DispatchEvents()
 	 */
 	for (int i = 0; i < result; i++)
 	{
-		ServerInstance->Log(DEBUG,"Handle %s event on fd %d",writeable[ev[i]->GetFd()] || !ev[i]->Readable() ? "write" : "read", ev[i]->GetFd());
-		if (writeable[ev[i]->GetFd()])
+		if (ev[i])
 		{
-			ev[i]->HandleEvent(EVENT_WRITE);
-			writeable[ev[i]->GetFd()] = false;
-
-		}
-		else
-		{
-			ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE);
+			if (FD_ISSET (ev[i]->GetFd(), &errfdset))
+			{
+				if (ev[i])
+				{
+					if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
+						errcode = errno;
+
+					ev[i]->HandleEvent(EVENT_ERROR, errcode);
+				}
+				continue;
+			}
+			if (ev[i])
+			{
+				if (writeable[ev[i]->GetFd()])
+				{
+					if (ev[i])
+						ev[i]->HandleEvent(EVENT_WRITE);
+					writeable[ev[i]->GetFd()] = false;
+
+				}
+				else
+				{
+					if (ev[i])
+						ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE);
+				}
+			}
 		}
 	}