Show IP of the user in the quit snomask [dKingston]

[user/henk/code/inspircd.git] / src / socketengine.cpp

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index c0ae3f278945982345107f66a4a46c96fe1e799a..478400d1bc178cc464b972e3314cbf95fd6387d4 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -11,35 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $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()
 {
@@ -62,40 +34,74 @@ SocketEngine::~SocketEngine()
 {
 }
 
-bool SocketEngine::HasFd(int fd)
+void SocketEngine::SetEventMask(EventHandler* eh, int mask)
 {
-       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
-               return false;
-       return ref[fd];
+       eh->event_mask = mask;
 }
 
-EventHandler* SocketEngine::GetRef(int fd)
+void SocketEngine::ChangeEventMask(EventHandler* eh, int change)
 {
-       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
-               return 0;
-       return ref[fd];
+       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);
 }
 
-int SocketEngine::GetMaxFds()
+void SocketEngine::DispatchTrialWrites()
 {
-       return 0;
+       std::vector<int> 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::GetRemainingFds()
+bool SocketEngine::HasFd(int fd)
 {
-       return 0;
+       if ((fd < 0) || (fd > GetMaxFds()))
+               return false;
+       return ref[fd];
 }
 
-int SocketEngine::DispatchEvents()
+EventHandler* SocketEngine::GetRef(int fd)
 {
-       return 0;
+       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;
 }
@@ -146,33 +152,39 @@ 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)
 {
        this->UpdateStats(len, 0);
-       return recvfrom(fd->GetFd(), buf, len, flags, from, fromlen);
+       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(), buf, len, flags);
+       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(), buf, len, flags);
+       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(), 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)