From dc5d99a9543f5027cc5d4f4ffc5716eaf7e933ec Mon Sep 17 00:00:00 2001
From: brain
Date: Tue, 31 Oct 2006 20:43:47 +0000
Subject: Error set handlin g for select socketengine, tidyup epoll

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5609 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/socketengine_select.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/socketengine_select.cpp')

diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp
index cdd1bdc3c..a26c28e51 100644
--- a/src/socketengine_select.cpp
+++ b/src/socketengine_select.cpp
@@ -103,6 +103,7 @@ int SelectEngine::DispatchEvents()
 
 	FD_ZERO(&wfdset);
 	FD_ZERO(&rfdset);
+	FD_ZERO(&errfdset);
 
 	for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
 	{
@@ -112,15 +113,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);
+	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];
 			}
@@ -136,6 +139,12 @@ int SelectEngine::DispatchEvents()
 	{
 		if (ev[i])
 		{
+			if (FD_ISSET (a->second, &errfdset))
+			{
+				if (ev[i])
+					ev[i]->HandleEvent(EVENT_ERROR, 0);
+				continue;
+			}
 			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()])
 			{
-- 
cgit v1.3.1-10-gc9f91