Add extban +b C: - blocks matching masks from sending CTCP. Allows +e.

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

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index a4b6d7d294e1a3dd13ed9f2c19dca2387c453624..9a007cc2652f865a45e71742d21893e4f236a3c6 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDsocketengine */
+/* $Core */
 
 /*********        DEFAULTS       **********/
 /* $ExtraSources: socketengines/socketengine_select.cpp */
@@ -61,8 +61,9 @@ void SocketEngine::WantWrite(EventHandler* eh)
 
 SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance)
 {
-       memset(ref, 0, sizeof(ref));
        TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0;
+       lastempty = time(NULL);
+       indata = outdata = 0;
 }
 
 SocketEngine::~SocketEngine()
@@ -122,17 +123,6 @@ bool SocketEngine::BoundsCheckFd(EventHandler* eh)
        return true;
 }
 
-#ifdef WINDOWS
-
-int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen) { return -1; }
-int SocketEngine::Close(int fd) { return -1; }
-int SocketEngine::Close(EventHandler* fd) { return -1; }
-int SocketEngine::Blocking(int fd) { return -1; }
-int SocketEngine::NonBlocking(int fd) { return -1; }
-int SocketEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namelen) { return -1; }
-int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, sockaddr *from, socklen_t *fromlen) { return -1; }
-
-#else
 
 int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen)
 {
@@ -141,24 +131,42 @@ int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen)
 
 int SocketEngine::Close(EventHandler* fd)
 {
+#ifdef WINDOWS
+       return closesocket(fd->GetFd());
+#else
        return close(fd->GetFd());
+#endif
 }
 
 int SocketEngine::Close(int fd)
 {
+#ifdef WINDOWS
+       return closesocket(fd);
+#else
        return close(fd);
+#endif
 }
 
 int SocketEngine::Blocking(int fd)
 {
+#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
 }
 
 int SocketEngine::NonBlocking(int fd)
 {
+#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
 }
 
 int SocketEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namelen)
@@ -168,23 +176,25 @@ int SocketEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namel
 
 int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, sockaddr *from, socklen_t *fromlen)
 {
-       return recvfrom(fd->GetFd(), buf, len, flags, from, fromlen);
+       this->UpdateStats(len, 0);
+       return recvfrom(fd->GetFd(), (char*)buf, len, flags, from, fromlen);
 }
 
-#endif
-
 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 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(), (const char*)buf, len, flags, to, tolen);
 }
 
@@ -217,3 +227,23 @@ void SocketEngine::RecoverFromFork()
 {
 }
 
+void SocketEngine::UpdateStats(size_t len_in, size_t len_out)
+{
+       if (lastempty != time(NULL))
+       {
+               lastempty = time(NULL);
+               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;
+}