summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-10-31 20:43:47 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-10-31 20:43:47 +0000
commitdc5d99a9543f5027cc5d4f4ffc5716eaf7e933ec (patch)
tree03065bb40ae22b6935a0694af67b69fd2cb5619e /src
parent84fe55db1605dbb5907c1a5cb149302f17717a10 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/socketengine_epoll.cpp2
-rw-r--r--src/socketengine_select.cpp13
2 files changed, 13 insertions, 2 deletions
diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index 618f30592..c1aab07d8 100644
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -138,6 +138,7 @@ int EPollEngine::DispatchEvents()
ServerInstance->Log(DEBUG,"Handle %s event on fd %d",events[j].events & EPOLLOUT ? "write" : "read", events[j].data.fd);
if (events[j].events & EPOLLHUP)
{
+ ServerInstance->Log(DEBUG,"Handle error event on fd %d", events[j].data.fd);
ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, 0);
continue;
}
@@ -146,6 +147,7 @@ int EPollEngine::DispatchEvents()
/* Get error number */
if (getsockopt(events[j].data.fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
errcode = errno;
+ ServerInstance->Log(DEBUG,"Handle error event on fd %d: %s", events[j].data.fd, strerror(errcode));
ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, errcode);
continue;
}
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()])
{