Fix bug spotted by KingTarquin, if an empty string is given to /stats with "STATS...

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

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index dd80b7f94019a605eb274a8d356400ed63dbdba3..300a08bccca8c4c3fd2fcde7bfe020064e157a13 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -11,12 +11,18 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDsocketengine */
+/* $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 */
@@ -35,6 +41,34 @@
 #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;
@@ -62,6 +96,8 @@ void SocketEngine::WantWrite(EventHandler* eh)
 SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance)
 {
        TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0;
+       lastempty = ServerInstance->Time();
+       indata = outdata = 0;
 }
 
 SocketEngine::~SocketEngine()
@@ -174,21 +210,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)
 {
+       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(), (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);
 }
 
@@ -221,3 +261,23 @@ 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;
+}