Decide that it wasn't quite appropriate :(

[user/henk/code/inspircd.git] / src / socketengine.cpp

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index ceb1090f11dd4579dd0ebf2e23b987beb775630a..ec34bf74e6c1c1fa81fc0daf98a2678bc22fbc86 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2006 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *                <Craig@chatspike.net>
@@ -65,7 +65,10 @@ char SocketEngine::GetType(int fd)
 bool SocketEngine::AddFd(int fd, bool readable, char type)
 {
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+       {
+               log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
                return false;
+       }
        if (GetRemainingFds() <= 1)
        {
                log(DEFAULT,"ERROR: System out of file descriptors!");
@@ -84,7 +87,7 @@ bool SocketEngine::AddFd(int fd, bool readable, char type)
 #ifdef USE_EPOLL
        struct epoll_event ev;
        log(DEBUG,"epoll: Add socket to events, ep=%d socket=%d",EngineHandle,fd);
-       readable ? ev.events = EPOLLIN | EPOLLET : ev.events = EPOLLOUT | EPOLLET;
+       readable ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
        ev.data.fd = fd;
        int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev);
        if (i < 0)
@@ -135,7 +138,7 @@ bool SocketEngine::DelFd(int fd)
 #endif
 #ifdef USE_EPOLL
        struct epoll_event ev;
-       ref[fd] && X_READBIT ? ev.events = EPOLLIN | EPOLLET : ev.events = EPOLLOUT | EPOLLET;
+       ref[fd] && X_READBIT ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
        ev.data.fd = fd;
        int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
        if (i < 0)