kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

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

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 16f303b3dc90f88bdbddaca47e2a19e2e3652ef1..2e4814b360f17ba0c3594eef1cf5ff4808514cc2 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -1,159 +1,85 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 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"
 #ifdef USE_EPOLL
 #include <sys/epoll.h>
-#define EP_DELAY 5
 #endif
 #ifdef USE_KQUEUE
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
 #endif
-
-char ref[65535];
-
-const char X_LISTEN            = 0;
-const char X_ESTAB_CLIENT      = 1;
-const char X_ESTAB_MODULE      = 2;
-const char X_ESTAB_DNS         = 3;
-
-const char X_READBIT           = 0x80;
+#include <vector>
+#include <string>
+#include "socketengine.h"
+#include "helperfuncs.h"
 
 SocketEngine::SocketEngine()
 {
-#ifdef USE_EPOLL
-       EngineHandle = epoll_create(65535);
-#endif
-#ifdef USE_KQUEUE
-       EngineHandle = kqueue();
-#endif
 }
 
 SocketEngine::~SocketEngine()
 {
-#ifdef USE_EPOLL || USE_KQUEUE
-       close(EngineHandle);
-#endif
+       log(DEBUG,"SocketEngine::~SocketEngine()");
+}
+
+char SocketEngine::GetType(int fd)
+{
+       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+               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)
 {
-       this->fds.push_back(fd);
-       if (readable)
-               ref[fd] |= X_READBIT;
-#ifdef USE_EPOLL
-       struct epoll_event ev;
-       log(DEBUG,"epoll: Adduser to events, ep=%d socket=%d",EngineHandle,fd);
-       readable ? ev.events = EPOLLIN | EPOLLET : ev.events = EPOLLOUT | EPOLLET;
-       ev.data.fd = fd;
-       int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev);
-       if (i < 0)
-       {
-               log(DEBUG,"epoll: List insertion failure!");
-               return false;
-       }
-#endif
-#ifdef USE_KQUEUE
-       struct kevent ke;
-       log(DEBUG,"kqueue: Add user to events, kq=%d socket=%d",EngineHandle,fd);
-       EV_SET(&ke, socket, readable ? EVFILT_READ : EVFILT_WRITE, EV_ADD, 0, 0, NULL);
-       int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
-       if (i == -1)
-       {
-               log(DEBUG,"kqueue: List insertion failure!");
-               return false;
-       }
-#endif
-return true;
+       return true;
 }
 
-bool SocketEngine::DelFd(int fd)
+bool SocketEngine::HasFd(int fd)
 {
-       std::vector<int>::iterator i = this->fds.find(fd);
-       if (i != this->fds.end())
-               this->fds.erase(i);
-#ifdef USE_KQUEUE
-       struct kevent ke;
-       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)
-       {
-               log(DEBUG,"kqueue: Failed to remove user from queue!");
+       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
                return false;
-       }
-#endif
-#ifdef USE_EPOLL
-       struct epoll_event ev;
-       ref[fd] && X_READBIT ? ev.events = EPOLLIN | EPOLLET : ev.events = EPOLLOUT | EPOLLET;
-       ev.data.fd = fd;
-       int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
-       if (i < 0)
-       {
-               log(DEBUG,"epoll: List deletion failure!");
-               return false;
-       }
-#endif
-       ref[fd] = 0;
-       return (i != this->fds.end());
+       return (ref[fd] != 0);
 }
 
-bool SocketEngine::Wait(unsigned long millisecs, std::vector<int> &fdlist)
+bool SocketEngine::DelFd(int fd)
 {
-       fdlist.clear();
-#ifdef USE_SELECT
-       int highest_fd = 0;
-       timeval tval;
-       int sresult;
-       for (unsigned int a = 0; a < fds.size(); a++)
-       {
-               if (ref[fds[a]] && X_READBIT)
-               {
-                       FD_SET (fds[a], &rfdset);
-               }
-               else
-               {
-                       FD_SET (fds[a], &wfdset);
-               }
-               
-       }
-       tval.tv_sec = 0;
-       tval.tv_usec = 1000L;
-       sresult = select(FD_SETSIZE, &rfdset, &wfdset, NULL, &tval);
-       if (sresult > 0)
-       {
-               for (unsigned int a = 0; a < fds.size(); a++)
-               {
-                       if ((FD_ISSET (fds[a], &rfdset)) || (FD_ISSET (fds[a], &wfdset)))
-                               fdlist.push_back(fds[a]);
-               }
-       }
-#endif
-#ifdef USE_KQUEUE
-       ts.tv_nsec = 1000L;
-       ts.tv_sec = 0;
-       int i = kevent(EngineHandle, NULL, 0, &ke_list, 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);
-       for (int j = 0; j < i; j++)
-               fdlist.push_back(event[0].data.fd);
-#endif
        return true;
 }
 
+int SocketEngine::GetMaxFds()
+{
+       return 0;
+}
+
+int SocketEngine::GetRemainingFds()
+{
+       return 0;
+}
+
+int SocketEngine::Wait(int* fdlist)
+{
+       return 0;
+}
+
 std::string SocketEngine::GetName()
 {
-#ifdef USE_SELECT
-       return "select";
-#endif
-#ifdef USE_KQUEUE
-       return "kqueue";
-#endif
-#ifdef USE_EPOLL
-       return "epoll";
-#endif
        return "misconfigured";
 }