X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=9d54e8b66818111a8a33a97a9c8c457353698991;hb=5d67a5fff127bf95bca69b436ef7f645f2fe3281;hp=3cb2626528da71a29ae34b2a58de539e9b498a0f;hpb=cdbc474bbc09d699821185d32283801b24a72183;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 3cb262652..9d54e8b66 100644
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -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,7 +96,7 @@ void SocketEngine::WantWrite(EventHandler* eh)
 SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance)
 {
 	TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0;
-	lastempty = time(NULL);
+	lastempty = ServerInstance->Time();
 	indata = outdata = 0;
 }
 
@@ -115,7 +149,7 @@ std::string SocketEngine::GetName()
 }
 
 bool SocketEngine::BoundsCheckFd(EventHandler* eh)
-{       
+{
 	if (!eh)
 		return false;
 	if ((eh->GetFd() < 0) || (eh->GetFd() > MAX_DESCRIPTORS))
@@ -177,25 +211,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);
+	return recvfrom(fd->GetFd(), 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);
+	return send(fd->GetFd(), 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);
+	return recv(fd->GetFd(), 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);
+	return sendto(fd->GetFd(), buf, len, flags, to, tolen);
 }
 
 int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen)
@@ -229,9 +263,9 @@ void SocketEngine::RecoverFromFork()
 
 void SocketEngine::UpdateStats(size_t len_in, size_t len_out)
 {
-	if (lastempty + 1 > time(NULL))
+	if (lastempty != ServerInstance->Time())
 	{
-		lastempty = time(NULL);
+		lastempty = ServerInstance->Time();
 		indata = outdata = 0;
 	}
 	indata += len_in;
@@ -240,6 +274,7 @@ void SocketEngine::UpdateStats(size_t len_in, size_t 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);