X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=478400d1bc178cc464b972e3314cbf95fd6387d4;hb=2553e4fff7a5a168ef796dcecb73c7365651c897;hp=74f8c18617a464b667430ba3fa46513d12d283a8;hpb=61fed23a3e9a62f19c2f88208585b31356c986ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 74f8c1861..478400d1b 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,60 +11,11 @@ * --------------------------------------------------- */ -/* $Core */ - -/********* DEFAULTS **********/ - -/* $ExtraSources: socketengines/socketengine_select.cpp */ -/* $ExtraObjects: socketengine_select.o */ - -/* $If: USE_POLL */ -/* $ExtraSources: socketengines/socketengine_poll.cpp */ -/* $ExtraObjects: socketengine_poll.o */ -/* $EndIf */ - -/* $If: USE_KQUEUE */ -/* $ExtraSources: socketengines/socketengine_kqueue.cpp */ -/* $ExtraObjects: socketengine_kqueue.o */ -/* $EndIf */ - -/* $If: USE_EPOLL */ -/* $ExtraSources: socketengines/socketengine_epoll.cpp */ -/* $ExtraObjects: socketengine_epoll.o */ -/* $EndIf */ - -/* $If: USE_PORTS */ -/* $ExtraSources: socketengines/socketengine_ports.cpp */ -/* $ExtraObjects: socketengine_ports.o */ -/* $EndIf */ - #include "inspircd.h" -#include "socketengine.h" -bool EventHandler::AddIOHook(Module *IOHooker) +EventHandler::EventHandler() { - if (this->IOHook) - return false; - - this->IOHook = IOHooker; -} - -bool EventHandler::DelIOHook() -{ - if (!this->IOHook) - return false - - this->IOHook = false; -} - -Module *EventHandler::GetIOHook() -{ - return this->IOHook; -} - -int EventHandler::GetFd() -{ - return this->fd; + fd = -1; } void EventHandler::SetFd(int FD) @@ -72,80 +23,85 @@ void EventHandler::SetFd(int FD) this->fd = FD; } -bool EventHandler::Readable() +SocketEngine::SocketEngine() { - return true; + TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0; + lastempty = ServerInstance->Time(); + indata = outdata = 0; } -bool EventHandler::Writeable() +SocketEngine::~SocketEngine() { - return false; } -void SocketEngine::WantWrite(EventHandler* eh) +void SocketEngine::SetEventMask(EventHandler* eh, int mask) { + eh->event_mask = mask; } -SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance) +void SocketEngine::ChangeEventMask(EventHandler* eh, int change) { - TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0; - lastempty = time(NULL); - indata = outdata = 0; -} + int old_m = eh->event_mask; + int new_m = old_m; -SocketEngine::~SocketEngine() -{ + // if we are changing read/write type, remove the previously set bit + if (change & FD_WANT_READ_MASK) + new_m &= ~FD_WANT_READ_MASK; + if (change & FD_WANT_WRITE_MASK) + new_m &= ~FD_WANT_WRITE_MASK; + + // if adding a trial read/write, insert it into the set + if (change & FD_TRIAL_NOTE_MASK && !(old_m & FD_TRIAL_NOTE_MASK)) + trials.insert(eh->GetFd()); + + new_m |= change; + if (new_m == old_m) + return; + + eh->event_mask = new_m; + OnSetEvent(eh, old_m, new_m); } -bool SocketEngine::AddFd(EventHandler* eh) +void SocketEngine::DispatchTrialWrites() { - return true; + std::vector working_list; + working_list.reserve(trials.size()); + working_list.assign(trials.begin(), trials.end()); + trials.clear(); + for(unsigned int i=0; i < working_list.size(); i++) + { + int fd = working_list[i]; + EventHandler* eh = GetRef(fd); + if (!eh) + continue; + int mask = eh->event_mask; + eh->event_mask &= ~(FD_ADD_TRIAL_READ | FD_ADD_TRIAL_WRITE); + if ((mask & (FD_ADD_TRIAL_READ | FD_READ_WILL_BLOCK)) == FD_ADD_TRIAL_READ) + eh->HandleEvent(EVENT_READ, 0); + if ((mask & (FD_ADD_TRIAL_WRITE | FD_WRITE_WILL_BLOCK)) == FD_ADD_TRIAL_WRITE) + eh->HandleEvent(EVENT_WRITE, 0); + } } bool SocketEngine::HasFd(int fd) { - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + if ((fd < 0) || (fd > GetMaxFds())) return false; return ref[fd]; } EventHandler* SocketEngine::GetRef(int fd) { - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + if ((fd < 0) || (fd > GetMaxFds())) return 0; return ref[fd]; } -bool SocketEngine::DelFd(EventHandler* eh, bool force) -{ - return true; -} - -int SocketEngine::GetMaxFds() -{ - return 0; -} - -int SocketEngine::GetRemainingFds() -{ - return 0; -} - -int SocketEngine::DispatchEvents() -{ - return 0; -} - -std::string SocketEngine::GetName() -{ - return "misconfigured"; -} - bool SocketEngine::BoundsCheckFd(EventHandler* eh) -{ +{ if (!eh) return false; - if ((eh->GetFd() < 0) || (eh->GetFd() > MAX_DESCRIPTORS)) + if ((eh->GetFd() < 0) || (eh->GetFd() > GetMaxFds())) return false; return true; } @@ -181,7 +137,7 @@ int SocketEngine::Blocking(int fd) return ioctlsocket(fd, FIONBIO, &opt); #else int flags = fcntl(fd, F_GETFL, 0); - return fcntl(fd, F_SETFL, flags ^ O_NONBLOCK); + return fcntl(fd, F_SETFL, flags & ~O_NONBLOCK); #endif } @@ -196,9 +152,15 @@ int SocketEngine::NonBlocking(int fd) #endif } -int SocketEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namelen) +void SocketEngine::SetReuse(int fd) { - return getsockname(fd->GetFd(), name, namelen); + int on = 1; + struct linger linger = { 0, 0 }; + setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on)); + /* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */ + linger.l_onoff = 1; + linger.l_linger = 1; + setsockopt(fd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger)); } int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, sockaddr *from, socklen_t *fromlen) @@ -210,7 +172,7 @@ int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, s int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags) { this->UpdateStats(0, len); - return send(fd->GetFd(), (const char*)buf, len, flags); + return send(fd->GetFd(), (char*)buf, len, flags); } int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags) @@ -222,7 +184,7 @@ int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags) int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flags, const sockaddr *to, socklen_t tolen) { this->UpdateStats(0, len); - return sendto(fd->GetFd(), (const char*)buf, len, flags, to, tolen); + return sendto(fd->GetFd(), (char*)buf, len, flags, to, tolen); } int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen) @@ -256,9 +218,9 @@ void SocketEngine::RecoverFromFork() void SocketEngine::UpdateStats(size_t len_in, size_t len_out) { - if (lastempty != time(NULL)) + if (lastempty != ServerInstance->Time()) { - lastempty = time(NULL); + lastempty = ServerInstance->Time(); indata = outdata = 0; } indata += len_in;