rename net_2_1 to moonlight

[mono.git] / mono / io-layer / sockets.c

diff --git a/mono/io-layer/sockets.c b/mono/io-layer/sockets.c
index 34d71a310cb1be816da0d57fbf6aeff9b6b5c980..16dcb16892f85e5b97427f34e3ca2abdbed4b01c 100644 (file)
--- a/mono/io-layer/sockets.c
+++ b/mono/io-layer/sockets.c
@@ -41,6 +41,9 @@
 #include <netinet/tcp.h>
 #include <netdb.h>
 #include <arpa/inet.h>
+#ifdef HAVE_SYS_SENDFILE_H
+#include <sys/sendfile.h>
+#endif
 
 #undef DEBUG
 
@@ -336,7 +339,7 @@ int _wapi_connect(guint32 fd, const struct sockaddr *serv_addr,
                                if (ok == FALSE) {
                                        /* ECONNRESET means the socket was closed by another thread */
                                        if (errnum != WSAECONNRESET)
-                                               g_warning ("%s: error looking up socket handle %p", __func__, handle);
+                                               g_warning ("%s: error looking up socket handle %p (error %d)", __func__, handle, errnum);
                                } else {
                                        socket_handle->saved_error = errnum;
                                }
@@ -844,7 +847,7 @@ int _wapi_setsockopt(guint32 fd, int level, int optname,
        /* BSD's and MacOS X multicast sockets also need SO_REUSEPORT when SO_REUSEADDR is requested.  */
        if (level == SOL_SOCKET && optname == SO_REUSEADDR) {
                int type;
-               int type_len = sizeof (type);
+               socklen_t type_len = sizeof (type);
 
                if (!getsockopt (fd, level, SO_TYPE, &type, &type_len)) {
                        if (type == SOCK_DGRAM)
@@ -1118,29 +1121,112 @@ static gboolean wapi_disconnectex (guint32 fd, WapiOverlapped *overlapped,
        return(socket_disconnect (fd));
 }
 
-/* NB only supports NULL file handle, NULL buffers and
- * TF_DISCONNECT|TF_REUSE_SOCKET flags to disconnect the socket fd.
- * Shouldn't actually ever need to be called anyway though, because we
- * have DisconnectEx ().
- */
-static gboolean wapi_transmitfile (guint32 fd, gpointer file,
-                                  guint32 num_write, guint32 num_per_send,
-                                  WapiOverlapped *overlapped,
-                                  WapiTransmitFileBuffers *buffers,
-                                  WapiTransmitFileFlags flags)
+#define SF_BUFFER_SIZE 16384
+static gint
+wapi_sendfile (guint32 socket, gpointer fd, guint32 bytes_to_write, guint32 bytes_per_send, guint32 flags)
 {
-#ifdef DEBUG
-       g_message ("%s: called on socket %d!", __func__, fd);
+#if defined(HAVE_SENDFILE) && (defined(__linux__) || defined(DARWIN))
+       gint file = GPOINTER_TO_INT (fd);
+       gint n;
+       gint errnum;
+       gssize res;
+       struct stat statbuf;
+
+       n = fstat (file, &statbuf);
+       if (n == -1) {
+               errnum = errno;
+               errnum = errno_to_WSA (errnum, __func__);
+               WSASetLastError (errnum);
+               return SOCKET_ERROR;
+       }
+       do {
+#ifdef __linux__
+               res = sendfile (socket, file, NULL, statbuf.st_size);
+#elif defined(DARWIN)
+               /* TODO: header/tail could be sent in the 5th argument */
+               /* TODO: Might not send the entire file for non-blocking sockets */
+               res = sendfile (file, socket, 0, &statbuf.st_size, NULL, 0);
+#endif
+       } while (res != -1 && (errno == EINTR || errno == EAGAIN) && !_wapi_thread_cur_apc_pending ());
+       if (res == -1) {
+               errnum = errno;
+               errnum = errno_to_WSA (errnum, __func__);
+               WSASetLastError (errnum);
+               return SOCKET_ERROR;
+       }
+#else
+       /* Default implementation */
+       gint file = GPOINTER_TO_INT (fd);
+       gchar *buffer;
+       gint n;
+
+       buffer = g_malloc (SF_BUFFER_SIZE);
+       do {
+               do {
+                       n = read (file, buffer, SF_BUFFER_SIZE);
+               } while (n == -1 && errno == EINTR && !_wapi_thread_cur_apc_pending ());
+               if (n == -1)
+                       break;
+               if (n == 0) {
+                       g_free (buffer);
+                       return 0; /* We're done reading */
+               }
+               do {
+                       n = send (socket, buffer, n, 0); /* short sends? enclose this in a loop? */
+               } while (n == -1 && errno == EINTR && !_wapi_thread_cur_apc_pending ());
+       } while (n != -1);
+
+       if (n == -1) {
+               gint errnum = errno;
+               errnum = errno_to_WSA (errnum, __func__);
+               WSASetLastError (errnum);
+               g_free (buffer);
+               return SOCKET_ERROR;
+       }
+       g_free (buffer);
 #endif
+       return 0;
+}
+
+gboolean
+TransmitFile (guint32 socket, gpointer file, guint32 bytes_to_write, guint32 bytes_per_send, WapiOverlapped *ol,
+               WapiTransmitFileBuffers *buffers, guint32 flags)
+{
+       gpointer sock = GUINT_TO_POINTER (socket);
+       gint ret;
        
-       g_assert (file == NULL);
-       g_assert (overlapped == NULL);
-       g_assert (buffers == NULL);
-       g_assert (num_write == 0);
-       g_assert (num_per_send == 0);
-       g_assert (flags == (TF_DISCONNECT | TF_REUSE_SOCKET));
+       if (startup_count == 0) {
+               WSASetLastError (WSANOTINITIALISED);
+               return FALSE;
+       }
+       
+       if (_wapi_handle_type (sock) != WAPI_HANDLE_SOCKET) {
+               WSASetLastError (WSAENOTSOCK);
+               return FALSE;
+       }
 
-       return(socket_disconnect (fd));
+       /* Write the header */
+       if (buffers != NULL && buffers->Head != NULL && buffers->HeadLength > 0) {
+               ret = _wapi_send (socket, buffers->Head, buffers->HeadLength, 0);
+               if (ret == SOCKET_ERROR)
+                       return FALSE;
+       }
+
+       ret = wapi_sendfile (socket, file, bytes_to_write, bytes_per_send, flags);
+       if (ret == SOCKET_ERROR)
+               return FALSE;
+
+       /* Write the tail */
+       if (buffers != NULL && buffers->Tail != NULL && buffers->TailLength > 0) {
+               ret = _wapi_send (socket, buffers->Tail, buffers->TailLength, 0);
+               if (ret == SOCKET_ERROR)
+                       return FALSE;
+       }
+
+       if ((flags & TF_DISCONNECT) == TF_DISCONNECT)
+               closesocket (socket);
+
+       return TRUE;
 }
 
 static struct 
@@ -1149,7 +1235,7 @@ static struct
        gpointer func;
 } extension_functions[] = {
        {WSAID_DISCONNECTEX, wapi_disconnectex},
-       {WSAID_TRANSMITFILE, wapi_transmitfile},
+       {WSAID_TRANSMITFILE, TransmitFile},
        {{0}, NULL},
 };
 
@@ -1253,6 +1339,7 @@ WSAIoctl (guint32 fd, gint32 command,
        return(0);
 }
 
+#ifndef PLATFORM_PORT_PROVIDES_IOCTLSOCKET
 int ioctlsocket(guint32 fd, gint32 command, gpointer arg)
 {
        gpointer handle = GUINT_TO_POINTER (fd);
@@ -1425,6 +1512,7 @@ void _wapi_FD_SET(guint32 fd, fd_set *set)
 
        FD_SET (fd, set);
 }
+#endif
 
 static void
 wsabuf_to_msghdr (WapiWSABuf *buffers, guint32 count, struct msghdr *hdr)