X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine.cpp;h=af2f1b16972b33fbfb340730ba8926f3a8965c2d;hb=06e0d5c7f0f78c489090fe5f0c18a91e8cb41ae8;hp=f17d2f1c5cffd5f9e734de9771bd129e52ee996d;hpb=af70c6767612942ded955e6e4e2edb709930050d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index f17d2f1c5..af2f1b169 100644
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 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,30 +11,64 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDsocketengine */
+/* $Core */
 
 /*********        DEFAULTS       **********/
-/* $ExtraSources: socketengine_select.cpp */
+
+/* $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: socketengine_kqueue.cpp */
+/* $ExtraSources: socketengines/socketengine_kqueue.cpp */
 /* $ExtraObjects: socketengine_kqueue.o */
 /* $EndIf */
 
 /* $If: USE_EPOLL */
-/* $ExtraSources: socketengine_epoll.cpp */
+/* $ExtraSources: socketengines/socketengine_epoll.cpp */
 /* $ExtraObjects: socketengine_epoll.o */
 /* $EndIf */
 
 /* $If: USE_PORTS */
-/* $ExtraSources: socketengine_ports.cpp */
+/* $ExtraSources: socketengines/socketengine_ports.cpp */
 /* $ExtraObjects: socketengine_ports.o */
 /* $EndIf */
 
 #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;
@@ -61,7 +95,9 @@ void SocketEngine::WantWrite(EventHandler* eh)
 
 SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance)
 {
-	memset(ref, 0, sizeof(ref));
+	TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0;
+	lastempty = ServerInstance->Time();
+	indata = outdata = 0;
 }
 
 SocketEngine::~SocketEngine()
@@ -113,7 +149,7 @@ std::string SocketEngine::GetName()
 }
 
 bool SocketEngine::BoundsCheckFd(EventHandler* eh)
-{       
+{
 	if (!eh)
 		return false;
 	if ((eh->GetFd() < 0) || (eh->GetFd() > MAX_DESCRIPTORS))
@@ -121,17 +157,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)
 {
@@ -140,24 +165,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);
+	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)
@@ -167,24 +210,26 @@ 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(), buf, len, flags, from, fromlen);
 }
 
-#endif
-
 int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags)
 {
-	return send(fd->GetFd(), (const char*)buf, len, flags);
+	this->UpdateStats(0, len);
+	return send(fd->GetFd(), buf, len, flags);
 }
 
 int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags)
 {
-	return recv(fd->GetFd(), (char*)buf, len, flags);
+	this->UpdateStats(len, 0);
+	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)
 {
-	return sendto(fd->GetFd(), (const char*)buf, len, flags, to, tolen);
+	this->UpdateStats(0, len);
+	return sendto(fd->GetFd(), buf, len, flags, to, tolen);
 }
 
 int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen)
@@ -216,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;
+}