Partial fix for bug #441

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

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index d8291073e8735a33cf14b04d870b0993e5a20a72..ce7b1c9deeb59603db68df075ad5fc58683031c7 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -11,6 +11,27 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDsocketengine */
+
+/*********        DEFAULTS       **********/
+/* $ExtraSources: socketengines/socketengine_select.cpp */
+/* $ExtraObjects: socketengine_select.o */
+
+/* $If: USE_KQUEUE */
+/* $ExtraSources: socketengines/socketengine_kqueue.cpp */
+/* $ExtraObjects: socketengine_kqueue.o */
+/* $EndIf */
+
+/* $If: USE_EPOLL */
+/* $ExtraSources: socketengines/socketengine_epoll.cpp */
+/* $ExtraObjects: socketengine_epoll.o */
+/* $EndIf */
+
+/* $If: USE_PORTS */
+/* $ExtraSources: socketengines/socketengine_ports.cpp */
+/* $ExtraObjects: socketengine_ports.o */
+/* $EndIf */
+
 #include "inspircd.h"
 #include "socketengine.h"
 
@@ -100,6 +121,17 @@ 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)
 {
@@ -111,14 +143,26 @@ int SocketEngine::Close(EventHandler* fd)
        return close(fd->GetFd());
 }
 
-int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags)
+int SocketEngine::Close(int fd)
 {
-       return send(fd->GetFd(), buf, len, flags);
+       return close(fd);
 }
 
-int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags)
+int SocketEngine::Blocking(int fd)
+{
+       int flags = fcntl(fd, F_GETFL, 0);
+       return fcntl(fd, F_SETFL, flags ^ O_NONBLOCK);
+}
+
+int SocketEngine::NonBlocking(int fd)
 {
-       return recv(fd->GetFd(), buf, len, flags);
+       int flags = fcntl(fd, F_GETFL, 0);
+       return fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+}
+
+int SocketEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namelen)
+{
+       return getsockname(fd->GetFd(), name, namelen);
 }
 
 int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, sockaddr *from, socklen_t *fromlen)
@@ -126,26 +170,26 @@ int SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, s
        return recvfrom(fd->GetFd(), buf, len, flags, from, fromlen);
 }
 
-int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flags, const sockaddr *to, socklen_t tolen)
+#endif
+
+int SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags)
 {
-       return sendto(fd->GetFd(), buf, len, flags, to, tolen);
+       return send(fd->GetFd(), (const char*)buf, len, flags);
 }
 
-int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen)
+int SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags)
 {
-       return connect(fd->GetFd(), serv_addr, addrlen);
+       return recv(fd->GetFd(), (char*)buf, len, flags);
 }
 
-int SocketEngine::Blocking(int fd)
+int SocketEngine::SendTo(EventHandler* fd, const void *buf, size_t len, int flags, const sockaddr *to, socklen_t tolen)
 {
-       int flags = fcntl(fd, F_GETFL, 0);
-       return fcntl(fd, F_SETFL, flags ^ O_NONBLOCK);
+       return sendto(fd->GetFd(), (const char*)buf, len, flags, to, tolen);
 }
 
-int SocketEngine::NonBlocking(int fd)
+int SocketEngine::Connect(EventHandler* fd, const sockaddr *serv_addr, socklen_t addrlen)
 {
-       int flags = fcntl(fd, F_GETFL, 0);
-       return fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+       return connect(fd->GetFd(), serv_addr, addrlen);
 }
 
 int SocketEngine::Shutdown(EventHandler* fd, int how)
@@ -153,33 +197,21 @@ int SocketEngine::Shutdown(EventHandler* fd, int how)
        return shutdown(fd->GetFd(), how);
 }
 
-
 int SocketEngine::Bind(int fd, const sockaddr *my_addr, socklen_t addrlen)
 {
        return bind(fd, my_addr, addrlen);
 }
 
-int SocketEngine::GetSockName(EventHandler* fd, sockaddr *name, socklen_t* namelen)
-{
-       return getsockname(fd->GetFd(), name, namelen);
-}
-
 int SocketEngine::Listen(int sockfd, int backlog)
 {
        return listen(sockfd, backlog);
 }
 
-
 int SocketEngine::Shutdown(int fd, int how)
 {
        return shutdown(fd, how);
 }
 
-int SocketEngine::Close(int fd)
-{
-       return close(fd);
-}
-
 void SocketEngine::RecoverFromFork()
 {
 }