X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=e24378e264262afc35beaba81cbdb4b30abd34b9;hb=55d96bd075818e6da81e91ebd82cd938ec0908b2;hp=71ae4fe9ba5053b10c2a57cdc26e9626a4c2a88a;hpb=e381b06561228aaea752deda20a62c6dc99a560e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 71ae4fe9b..e24378e26 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -2,27 +2,21 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -#include "inspircd_config.h" #include "inspircd.h" -#include -#include -#include "socketengine.h" -int EventHandler::GetFd() +EventHandler::EventHandler() { - return this->fd; + fd = -1; + event_mask = 0; } void EventHandler::SetFd(int FD) @@ -30,66 +24,216 @@ 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; } -SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance) +void SocketEngine::SetEventMask(EventHandler* eh, int mask) { - memset(ref, 0, sizeof(ref)); + eh->event_mask = mask; } -SocketEngine::~SocketEngine() +void SocketEngine::ChangeEventMask(EventHandler* eh, int change) { + int old_m = eh->event_mask; + int new_m = old_m; + + // 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)) - return false; + if ((fd < 0) || (fd > GetMaxFds())) + return 0; return ref[fd]; } -bool SocketEngine::DelFd(EventHandler* eh) +bool SocketEngine::BoundsCheckFd(EventHandler* eh) { + if (!eh) + return false; + if ((eh->GetFd() < 0) || (eh->GetFd() > GetMaxFds())) + return false; return true; } -int SocketEngine::GetMaxFds() + +int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen) +{ + return accept(fd->GetFd(), addr, addrlen); +} + +int SocketEngine::Close(EventHandler* fd) { - return 0; +#ifdef WINDOWS + return closesocket(fd->GetFd()); +#else + return close(fd->GetFd()); +#endif } -int SocketEngine::GetRemainingFds() +int SocketEngine::Close(int fd) { - return 0; +#ifdef WINDOWS + return closesocket(fd); +#else + return close(fd); +#endif } -int SocketEngine::Wait(EventHandler** fdlist) +int SocketEngine::Blocking(int fd) { - return 0; +#ifdef WINDOWS + unsigned long opt = 0; + return ioctlsocket(fd, FIONBIO, &opt); +#else + int flags = fcntl(fd, F_GETFL, 0); + return fcntl(fd, F_SETFL, flags & ~O_NONBLOCK); +#endif } -std::string SocketEngine::GetName() +int SocketEngine::NonBlocking(int fd) { - return "misconfigured"; +#ifdef WINDOWS + unsigned long opt = 1; + return ioctlsocket(fd, FIONBIO, &opt); +#else + int flags = fcntl(fd, F_GETFL, 0); + return fcntl(fd, F_SETFL, flags | O_NONBLOCK); +#endif } +void SocketEngine::SetReuse(int fd) +{ + 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) +{ + this->UpdateStats(len, 0); + return recvfrom(fd->GetFd(), (char*)buf, len, flags, from, fromlen); +} + +int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags) +{ + this->UpdateStats(0, len); + return send(fd->GetFd(), (char*)buf, len, flags); +} + +int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags) +{ + this->UpdateStats(len, 0); + return recv(fd->GetFd(), (char*)buf, len, 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(), (char*)buf, len, flags, to, tolen); +} + +int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen) +{ + return connect(fd->GetFd(), serv_addr, addrlen); +} + +int SocketEngine::Shutdown(EventHandler* fd, int how) +{ + return shutdown(fd->GetFd(), how); +} + +int SocketEngine::Bind(int fd, const irc::sockets::sockaddrs& addr) +{ + return bind(fd, &addr.sa, addr.sa_size()); +} + +int SocketEngine::Listen(int sockfd, int backlog) +{ + return listen(sockfd, backlog); +} + +int SocketEngine::Shutdown(int fd, int how) +{ + return shutdown(fd, how); +} + +void SocketEngine::RecoverFromFork() +{ +} + +void SocketEngine::UpdateStats(size_t len_in, size_t len_out) +{ + if (lastempty != ServerInstance->Time()) + { + lastempty = ServerInstance->Time(); + indata = outdata = 0; + } + indata += len_in; + outdata += len_out; +} + +void SocketEngine::GetStats(float &kbitpersec_in, float &kbitpersec_out, float &kbitpersec_total) +{ + UpdateStats(0, 0); /* Forces emptying of the values if its been more than a second */ + float in_kbit = indata * 8; + float out_kbit = outdata * 8; + kbitpersec_total = ((in_kbit + out_kbit) / 1024); + kbitpersec_in = in_kbit / 1024; + kbitpersec_out = out_kbit / 1024; +}