X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=e24378e264262afc35beaba81cbdb4b30abd34b9;hb=55d96bd075818e6da81e91ebd82cd938ec0908b2;hp=187a06541f53f30a6b7a8be8763216d695408914;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 187a06541..e24378e26 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2010 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -11,67 +11,12 @@ * --------------------------------------------------- */ -/* $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" EventHandler::EventHandler() { - this->IOHook = NULL; -} - -bool EventHandler::AddIOHook(Module *IOHooker) -{ - if (this->IOHook) - return false; - - this->IOHook = IOHooker; - return true; -} - -bool EventHandler::DelIOHook() -{ - if (!this->IOHook) - return false; - - this->IOHook = NULL; - return true; -} - -Module *EventHandler::GetIOHook() -{ - return this->IOHook; -} - -int EventHandler::GetFd() -{ - return this->fd; + fd = -1; + event_mask = 0; } void EventHandler::SetFd(int FD) @@ -79,21 +24,7 @@ void EventHandler::SetFd(int FD) this->fd = FD; } -bool EventHandler::Readable() -{ - return true; -} - -bool EventHandler::Writeable() -{ - return false; -} - -void SocketEngine::WantWrite(EventHandler* eh) -{ -} - -SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance) +SocketEngine::SocketEngine() { TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0; lastempty = ServerInstance->Time(); @@ -104,55 +35,74 @@ SocketEngine::~SocketEngine() { } -bool SocketEngine::AddFd(EventHandler* eh) +void SocketEngine::SetEventMask(EventHandler* eh, int mask) { - return true; + eh->event_mask = mask; } -bool SocketEngine::HasFd(int fd) +void SocketEngine::ChangeEventMask(EventHandler* eh, int change) { - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) - return false; - return ref[fd]; -} + int old_m = eh->event_mask; + int new_m = old_m; -EventHandler* SocketEngine::GetRef(int fd) -{ - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) - return 0; - return ref[fd]; -} + // 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()); -bool SocketEngine::DelFd(EventHandler* eh, bool force) -{ - return true; -} + new_m |= change; + if (new_m == old_m) + return; -int SocketEngine::GetMaxFds() -{ - return 0; + eh->event_mask = new_m; + OnSetEvent(eh, old_m, new_m); } -int SocketEngine::GetRemainingFds() +void SocketEngine::DispatchTrialWrites() { - return 0; + 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); + } } -int SocketEngine::DispatchEvents() +bool SocketEngine::HasFd(int fd) { - return 0; + if ((fd < 0) || (fd > GetMaxFds())) + return false; + return ref[fd]; } -std::string SocketEngine::GetName() +EventHandler* SocketEngine::GetRef(int fd) { - return "misconfigured"; + if ((fd < 0) || (fd > GetMaxFds())) + return 0; + return ref[fd]; } 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; } @@ -188,7 +138,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 } @@ -203,9 +153,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) @@ -217,7 +173,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) @@ -229,7 +185,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) @@ -242,9 +198,9 @@ int SocketEngine::Shutdown(EventHandler* fd, int how) return shutdown(fd->GetFd(), how); } -int SocketEngine::Bind(int fd, const sockaddr *my_addr, socklen_t addrlen) +int SocketEngine::Bind(int fd, const irc::sockets::sockaddrs& addr) { - return bind(fd, my_addr, addrlen); + return bind(fd, &addr.sa, addr.sa_size()); } int SocketEngine::Listen(int sockfd, int backlog)