From f278bdbbad200b5424c5721ac85ee3dd8d982d60 Mon Sep 17 00:00:00 2001 From: brain Date: Thu, 29 Dec 2005 19:34:18 +0000 Subject: Changed to MAX_DESCRIPTORS git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2700 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/socketengine.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/socketengine.cpp') diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 69838ff59..ceb1090f1 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -29,13 +29,13 @@ #include #include "socketengine.h" -char ref[65535]; +char ref[MAX_DESCRIPTORS]; SocketEngine::SocketEngine() { log(DEBUG,"SocketEngine::SocketEngine()"); #ifdef USE_EPOLL - EngineHandle = epoll_create(65535); + EngineHandle = epoll_create(MAX_DESCRIPTORS); #endif #ifdef USE_KQUEUE EngineHandle = kqueue(); @@ -56,7 +56,7 @@ SocketEngine::~SocketEngine() char SocketEngine::GetType(int fd) { - if ((fd < 0) || (fd > 65535)) + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return X_EMPTY_SLOT; /* Mask off the top bit used for 'read/write' state */ return (ref[fd] & ~0x80); @@ -64,7 +64,7 @@ char SocketEngine::GetType(int fd) bool SocketEngine::AddFd(int fd, bool readable, char type) { - if ((fd < 0) || (fd > 65535)) + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return false; if (GetRemainingFds() <= 1) { @@ -112,7 +112,7 @@ bool SocketEngine::DelFd(int fd) { log(DEBUG,"SocketEngine::DelFd(%d)",fd); - if ((fd < 0) || (fd > 65535)) + if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return false; #ifdef USE_SELECT @@ -210,12 +210,12 @@ int SocketEngine::Wait(int* fdlist) #ifdef USE_KQUEUE ts.tv_nsec = 10000L; ts.tv_sec = 0; - int i = kevent(EngineHandle, NULL, 0, &ke_list[0], 65535, &ts); + int i = kevent(EngineHandle, NULL, 0, &ke_list[0], MAX_DESCRIPTORS, &ts); for (int j = 0; j < i; j++) fdlist[result++] = ke_list[j].ident; #endif #ifdef USE_EPOLL - int i = epoll_wait(EngineHandle, events, 65535, 100); + int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 100); for (int j = 0; j < i; j++) fdlist[result++] = events[j].data.fd; #endif -- cgit v1.3.1-10-gc9f91