X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=eadfc73d3e7b1bebdfb28afdc3304180d095d814;hb=e0e1becc2f9129203966e69b2919582c11ab86f7;hp=3cb2626528da71a29ae34b2a58de539e9b498a0f;hpb=cdbc474bbc09d699821185d32283801b24a72183;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengine.cpp b/src/socketengine.cpp index 3cb262652..eadfc73d3 100644 --- a/src/socketengine.cpp +++ b/src/socketengine.cpp @@ -1,43 +1,51 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2007 Burlex + * Copyright (C) 2007 Dennis Friis * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $Core: libIRCDsocketengine */ -/********* DEFAULTS **********/ -/* $ExtraSources: socketengines/socketengine_select.cpp */ -/* $ExtraObjects: socketengine_select.o */ +#include "inspircd.h" -/* $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 */ +/** Reference table, contains all current handlers + **/ +std::vector SocketEngine::ref; -/* $If: USE_PORTS */ -/* $ExtraSources: socketengines/socketengine_ports.cpp */ -/* $ExtraObjects: socketengine_ports.o */ -/* $EndIf */ +/** Current number of descriptors in the engine + */ +size_t SocketEngine::CurrentSetSize = 0; -#include "inspircd.h" -#include "socketengine.h" +/** List of handlers that want a trial read/write + */ +std::set SocketEngine::trials; -int EventHandler::GetFd() +int SocketEngine::MAX_DESCRIPTORS; + +/** Socket engine statistics: count of various events, bandwidth usage + */ +SocketEngine::Statistics SocketEngine::stats; + +EventHandler::EventHandler() { - return this->fd; + fd = -1; + event_mask = 0; } void EventHandler::SetFd(int FD) @@ -45,80 +53,90 @@ void EventHandler::SetFd(int FD) this->fd = FD; } -bool EventHandler::Readable() +void SocketEngine::ChangeEventMask(EventHandler* eh, int change) { - return true; -} + int old_m = eh->event_mask; + int new_m = old_m; -bool EventHandler::Writeable() -{ - return false; -} + // 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; -void SocketEngine::WantWrite(EventHandler* eh) -{ -} + // 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()); -SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance) -{ - TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0; - lastempty = time(NULL); - indata = outdata = 0; -} + new_m |= change; + if (new_m == old_m) + return; -SocketEngine::~SocketEngine() -{ + 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) +bool SocketEngine::AddFdRef(EventHandler* eh) { - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) + int fd = eh->GetFd(); + if (HasFd(fd)) return false; - return ref[fd]; -} -EventHandler* SocketEngine::GetRef(int fd) -{ - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) - return 0; - return ref[fd]; -} - -bool SocketEngine::DelFd(EventHandler* eh, bool force) -{ + while (static_cast(fd) >= ref.size()) + ref.resize(ref.empty() ? 1 : (ref.size() * 2)); + ref[fd] = eh; + CurrentSetSize++; return true; } -int SocketEngine::GetMaxFds() -{ - return 0; -} - -int SocketEngine::GetRemainingFds() +void SocketEngine::DelFdRef(EventHandler *eh) { - return 0; + int fd = eh->GetFd(); + if (GetRef(fd) == eh) + { + ref[fd] = NULL; + CurrentSetSize--; + } } -int SocketEngine::DispatchEvents() +bool SocketEngine::HasFd(int fd) { - return 0; + return GetRef(fd) != NULL; } -std::string SocketEngine::GetName() +EventHandler* SocketEngine::GetRef(int fd) { - return "misconfigured"; + if (fd < 0 || static_cast(fd) >= ref.size()) + return NULL; + return ref[fd]; } bool SocketEngine::BoundsCheckFd(EventHandler* eh) -{ +{ if (!eh) return false; - if ((eh->GetFd() < 0) || (eh->GetFd() > MAX_DESCRIPTORS)) + if (eh->GetFd() < 0) return false; return true; } @@ -129,18 +147,17 @@ int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen) return accept(fd->GetFd(), addr, addrlen); } -int SocketEngine::Close(EventHandler* fd) +int SocketEngine::Close(EventHandler* eh) { -#ifdef WINDOWS - return closesocket(fd->GetFd()); -#else - return close(fd->GetFd()); -#endif + DelFd(eh); + int ret = Close(eh->GetFd()); + eh->SetFd(-1); + return ret; } int SocketEngine::Close(int fd) { -#ifdef WINDOWS +#ifdef _WIN32 return closesocket(fd); #else return close(fd); @@ -149,18 +166,18 @@ int SocketEngine::Close(int fd) int SocketEngine::Blocking(int fd) { -#ifdef WINDOWS +#ifdef _WIN32 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); + return fcntl(fd, F_SETFL, flags & ~O_NONBLOCK); #endif } int SocketEngine::NonBlocking(int fd) { -#ifdef WINDOWS +#ifdef _WIN32 unsigned long opt = 1; return ioctlsocket(fd, FIONBIO, &opt); #else @@ -169,38 +186,79 @@ 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; + setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on)); } 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 nbRecvd = recvfrom(fd->GetFd(), (char*)buf, len, flags, from, fromlen); + if (nbRecvd > 0) + stats.Update(nbRecvd, 0); + return nbRecvd; } 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); + int nbSent = send(fd->GetFd(), (const char*)buf, len, flags); + if (nbSent > 0) + stats.Update(0, nbSent); + return nbSent; } 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 nbRecvd = recv(fd->GetFd(), (char*)buf, len, flags); + if (nbRecvd > 0) + stats.Update(nbRecvd, 0); + return nbRecvd; } 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); + int nbSent = sendto(fd->GetFd(), (const char*)buf, len, flags, to, tolen); + if (nbSent > 0) + stats.Update(0, nbSent); + return nbSent; +} + +int SocketEngine::WriteV(EventHandler* fd, const IOVector* iovec, int count) +{ + int sent = writev(fd->GetFd(), iovec, count); + if (sent > 0) + stats.Update(0, sent); + return sent; } +#ifdef _WIN32 +int SocketEngine::WriteV(EventHandler* fd, const iovec* iovec, int count) +{ + // On Windows the fields in iovec are not in the order required by the Winsock API; IOVector has + // the fields in the correct order. + // Create temporary IOVectors from the iovecs and pass them to the WriteV() method that accepts the + // platform's native struct. + IOVector wiovec[128]; + count = std::min(count, static_cast(sizeof(wiovec) / sizeof(IOVector))); + + for (int i = 0; i < count; i++) + { + wiovec[i].iov_len = iovec[i].iov_len; + wiovec[i].iov_base = reinterpret_cast(iovec[i].iov_base); + } + return WriteV(fd, wiovec, count); +} +#endif + int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen) { - return connect(fd->GetFd(), serv_addr, addrlen); + int ret = connect(fd->GetFd(), serv_addr, addrlen); +#ifdef _WIN32 + if ((ret == SOCKET_ERROR) && (WSAGetLastError() == WSAEWOULDBLOCK)) + errno = EINPROGRESS; +#endif + return ret; } int SocketEngine::Shutdown(EventHandler* fd, int how) @@ -208,9 +266,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) @@ -223,26 +281,59 @@ int SocketEngine::Shutdown(int fd, int how) return shutdown(fd, how); } -void SocketEngine::RecoverFromFork() +void SocketEngine::Statistics::Update(size_t len_in, size_t len_out) { + CheckFlush(); + indata += len_in; + outdata += len_out; } -void SocketEngine::UpdateStats(size_t len_in, size_t len_out) +void SocketEngine::Statistics::CheckFlush() const { - if (lastempty + 1 > time(NULL)) + // Reset the in/out byte counters if it has been more than a second + time_t now = ServerInstance->Time(); + if (lastempty != now) { - lastempty = time(NULL); + lastempty = now; indata = outdata = 0; } - indata += len_in; - outdata += len_out; } -void SocketEngine::GetStats(float &kbitpersec_in, float &kbitpersec_out, float &kbitpersec_total) +void SocketEngine::Statistics::GetBandwidth(float& kbitpersec_in, float& kbitpersec_out, float& kbitpersec_total) const { + CheckFlush(); 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; } + +std::string SocketEngine::LastError() +{ +#ifndef _WIN32 + return strerror(errno); +#else + char szErrorString[500]; + DWORD dwErrorCode = WSAGetLastError(); + if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), NULL) == 0) + sprintf_s(szErrorString, _countof(szErrorString), "Error code: %u", dwErrorCode); + + std::string::size_type p; + std::string ret = szErrorString; + while ((p = ret.find_last_of("\r\n")) != std::string::npos) + ret.erase(p, 1); + + return ret; +#endif +} + +std::string SocketEngine::GetError(int errnum) +{ +#ifndef _WIN32 + return strerror(errnum); +#else + WSASetLastError(errnum); + return LastError(); +#endif +}