summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-10-18 18:22:03 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-10-18 18:22:03 +0000
commit08e490f7066b62383983a17f5404a732dfff3870 (patch)
tree5b92bb98079b3087d7b9916159d08922957d3dab
parent8b41eadd920668bc17f543e39bb40f9ee96c098b (diff)
Yay fixed
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8226 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/modules/m_ident.cpp3
-rw-r--r--src/socketengine_epoll.cpp3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 723b30c87..fc663c714 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -175,9 +175,10 @@ class IdentRequestSocket : public EventHandler
{
if (GetFd() > -1)
{
+ ServerInstance->Log(DEBUG,"Close ident socket %d", GetFd());
+ ServerInstance->SE->DelFd(this);
ServerInstance->SE->Close(GetFd());
ServerInstance->SE->Shutdown(GetFd(), SHUT_WR);
- ServerInstance->SE->DelFd(this);
this->SetFd(-1);
}
}
diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index 1cf5bd8c1..55d3cb1ea 100644
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -99,7 +99,10 @@ bool EPollEngine::DelFd(EventHandler* eh, bool force)
int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
if (i < 0 && !force)
+ {
+ ServerInstance->Log(DEBUG,"Cant remove socket: %s", strerror(errno));
return false;
+ }
ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
return true;