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

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index f17d2f1c5..dd80b7f94 100644
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,21 +14,21 @@
 /* $Core: libIRCDsocketengine */
 
 /*********        DEFAULTS       **********/
-/* $ExtraSources: socketengine_select.cpp */
+/* $ExtraSources: socketengines/socketengine_select.cpp */
 /* $ExtraObjects: socketengine_select.o */
 
 /* $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 */
 
@@ -61,7 +61,7 @@ void SocketEngine::WantWrite(EventHandler* eh)
 
 SocketEngine::SocketEngine(InspIRCd* Instance) : ServerInstance(Instance)
 {
-	memset(ref, 0, sizeof(ref));
+	TotalEvents = WriteEvents = ReadEvents = ErrorEvents = 0;
 }
 
 SocketEngine::~SocketEngine()
@@ -121,17 +121,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 +129,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)
@@ -167,11 +174,9 @@ 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);
+	return recvfrom(fd->GetFd(), (char*)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);