Moved some other stuff into ServerConfig

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

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 0c816943e519267173cf6521031824c1389a26cc..82e79ece34e61a5595508f7472d594503cf33a03 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -1,3 +1,19 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd_config.h"
 #include "globals.h"
 #include "inspircd.h"
@@ -38,11 +54,26 @@ SocketEngine::~SocketEngine()
 #endif
 }
 
+char SocketEngine::GetType(int fd)
+{
+       if ((fd < 0) || (fd > 65535))
+               return X_EMPTY_SLOT;
+       /* Mask off the top bit used for 'read/write' state */
+       return (ref[fd] & ~0x80);
+}
+
 bool SocketEngine::AddFd(int fd, bool readable, char type)
 {
+       if ((fd < 0) || (fd > 65535))
+               return false;
        this->fds.push_back(fd);
+       ref[fd] = type;
        if (readable)
+       {
+               log(DEBUG,"Set readbit");
                ref[fd] |= X_READBIT;
+       }
+       log(DEBUG,"Add socket %d",fd);
 #ifdef USE_EPOLL
        struct epoll_event ev;
        log(DEBUG,"epoll: Add socket to events, ep=%d socket=%d",EngineHandle,fd);
@@ -72,19 +103,24 @@ return true;
 bool SocketEngine::DelFd(int fd)
 {
        log(DEBUG,"SocketEngine::DelFd(%d)",fd);
+
+       if ((fd < 0) || (fd > 65535))
+               return false;
+
        bool found = false;
        for (std::vector<int>::iterator i = fds.begin(); i != fds.end(); i++)
        {
                if (*i == fd)
                {
                        fds.erase(i);
+                       log(DEBUG,"Deleted fd %d",fd);
                        found = true;
                        break;
                }
        }
 #ifdef USE_KQUEUE
        struct kevent ke;
-       EV_SET(&ke, fd, ref[fd] && X_READBIT ? EVFILT_READ : EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+       EV_SET(&ke, fd, ref[fd] & X_READBIT ? EVFILT_READ : EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
        int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
        if (i == -1)
        {
@@ -117,7 +153,7 @@ bool SocketEngine::Wait(std::vector<int> &fdlist)
        int sresult;
        for (unsigned int a = 0; a < fds.size(); a++)
        {
-               if (ref[fds[a]] && X_READBIT)
+               if (ref[fds[a]] & X_READBIT)
                {
                        FD_SET (fds[a], &rfdset);
                }
@@ -128,7 +164,7 @@ bool SocketEngine::Wait(std::vector<int> &fdlist)
                
        }
        tval.tv_sec = 0;
-       tval.tv_usec = 1000L;
+       tval.tv_usec = 100L;
        sresult = select(FD_SETSIZE, &rfdset, &wfdset, NULL, &tval);
        if (sresult > 0)
        {
@@ -140,14 +176,14 @@ bool SocketEngine::Wait(std::vector<int> &fdlist)
        }
 #endif
 #ifdef USE_KQUEUE
-       ts.tv_nsec = 1000L;
+       ts.tv_nsec = 10000L;
        ts.tv_sec = 0;
        int i = kevent(EngineHandle, NULL, 0, &ke_list[0], 65535, &ts);
        for (int j = 0; j < i; j++)
                fdlist.push_back(ke_list[j].ident);
 #endif
 #ifdef USE_EPOLL
-       int i = epoll_wait(EngineHandle, events, 65535, 1);
+       int i = epoll_wait(EngineHandle, events, 65535, 100);
        for (int j = 0; j < i; j++)
                fdlist.push_back(events[j].data.fd);
 #endif