#include <mono/metadata/file-io.h>
#include <mono/metadata/threads.h>
#include <mono/metadata/threads-types.h>
+#include <mono/metadata/threadpool-ms-io.h>
#include <mono/utils/mono-poll.h>
/* FIXME change this code to not mess so much with the internals */
#include <mono/metadata/class-internals.h>
-#include <mono/metadata/threadpool-internals.h>
#include <mono/metadata/domain-internals.h>
#include <mono/utils/mono-threads.h>
#include <mono/utils/mono-memory-model.h>
#define LOGDEBUG(...)
/* define LOGDEBUG(...) g_message(__VA_ARGS__) */
-static gint32 convert_family(MonoAddressFamily mono_family)
+static void
+abort_syscall (gpointer data)
{
- gint32 family=-1;
-
- switch(mono_family) {
+ MonoThreadInfo *info = data;
+
+ if (mono_threads_core_needs_abort_syscall ())
+ mono_threads_core_abort_syscall (info);
+}
+
+static gint32
+convert_family (MonoAddressFamily mono_family)
+{
+ switch (mono_family) {
case AddressFamily_Unknown:
case AddressFamily_ImpLink:
case AddressFamily_Pup:
case AddressFamily_Ieee12844:
case AddressFamily_NetworkDesigners:
g_warning("System.Net.Sockets.AddressFamily has unsupported value 0x%x", mono_family);
- break;
-
+ return -1;
case AddressFamily_Unspecified:
- family=AF_UNSPEC;
- break;
-
+ return AF_UNSPEC;
case AddressFamily_Unix:
- family=AF_UNIX;
- break;
-
+ return AF_UNIX;
case AddressFamily_InterNetwork:
- family=AF_INET;
- break;
-
+ return AF_INET;
+ case AddressFamily_AppleTalk:
+ return AF_APPLETALK;
+ case AddressFamily_InterNetworkV6:
+ return AF_INET6;
+ case AddressFamily_DecNet:
+#ifdef AF_DECnet
+ return AF_DECnet;
+#else
+ return -1;
+#endif
case AddressFamily_Ipx:
#ifdef AF_IPX
- family=AF_IPX;
+ return AF_IPX;
+#else
+ return -1;
#endif
- break;
-
case AddressFamily_Sna:
#ifdef AF_SNA
- family=AF_SNA;
-#endif
- break;
-
- case AddressFamily_DecNet:
-#ifdef AF_DECnet
- family=AF_DECnet;
+ return AF_SNA;
+#else
+ return -1;
#endif
- break;
-
- case AddressFamily_AppleTalk:
- family=AF_APPLETALK;
- break;
-
- case AddressFamily_InterNetworkV6:
- family=AF_INET6;
- break;
-
case AddressFamily_Irda:
-#ifdef AF_IRDA
- family=AF_IRDA;
+#ifdef AF_IRDA
+ return AF_IRDA;
+#else
+ return -1;
#endif
- break;
default:
- g_warning("System.Net.Sockets.AddressFamily has unknown value 0x%x", mono_family);
+ g_warning ("System.Net.Sockets.AddressFamily has unknown value 0x%x", mono_family);
+ return -1;
}
-
- return(family);
}
-static MonoAddressFamily convert_to_mono_family(guint16 af_family)
+static MonoAddressFamily
+convert_to_mono_family (guint16 af_family)
{
- MonoAddressFamily family=AddressFamily_Unknown;
-
- switch(af_family) {
+ switch (af_family) {
case AF_UNSPEC:
- family=AddressFamily_Unspecified;
- break;
-
+ return AddressFamily_Unspecified;
case AF_UNIX:
- family=AddressFamily_Unix;
- break;
-
+ return AddressFamily_Unix;
case AF_INET:
- family=AddressFamily_InterNetwork;
- break;
-
+ return AddressFamily_InterNetwork;
#ifdef AF_IPX
case AF_IPX:
- family=AddressFamily_Ipx;
- break;
+ return AddressFamily_Ipx;
#endif
-
#ifdef AF_SNA
case AF_SNA:
- family=AddressFamily_Sna;
- break;
+ return AddressFamily_Sna;
#endif
-
#ifdef AF_DECnet
case AF_DECnet:
- family=AddressFamily_DecNet;
- break;
+ return AddressFamily_DecNet;
#endif
-
case AF_APPLETALK:
- family=AddressFamily_AppleTalk;
- break;
-
+ return AddressFamily_AppleTalk;
case AF_INET6:
- family=AddressFamily_InterNetworkV6;
- break;
-
-#ifdef AF_IRDA
+ return AddressFamily_InterNetworkV6;
+#ifdef AF_IRDA
case AF_IRDA:
- family=AddressFamily_Irda;
- break;
+ return AddressFamily_Irda;
#endif
default:
g_warning("unknown address family 0x%x", af_family);
+ return AddressFamily_Unknown;
}
-
- return(family);
}
-static gint32 convert_type(MonoSocketType mono_type)
+static gint32
+convert_type (MonoSocketType mono_type)
{
- gint32 type=-1;
-
- switch(mono_type) {
+ switch (mono_type) {
case SocketType_Stream:
- type=SOCK_STREAM;
- break;
-
+ return SOCK_STREAM;
case SocketType_Dgram:
- type=SOCK_DGRAM;
- break;
-
+ return SOCK_DGRAM;
case SocketType_Raw:
- type=SOCK_RAW;
- break;
-
+ return SOCK_RAW;
case SocketType_Rdm:
#ifdef SOCK_RDM
- type=SOCK_RDM;
+ return SOCK_RDM;
+#else
+ return -1;
#endif
- break;
-
case SocketType_Seqpacket:
- type=SOCK_SEQPACKET;
- break;
-
+ return SOCK_SEQPACKET;
case SocketType_Unknown:
- g_warning("System.Net.Sockets.SocketType has unsupported value 0x%x", mono_type);
- break;
-
+ g_warning ("System.Net.Sockets.SocketType has unsupported value 0x%x", mono_type);
+ return -1;
default:
- g_warning("System.Net.Sockets.SocketType has unknown value 0x%x", mono_type);
+ g_warning ("System.Net.Sockets.SocketType has unknown value 0x%x", mono_type);
+ return -1;
}
-
- return(type);
}
-static gint32 convert_proto(MonoProtocolType mono_proto)
+static gint32
+convert_proto (MonoProtocolType mono_proto)
{
- gint32 proto=-1;
-
- switch(mono_proto) {
+ switch (mono_proto) {
case ProtocolType_IP:
case ProtocolType_IPv6:
case ProtocolType_Icmp:
case ProtocolType_Udp:
case ProtocolType_Idp:
/* These protocols are known (on my system at least) */
- proto=mono_proto;
- break;
-
+ return mono_proto;
case ProtocolType_ND:
case ProtocolType_Raw:
case ProtocolType_Ipx:
case ProtocolType_Unknown:
/* These protocols arent */
g_warning("System.Net.Sockets.ProtocolType has unsupported value 0x%x", mono_proto);
- break;
-
+ return -1;
default:
- break;
+ return -1;
}
-
- return(proto);
}
/* Convert MonoSocketFlags */
-static gint32 convert_socketflags (gint32 sflags)
+static gint32
+convert_socketflags (gint32 sflags)
{
gint32 flags = 0;
* -1 on error
* -2 on non-fatal error (ie, must ignore)
*/
-static gint32 convert_sockopt_level_and_name(MonoSocketOptionLevel mono_level,
- MonoSocketOptionName mono_name,
- int *system_level,
- int *system_name)
+static gint32
+convert_sockopt_level_and_name(MonoSocketOptionLevel mono_level, MonoSocketOptionName mono_name, int *system_level, int *system_name)
{
switch (mono_level) {
case SocketOptionLevel_Socket:
case SocketOptionName_DropMembership:
*system_name = IPV6_LEAVE_GROUP;
break;
+ case SocketOptionName_IPv6Only:
+#ifdef IPV6_V6ONLY
+ *system_name = IPV6_V6ONLY;
+#else
+ return -1;
+#endif
+ break;
case SocketOptionName_PacketInformation:
#ifdef HAVE_IPV6_PKTINFO
*system_name = IPV6_PKTINFO;
break; /* SocketOptionLevel_IPv6 */
case SocketOptionLevel_Tcp:
- *system_level = mono_networking_get_tcp_protocol ();
+ *system_level = mono_networking_get_tcp_protocol ();
switch(mono_name) {
case SocketOptionName_NoDelay:
return(0);
}
-static MonoImage *get_socket_assembly (void)
+static MonoImage*
+get_socket_assembly (void)
{
MonoDomain *domain = mono_domain_get ();
return domain->socket_assembly;
}
-static gint32 get_family_hint(void)
+static gint32
+get_family_hint (void)
{
MonoDomain *domain = mono_domain_get ();
if (!domain->inet_family_hint) {
+ MonoImage *socket_assembly;
MonoClass *socket_class;
MonoClassField *ipv6_field, *ipv4_field;
gint32 ipv6_enabled = -1, ipv4_enabled = -1;
MonoVTable *vtable;
- socket_class = mono_class_from_name (get_socket_assembly (), "System.Net.Sockets", "Socket");
- ipv4_field = mono_class_get_field_from_name (socket_class, "ipv4Supported");
- ipv6_field = mono_class_get_field_from_name (socket_class, "ipv6Supported");
+ socket_assembly = get_socket_assembly ();
+ g_assert (socket_assembly);
+
+ socket_class = mono_class_from_name (socket_assembly, "System.Net.Sockets", "Socket");
+ g_assert (socket_class);
+
+ ipv4_field = mono_class_get_field_from_name (socket_class, "ipv4_supported");
+ g_assert (ipv4_field);
+
+ ipv6_field = mono_class_get_field_from_name (socket_class, "ipv6_supported");
+ g_assert (ipv6_field);
+
vtable = mono_class_vtable (mono_domain_get (), socket_class);
g_assert (vtable);
+
mono_runtime_class_init (vtable);
mono_field_static_get_value (vtable, ipv4_field, &ipv4_enabled);
}
}
-gpointer ves_icall_System_Net_Sockets_Socket_Socket_internal(MonoObject *this, gint32 family, gint32 type, gint32 proto, gint32 *error)
+gpointer
+ves_icall_System_Net_Sockets_Socket_Socket_internal (MonoObject *this_obj, gint32 family, gint32 type, gint32 proto, gint32 *error)
{
SOCKET sock;
gint32 sock_family;
/* FIXME: the SOCKET parameter (here and in other functions in this
* file) is really an IntPtr which needs to be converted to a guint32.
*/
-void ves_icall_System_Net_Sockets_Socket_Close_internal(SOCKET sock,
- gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Close_internal (SOCKET sock, gint32 *error)
{
LOGDEBUG (g_message ("%s: closing 0x%x", __func__, sock));
/* Clear any pending work item from this socket if the underlying
* polling system does not notify when the socket is closed */
- mono_thread_pool_remove_socket (GPOINTER_TO_INT (sock));
+ mono_threadpool_ms_io_remove_socket (GPOINTER_TO_INT (sock));
closesocket(sock);
}
-gint32 ves_icall_System_Net_Sockets_SocketException_WSAGetLastError_internal(void)
+gint32
+ves_icall_System_Net_Sockets_SocketException_WSAGetLastError_internal(void)
{
LOGDEBUG (g_message("%s: returning %d", __func__, WSAGetLastError()));
return(WSAGetLastError());
}
-gint32 ves_icall_System_Net_Sockets_Socket_Available_internal(SOCKET sock,
- gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_Available_internal(SOCKET sock, gint32 *error)
{
int ret;
int amount;
return(amount);
}
-void ves_icall_System_Net_Sockets_Socket_Blocking_internal(SOCKET sock,
- gboolean block,
- gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Blocking_internal(SOCKET sock, gboolean block, gint32 *error)
{
int ret;
}
}
-gpointer ves_icall_System_Net_Sockets_Socket_Accept_internal(SOCKET sock,
- gint32 *error,
- gboolean blocking)
+gpointer
+ves_icall_System_Net_Sockets_Socket_Accept_internal (SOCKET sock, gint32 *error, gboolean blocking)
{
+ gboolean interrupted;
SOCKET newsock;
- MonoInternalThread* curthread G_GNUC_UNUSED = mono_thread_internal_current ();
- MONO_PREPARE_BLOCKING
-
+
*error = 0;
+
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return NULL;
+ }
+
+ MONO_PREPARE_BLOCKING;
+
#ifdef HOST_WIN32
{
+ MonoInternalThread *curthread = mono_thread_internal_current ();
curthread->interrupt_on_stop = (gpointer)TRUE;
newsock = _wapi_accept (sock, NULL, 0);
curthread->interrupt_on_stop = (gpointer)FALSE;
#else
newsock = _wapi_accept (sock, NULL, 0);
#endif
- MONO_FINISH_BLOCKING
+
+ MONO_FINISH_BLOCKING;
+
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return NULL;
+ }
if(newsock==INVALID_SOCKET) {
*error = WSAGetLastError ();
return(GUINT_TO_POINTER (newsock));
}
-void ves_icall_System_Net_Sockets_Socket_Listen_internal(SOCKET sock,
- guint32 backlog,
- gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Listen_internal(SOCKET sock, guint32 backlog, gint32 *error)
{
int ret;
*error = 0;
-
+
+ MONO_PREPARE_BLOCKING;
+
ret = _wapi_listen (sock, backlog);
+
+ MONO_FINISH_BLOCKING;
+
if(ret==SOCKET_ERROR) {
*error = WSAGetLastError ();
}
return TRUE;
}
-static MonoObject *create_object_from_sockaddr(struct sockaddr *saddr,
- int sa_size, gint32 *error)
+static MonoObject*
+create_object_from_sockaddr(struct sockaddr *saddr, int sa_size, gint32 *error)
{
MonoDomain *domain = mono_domain_get ();
MonoObject *sockaddr_obj;
mono_field_set_value (sockaddr_obj, domain->sockaddr_data_field, data);
return(sockaddr_obj);
+ }
#ifdef HAVE_SYS_UN_H
- } else if (saddr->sa_family == AF_UNIX) {
+ else if (saddr->sa_family == AF_UNIX) {
int i;
for (i = 0; i < sa_size; i++) {
mono_field_set_value (sockaddr_obj, domain->sockaddr_data_field, data);
return sockaddr_obj;
+ }
#endif
- } else {
+ else {
*error = WSAEAFNOSUPPORT;
return(NULL);
}
size = sizeof (struct sockaddr_in);
} else if (family == AF_INET6) {
size = sizeof (struct sockaddr_in6);
+ }
#ifdef HAVE_SYS_UN_H
- } else if (family == AF_UNIX) {
+ else if (family == AF_UNIX) {
size = sizeof (struct sockaddr_un);
-#endif
}
+#endif
return size;
}
-extern MonoObject *ves_icall_System_Net_Sockets_Socket_LocalEndPoint_internal(SOCKET sock, gint32 af, gint32 *error)
+MonoObject*
+ves_icall_System_Net_Sockets_Socket_LocalEndPoint_internal (SOCKET sock, gint32 af, gint32 *error)
{
gchar *sa;
socklen_t salen;
return NULL;
}
sa = (salen <= 128) ? alloca (salen) : g_malloc0 (salen);
- MONO_PREPARE_BLOCKING
+
+ MONO_PREPARE_BLOCKING;
+
ret = _wapi_getsockname (sock, (struct sockaddr *)sa, &salen);
- MONO_FINISH_BLOCKING
+
+ MONO_FINISH_BLOCKING;
if(ret==SOCKET_ERROR) {
*error = WSAGetLastError ();
return result;
}
-extern MonoObject *ves_icall_System_Net_Sockets_Socket_RemoteEndPoint_internal(SOCKET sock, gint32 af, gint32 *error)
+MonoObject*
+ves_icall_System_Net_Sockets_Socket_RemoteEndPoint_internal (SOCKET sock, gint32 af, gint32 *error)
{
gchar *sa;
socklen_t salen;
}
sa = (salen <= 128) ? alloca (salen) : g_malloc0 (salen);
/* Note: linux returns just 2 for AF_UNIX. Always. */
- MONO_PREPARE_BLOCKING
+
+ MONO_PREPARE_BLOCKING;
+
ret = _wapi_getpeername (sock, (struct sockaddr *)sa, &salen);
- MONO_FINISH_BLOCKING
+
+ MONO_FINISH_BLOCKING;
+
if(ret==SOCKET_ERROR) {
*error = WSAGetLastError ();
if (salen > 128)
return result;
}
-static struct sockaddr *create_sockaddr_from_object(MonoObject *saddr_obj,
- socklen_t *sa_size,
- gint32 *error)
+static struct sockaddr*
+create_sockaddr_from_object(MonoObject *saddr_obj, socklen_t *sa_size, gint32 *error)
{
MonoClassField *field;
MonoArray *data;
*sa_size = sizeof(struct sockaddr_in6);
return((struct sockaddr *)sa);
+ }
#ifdef HAVE_SYS_UN_H
- } else if (family == AF_UNIX) {
+ else if (family == AF_UNIX) {
struct sockaddr_un *sock_un;
int i;
*sa_size = len;
return (struct sockaddr *)sock_un;
+ }
#endif
- } else {
+ else {
*error = WSAEAFNOSUPPORT;
return(0);
}
}
-extern void ves_icall_System_Net_Sockets_Socket_Bind_internal(SOCKET sock, MonoObject *sockaddr, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Bind_internal (SOCKET sock, MonoObject *sockaddr, gint32 *error)
{
struct sockaddr *sa;
socklen_t sa_size;
LOGDEBUG (g_message("%s: binding to %s port %d", __func__, inet_ntoa(((struct sockaddr_in *)sa)->sin_addr), ntohs (((struct sockaddr_in *)sa)->sin_port)));
ret = _wapi_bind (sock, sa, sa_size);
+
if(ret==SOCKET_ERROR) {
*error = WSAGetLastError ();
}
ves_icall_System_Net_Sockets_Socket_Poll_internal (SOCKET sock, gint mode,
gint timeout, gint32 *error)
{
- MonoInternalThread *thread = NULL;
+ MonoInternalThread *thread = mono_thread_internal_current ();
mono_pollfd *pfds;
int ret;
+ gboolean interrupted;
time_t start;
-
+
+ *error = 0;
+
pfds = g_new0 (mono_pollfd, 1);
- pfds[0].fd = GPOINTER_TO_INT (sock);
- pfds[0].events = (mode == SelectModeRead) ? MONO_POLLIN :
- (mode == SelectModeWrite) ? MONO_POLLOUT :
- (MONO_POLLERR | MONO_POLLHUP | MONO_POLLNVAL);
+ pfds->fd = GPOINTER_TO_INT (sock);
+
+ switch (mode) {
+ case SelectModeRead: pfds->events = MONO_POLLIN; break;
+ case SelectModeWrite: pfds->events = MONO_POLLOUT; break;
+ default: pfds->events = MONO_POLLERR | MONO_POLLHUP | MONO_POLLNVAL; break;
+ }
timeout = (timeout >= 0) ? (timeout / 1000) : -1;
start = time (NULL);
+
do {
- *error = 0;
-
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted) {
+ g_free (pfds);
+ *error = WSAEINTR;
+ return FALSE;
+ }
+
+ MONO_PREPARE_BLOCKING;
+
ret = mono_poll (pfds, 1, timeout);
+
+ MONO_FINISH_BLOCKING;
+
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted) {
+ g_free (pfds);
+ *error = WSAEINTR;
+ return FALSE;
+ }
+
if (timeout > 0 && ret < 0) {
int err = errno;
int sec = time (NULL) - start;
errno = err;
}
-
- if (ret == -1 && errno == EINTR) {
- int leave = 0;
- if (thread == NULL) {
- thread = mono_thread_internal_current ();
- }
-
- leave = mono_thread_test_state (thread, ThreadState_AbortRequested | ThreadState_StopRequested);
-
- if (leave != 0) {
+ if (ret == -1 && errno == EINTR) {
+ if (mono_thread_test_state (thread, ThreadState_AbortRequested | ThreadState_StopRequested)) {
g_free (pfds);
- return(FALSE);
- } else {
- /* Suspend requested? */
- mono_thread_interruption_checkpoint ();
+ return FALSE;
}
+
+ /* Suspend requested? */
+ mono_thread_interruption_checkpoint ();
+
errno = EINTR;
}
} while (ret == -1 && errno == EINTR);
*error = errno_to_WSA (errno, __func__);
#endif
g_free (pfds);
- return(FALSE);
+ return FALSE;
}
-
- g_free (pfds);
- if (ret == 0) {
- return(FALSE);
- } else {
- return (TRUE);
- }
+ g_free (pfds);
+ return ret != 0;
}
-extern void ves_icall_System_Net_Sockets_Socket_Connect_internal(SOCKET sock, MonoObject *sockaddr, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Connect_internal (SOCKET sock, MonoObject *sockaddr, gint32 *error)
{
struct sockaddr *sa;
socklen_t sa_size;
int ret;
-
+ gboolean interrupted;
+
*error = 0;
-
- sa=create_sockaddr_from_object(sockaddr, &sa_size, error);
- if (*error != 0) {
+
+ sa = create_sockaddr_from_object(sockaddr, &sa_size, error);
+ if (*error != 0)
return;
- }
-
+
LOGDEBUG (g_message("%s: connecting to %s port %d", __func__, inet_ntoa(((struct sockaddr_in *)sa)->sin_addr), ntohs (((struct sockaddr_in *)sa)->sin_port)));
- MONO_PREPARE_BLOCKING
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return;
+ }
+
+ MONO_PREPARE_BLOCKING;
+
ret = _wapi_connect (sock, sa, sa_size);
- MONO_FINISH_BLOCKING
- if(ret==SOCKET_ERROR) {
- *error = WSAGetLastError ();
+ MONO_FINISH_BLOCKING;
+
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return;
}
+ if (ret == SOCKET_ERROR)
+ *error = WSAGetLastError ();
+
g_free(sa);
}
typedef BOOL (WINAPI *LPFN_TRANSMITFILE)(SOCKET, HANDLE, DWORD, DWORD, LPOVERLAPPED, LPTRANSMIT_FILE_BUFFERS, DWORD);
#endif
-extern void ves_icall_System_Net_Sockets_Socket_Disconnect_internal(SOCKET sock, MonoBoolean reuse, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Disconnect_internal (SOCKET sock, MonoBoolean reuse, gint32 *error)
{
int ret;
glong output_bytes = 0;
GUID trans_guid = WSAID_TRANSMITFILE;
LPFN_DISCONNECTEX _wapi_disconnectex = NULL;
LPFN_TRANSMITFILE _wapi_transmitfile = NULL;
- gboolean bret;
- MONO_PREPARE_BLOCKING
-
+ gboolean interrupted;
+
*error = 0;
-
+
LOGDEBUG (g_message("%s: disconnecting from socket %p (reuse %d)", __func__, sock, reuse));
+ MONO_PREPARE_BLOCKING;
+
/* I _think_ the extension function pointers need to be looked
* up for each socket. FIXME: check the best way to store
* pointers to functions in managed objects that still works
* on 64bit platforms.
*/
- ret = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER,
- (void *)&disco_guid, sizeof(GUID),
- (void *)&_wapi_disconnectex, sizeof(void *),
- &output_bytes, NULL, NULL);
+ ret = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER, (void *)&disco_guid, sizeof(GUID),
+ (void *)&_wapi_disconnectex, sizeof(void *), &output_bytes, NULL, NULL);
+
+ MONO_FINISH_BLOCKING;
+
if (ret != 0) {
/* make sure that WSAIoctl didn't put crap in the
* output pointer
*/
_wapi_disconnectex = NULL;
+ MONO_PREPARE_BLOCKING;
+
/*
* Use the SIO_GET_EXTENSION_FUNCTION_POINTER to
* determine the address of the disconnect method without
* For an explanation of why this is done, you can read
* the article at http://www.codeproject.com/internet/jbsocketserver3.asp
*/
- ret = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER,
- (void *)&trans_guid, sizeof(GUID),
- (void *)&_wapi_transmitfile, sizeof(void *),
- &output_bytes, NULL, NULL);
- if (ret != 0) {
+ ret = WSAIoctl (sock, SIO_GET_EXTENSION_FUNCTION_POINTER, (void *)&trans_guid, sizeof(GUID),
+ (void *)&_wapi_transmitfile, sizeof(void *), &output_bytes, NULL, NULL);
+
+ MONO_FINISH_BLOCKING;
+
+ if (ret != 0)
_wapi_transmitfile = NULL;
- }
}
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return;
+ }
+
+ MONO_PREPARE_BLOCKING;
+
if (_wapi_disconnectex != NULL) {
- bret = _wapi_disconnectex (sock, NULL, TF_REUSE_SOCKET, 0);
+ if (!_wapi_disconnectex (sock, NULL, TF_REUSE_SOCKET, 0))
+ *error = WSAGetLastError ();
} else if (_wapi_transmitfile != NULL) {
- bret = _wapi_transmitfile (sock, NULL, 0, 0, NULL, NULL,
- TF_DISCONNECT | TF_REUSE_SOCKET);
+ if (!_wapi_transmitfile (sock, NULL, 0, 0, NULL, NULL, TF_DISCONNECT | TF_REUSE_SOCKET))
+ *error = WSAGetLastError ();
} else {
*error = ERROR_NOT_SUPPORTED;
- bret = TRUE; //we don't want the following bret check to change *error
}
- if (bret == FALSE) {
- *error = WSAGetLastError ();
- }
+ MONO_FINISH_BLOCKING;
- MONO_FINISH_BLOCKING
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted)
+ *error = WSAEINTR;
}
-gint32 ves_icall_System_Net_Sockets_Socket_Receive_internal(SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_Receive_internal (SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, gint32 *error)
{
int ret;
guchar *buf;
gint32 alen;
int recvflags=0;
+ gboolean interrupted;
MonoInternalThread* curthread G_GNUC_UNUSED = mono_thread_internal_current ();
*error = 0;
return (0);
}
- MONO_PREPARE_BLOCKING
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted)
+ return 0;
+
+ MONO_PREPARE_BLOCKING;
+
#ifdef HOST_WIN32
{
curthread->interrupt_on_stop = (gpointer)TRUE;
#else
ret = _wapi_recv (sock, buf, count, recvflags);
#endif
- MONO_FINISH_BLOCKING
+
+ MONO_FINISH_BLOCKING;
+
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return 0;
+ }
if(ret==SOCKET_ERROR) {
*error = WSAGetLastError ();
return(ret);
}
-gint32 ves_icall_System_Net_Sockets_Socket_Receive_array_internal(SOCKET sock, MonoArray *buffers, gint32 flags, gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_Receive_array_internal (SOCKET sock, MonoArray *buffers, gint32 flags, gint32 *error)
{
int ret, count;
+ gboolean interrupted;
DWORD recv;
WSABUF *wsabufs;
DWORD recvflags = 0;
*error = WSAEOPNOTSUPP;
return(0);
}
-
+
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return 0;
+ }
+
+ MONO_PREPARE_BLOCKING;
+
ret = WSARecv (sock, wsabufs, count, &recv, &recvflags, NULL, NULL);
+
+ MONO_FINISH_BLOCKING;
+
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return 0;
+ }
+
if (ret == SOCKET_ERROR) {
*error = WSAGetLastError ();
- return(0);
+ return 0;
}
-
- return(recv);
+
+ return recv;
}
-gint32 ves_icall_System_Net_Sockets_Socket_RecvFrom_internal(SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, MonoObject **sockaddr, gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_ReceiveFrom_internal (SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, MonoObject **sockaddr, gint32 *error)
{
int ret;
guchar *buf;
int recvflags=0;
struct sockaddr *sa;
socklen_t sa_size;
+ gboolean interrupted;
*error = 0;
return (0);
}
- MONO_PREPARE_BLOCKING
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted) {
+ g_free(sa);
+ *error = WSAEINTR;
+ return 0;
+ }
+
+ MONO_PREPARE_BLOCKING;
+
ret = _wapi_recvfrom (sock, buf, count, recvflags, sa, &sa_size);
- MONO_FINISH_BLOCKING
+
+ MONO_FINISH_BLOCKING;
+
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted) {
+ g_free(sa);
+ *error = WSAEINTR;
+ return 0;
+ }
if(ret==SOCKET_ERROR) {
g_free(sa);
return(ret);
}
-gint32 ves_icall_System_Net_Sockets_Socket_Send_internal(SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_Send_internal (SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, gint32 *error)
{
int ret;
guchar *buf;
gint32 alen;
int sendflags=0;
+ gboolean interrupted;
*error = 0;
return (0);
}
- MONO_PREPARE_BLOCKING
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return 0;
+ }
+
+ MONO_PREPARE_BLOCKING;
+
ret = _wapi_send (sock, buf, count, sendflags);
- MONO_FINISH_BLOCKING
+
+ MONO_FINISH_BLOCKING;
+
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return 0;
+ }
+
if(ret==SOCKET_ERROR) {
*error = WSAGetLastError ();
return(0);
return(ret);
}
-gint32 ves_icall_System_Net_Sockets_Socket_Send_array_internal(SOCKET sock, MonoArray *buffers, gint32 flags, gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_Send_array_internal(SOCKET sock, MonoArray *buffers, gint32 flags, gint32 *error)
{
int ret, count;
DWORD sent;
WSABUF *wsabufs;
DWORD sendflags = 0;
+ gboolean interrupted;
*error = 0;
*error = WSAEOPNOTSUPP;
return(0);
}
-
+
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return 0;
+ }
+
+ MONO_PREPARE_BLOCKING;
+
ret = WSASend (sock, wsabufs, count, &sent, sendflags, NULL, NULL);
+
+ MONO_FINISH_BLOCKING;
+
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return 0;
+ }
+
if (ret == SOCKET_ERROR) {
*error = WSAGetLastError ();
return(0);
return(sent);
}
-gint32 ves_icall_System_Net_Sockets_Socket_SendTo_internal(SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, MonoObject *sockaddr, gint32 *error)
+gint32
+ves_icall_System_Net_Sockets_Socket_SendTo_internal(SOCKET sock, MonoArray *buffer, gint32 offset, gint32 count, gint32 flags, MonoObject *sockaddr, gint32 *error)
{
int ret;
guchar *buf;
int sendflags=0;
struct sockaddr *sa;
socklen_t sa_size;
+ gboolean interrupted;
*error = 0;
sendflags = convert_socketflags (flags);
if (sendflags == -1) {
+ g_free (sa);
*error = WSAEOPNOTSUPP;
return (0);
}
- MONO_PREPARE_BLOCKING
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted) {
+ g_free (sa);
+ *error = WSAEINTR;
+ return 0;
+ }
+
+ MONO_PREPARE_BLOCKING;
+
ret = _wapi_sendto (sock, buf, count, sendflags, sa, sa_size);
- MONO_FINISH_BLOCKING
+
+ MONO_FINISH_BLOCKING;
+
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted) {
+ g_free (sa);
+ *error = WSAEINTR;
+ return 0;
+ }
+
if(ret==SOCKET_ERROR) {
*error = WSAGetLastError ();
}
MonoSafeHandle *safe_handle;
MonoClassField *field;
- field = mono_class_get_field_from_name (sockobj->vtable->klass, "socket");
+ field = mono_class_get_field_from_name (sockobj->vtable->klass, "safe_handle");
safe_handle = ((MonoSafeHandle*) (*(gpointer *)(((char *)sockobj)+field->offset)));
if (safe_handle == NULL)
}
#define POLL_ERRORS (MONO_POLLERR | MONO_POLLHUP | MONO_POLLNVAL)
-void ves_icall_System_Net_Sockets_Socket_Select_internal(MonoArray **sockets, gint32 timeout, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Select_internal (MonoArray **sockets, gint32 timeout, gint32 *error)
{
- MonoInternalThread *thread = NULL;
+ MonoInternalThread *thread = mono_thread_internal_current ();
MonoObject *obj;
mono_pollfd *pfds;
int nfds, idx;
MonoArray *socks;
time_t start;
uintptr_t socks_size;
+ gboolean interrupted;
+
+ *error = 0;
/* *sockets -> READ, null, WRITE, null, ERROR, null */
count = mono_array_length (*sockets);
timeout = (timeout >= 0) ? (timeout / 1000) : -1;
start = time (NULL);
do {
- *error = 0;
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted) {
+ g_free (pfds);
+ *error = WSAEINTR;
+ return;
+ }
+
+ MONO_PREPARE_BLOCKING;
+
ret = mono_poll (pfds, nfds, timeout);
+
+ MONO_FINISH_BLOCKING;
+
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted) {
+ g_free (pfds);
+ *error = WSAEINTR;
+ return;
+ }
+
if (timeout > 0 && ret < 0) {
int err = errno;
int sec = time (NULL) - start;
}
if (ret == -1 && errno == EINTR) {
- int leave = 0;
- if (thread == NULL)
- thread = mono_thread_internal_current ();
-
- leave = mono_thread_test_state (thread, ThreadState_AbortRequested | ThreadState_StopRequested);
-
- if (leave != 0) {
+ if (mono_thread_test_state (thread, ThreadState_AbortRequested | ThreadState_StopRequested)) {
g_free (pfds);
*sockets = NULL;
return;
- } else {
- /* Suspend requested? */
- mono_thread_interruption_checkpoint ();
}
+
+ /* Suspend requested? */
+ mono_thread_interruption_checkpoint ();
+
errno = EINTR;
}
} while (ret == -1 && errno == EINTR);
}
-void ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal(SOCKET sock, gint32 level, gint32 name, MonoObject **obj_val, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal (SOCKET sock, gint32 level, gint32 name, MonoObject **obj_val, gint32 *error)
{
int system_level = 0;
int system_name = 0;
*obj_val = int_to_object (domain, 0);
return;
}
-
+
+ MONO_PREPARE_BLOCKING;
+
/* No need to deal with MulticastOption names here, because
* you cant getsockopt AddMembership or DropMembership (the
* int getsockopt will error, causing an exception)
switch(name) {
case SocketOptionName_Linger:
case SocketOptionName_DontLinger:
- ret = _wapi_getsockopt(sock, system_level, system_name, &linger,
- &lingersize);
+ ret = _wapi_getsockopt(sock, system_level, system_name, &linger, &lingersize);
break;
case SocketOptionName_SendTimeout:
#ifdef SO_PEERCRED
case SocketOptionName_PeerCred:
- ret = _wapi_getsockopt (sock, system_level, system_name, &cred,
- &credsize);
+ ret = _wapi_getsockopt (sock, system_level, system_name, &cred, &credsize);
break;
#endif
default:
- ret = _wapi_getsockopt (sock, system_level, system_name, &val,
- &valsize);
+ ret = _wapi_getsockopt (sock, system_level, system_name, &val, &valsize);
}
-
+
+ MONO_FINISH_BLOCKING;
+
if(ret==SOCKET_ERROR) {
*error = WSAGetLastError ();
return;
*obj_val=obj;
}
-void ves_icall_System_Net_Sockets_Socket_GetSocketOption_arr_internal(SOCKET sock, gint32 level, gint32 name, MonoArray **byte_val, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_GetSocketOption_arr_internal (SOCKET sock, gint32 level, gint32 name, MonoArray **byte_val, gint32 *error)
{
int system_level = 0;
int system_name = 0;
valsize=mono_array_length(*byte_val);
buf=mono_array_addr(*byte_val, guchar, 0);
-
+
+ MONO_PREPARE_BLOCKING;
+
ret = _wapi_getsockopt (sock, system_level, system_name, buf, &valsize);
+
+ MONO_FINISH_BLOCKING;
+
if(ret==SOCKET_ERROR) {
*error = WSAGetLastError ();
}
#if defined(__APPLE__) || defined(__FreeBSD__)
-#if defined(HAVE_GETIFADDRS) && defined(HAVE_IF_NAMETOINDEX)
static int
get_local_interface_id (int family)
{
+#if !defined(HAVE_GETIFADDRS) || !defined(HAVE_IF_NAMETOINDEX)
+ return 0;
+#else
struct ifaddrs *ifap = NULL, *ptr;
int idx = 0;
freeifaddrs (ifap);
return idx;
-}
-#else
-static int
-get_local_interface_id (int family)
-{
- return 0;
-}
#endif
+}
#endif /* defined(__APPLE__) || defined(__FreeBSD__) */
-void ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal(SOCKET sock, gint32 level, gint32 name, MonoObject *obj_val, MonoArray *byte_val, gint32 int_val, gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_SetSocketOption_internal (SOCKET sock, gint32 level, gint32 name, MonoObject *obj_val, MonoArray *byte_val, gint32 int_val, gint32 *error)
{
struct linger linger;
int system_level = 0;
}
}
-void ves_icall_System_Net_Sockets_Socket_Shutdown_internal(SOCKET sock,
- gint32 how,
- gint32 *error)
+void
+ves_icall_System_Net_Sockets_Socket_Shutdown_internal(SOCKET sock, gint32 how, gint32 *error)
{
int ret;
- MONO_PREPARE_BLOCKING
+ gboolean interrupted;
*error = 0;
-
- /* Currently, the values for how (recv=0, send=1, both=2) match
- * the BSD API
- */
+
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return;
+ }
+
+ MONO_PREPARE_BLOCKING;
+
+ /* Currently, the values for how (recv=0, send=1, both=2) match the BSD API */
ret = _wapi_shutdown (sock, how);
- if(ret==SOCKET_ERROR) {
- *error = WSAGetLastError ();
+
+ MONO_FINISH_BLOCKING;
+
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted) {
+ *error = WSAEINTR;
+ return;
}
- MONO_FINISH_BLOCKING
+ if (ret == SOCKET_ERROR)
+ *error = WSAGetLastError ();
}
gint
-ves_icall_System_Net_Sockets_Socket_WSAIoctl (SOCKET sock, gint32 code,
- MonoArray *input,
- MonoArray *output, gint32 *error)
+ves_icall_System_Net_Sockets_Socket_IOControl_internal (SOCKET sock, gint32 code, MonoArray *input, MonoArray *output, gint32 *error)
{
glong output_bytes = 0;
gchar *i_buffer, *o_buffer;
o_len = mono_array_length (output);
}
+ MONO_PREPARE_BLOCKING;
+
ret = WSAIoctl (sock, code, i_buffer, i_len, o_buffer, o_len, &output_bytes, NULL, NULL);
+
+ MONO_FINISH_BLOCKING;
+
if (ret == SOCKET_ERROR) {
*error = WSAGetLastError ();
return(-1);
}
static gboolean
-addrinfo_to_IPHostEntry(MonoAddressInfo *info, MonoString **h_name,
- MonoArray **h_aliases,
- MonoArray **h_addr_list,
- gboolean add_local_ips)
+addrinfo_to_IPHostEntry(MonoAddressInfo *info, MonoString **h_name, MonoArray **h_aliases, MonoArray **h_addr_list, gboolean add_local_ips)
{
gint32 count, i;
MonoAddressEntry *ai = NULL;
}
}
-MonoBoolean ves_icall_System_Net_Dns_GetHostByName_internal(MonoString *host, MonoString **h_name, MonoArray **h_aliases, MonoArray **h_addr_list)
+MonoBoolean
+ves_icall_System_Net_Dns_GetHostByName_internal (MonoString *host, MonoString **h_name, MonoArray **h_aliases, MonoArray **h_addr_list)
{
gboolean add_local_ips = FALSE, add_info_ok = TRUE;
gchar this_hostname [256];
MonoAddressInfo *info = NULL;
char *hostname = mono_string_to_utf8 (host);
- MONO_PREPARE_BLOCKING
+ int hint = get_addrinfo_family_hint ();
if (*hostname == '\0') {
add_local_ips = TRUE;
*h_name = host;
}
+
if (!add_local_ips && gethostname (this_hostname, sizeof (this_hostname)) != -1) {
if (!strcmp (hostname, this_hostname)) {
add_local_ips = TRUE;
}
}
- if (*hostname && mono_get_address_info (hostname, 0, MONO_HINT_CANONICAL_NAME | get_addrinfo_family_hint (), &info))
+ if (*hostname && mono_get_address_info (hostname, 0, MONO_HINT_CANONICAL_NAME | hint, &info))
add_info_ok = FALSE;
g_free(hostname);
- MONO_FINISH_BLOCKING
if (add_info_ok)
return addrinfo_to_IPHostEntry(info, h_name, h_aliases, h_addr_list, add_local_ips);
return FALSE;
}
-extern MonoBoolean ves_icall_System_Net_Dns_GetHostByAddr_internal(MonoString *addr, MonoString **h_name, MonoArray **h_aliases, MonoArray **h_addr_list)
+MonoBoolean
+ves_icall_System_Net_Dns_GetHostByAddr_internal (MonoString *addr, MonoString **h_name, MonoArray **h_aliases, MonoArray **h_addr_list)
{
char *address;
struct sockaddr_in saddr;
struct sockaddr_in6 saddr6;
MonoAddressInfo *info = NULL;
gint32 family;
- char hostname[NI_MAXHOST] = {0};
- int flags = 0;
+ gchar hostname[NI_MAXHOST] = { 0 };
+ gboolean ret;
address = mono_string_to_utf8 (addr);
- if (inet_pton (AF_INET, address, &saddr.sin_addr ) <= 0) {
- /* Maybe an ipv6 address */
- if (inet_pton (AF_INET6, address, &saddr6.sin6_addr) <= 0) {
- g_free (address);
- return FALSE;
- }
- else {
- family = AF_INET6;
- saddr6.sin6_family = AF_INET6;
- }
- }
- else {
+ if (inet_pton (AF_INET, address, &saddr.sin_addr ) == 1) {
family = AF_INET;
saddr.sin_family = AF_INET;
+ } else if (inet_pton (AF_INET6, address, &saddr6.sin6_addr) == 1) {
+ family = AF_INET6;
+ saddr6.sin6_family = AF_INET6;
+ } else {
+ g_free (address);
+ return FALSE;
}
- g_free(address);
- if(family == AF_INET) {
+ g_free (address);
+
+ MONO_PREPARE_BLOCKING;
+
+ switch (family) {
+ case AF_INET: {
#if HAVE_SOCKADDR_IN_SIN_LEN
saddr.sin_len = sizeof (saddr);
#endif
- if(getnameinfo ((struct sockaddr*)&saddr, sizeof(saddr),
- hostname, sizeof(hostname), NULL, 0,
- flags) != 0) {
- return(FALSE);
- }
- } else if(family == AF_INET6) {
+ ret = getnameinfo ((struct sockaddr*)&saddr, sizeof(saddr), hostname, sizeof(hostname), NULL, 0, 0) == 0;
+ break;
+ }
+ case AF_INET6: {
#if HAVE_SOCKADDR_IN6_SIN_LEN
saddr6.sin6_len = sizeof (saddr6);
#endif
- if(getnameinfo ((struct sockaddr*)&saddr6, sizeof(saddr6),
- hostname, sizeof(hostname), NULL, 0,
- flags) != 0) {
- return(FALSE);
- }
+ ret = getnameinfo ((struct sockaddr*)&saddr6, sizeof(saddr6), hostname, sizeof(hostname), NULL, 0, 0) == 0;
+ break;
+ }
+ default:
+ g_assert_not_reached ();
}
- if (mono_get_address_info (hostname, 0, get_addrinfo_family_hint () | MONO_HINT_CANONICAL_NAME | MONO_HINT_CONFIGURED_ONLY, &info))
+ MONO_FINISH_BLOCKING;
+
+ if (!ret)
+ return FALSE;
+
+ if (mono_get_address_info (hostname, 0, get_addrinfo_family_hint () | MONO_HINT_CANONICAL_NAME | MONO_HINT_CONFIGURED_ONLY, &info) != 0)
return FALSE;
- return(addrinfo_to_IPHostEntry (info, h_name, h_aliases, h_addr_list, FALSE));
+ return addrinfo_to_IPHostEntry (info, h_name, h_aliases, h_addr_list, FALSE);
}
-extern MonoBoolean ves_icall_System_Net_Dns_GetHostName_internal(MonoString **h_name)
+MonoBoolean
+ves_icall_System_Net_Dns_GetHostName_internal (MonoString **h_name)
{
- gchar hostname[256];
+ gchar hostname[NI_MAXHOST] = { 0 };
int ret;
-
+
ret = gethostname (hostname, sizeof (hostname));
- if(ret==-1) {
- return(FALSE);
- }
-
- *h_name=mono_string_new(mono_domain_get (), hostname);
+ if (ret == -1)
+ return FALSE;
- return(TRUE);
+ *h_name = mono_string_new(mono_domain_get (), hostname);
+
+ return TRUE;
}
gboolean
-ves_icall_System_Net_Sockets_Socket_SendFile (SOCKET sock, MonoString *filename, MonoArray *pre_buffer, MonoArray *post_buffer, gint flags)
+ves_icall_System_Net_Sockets_Socket_SendFile_internal (SOCKET sock, MonoString *filename, MonoArray *pre_buffer, MonoArray *post_buffer, gint flags)
{
HANDLE file;
gint32 error;
+ gboolean ret;
+ gboolean interrupted;
TRANSMIT_FILE_BUFFERS buffers;
if (filename == NULL)
return FALSE;
+ /* FIXME: replace file by a proper fd that we can call open and close on, as they are interruptible */
+
file = ves_icall_System_IO_MonoIO_Open (filename, FileMode_Open, FileAccess_Read, FileShare_Read, 0, &error);
+
if (file == INVALID_HANDLE_VALUE) {
SetLastError (error);
return FALSE;
buffers.TailLength = mono_array_length (post_buffer);
}
- if (!TransmitFile (sock, file, 0, 0, NULL, &buffers, flags)) {
+ mono_thread_info_install_interrupt (abort_syscall, mono_thread_info_current (), &interrupted);
+ if (interrupted) {
+ CloseHandle (file);
+ SetLastError (WSAEINTR);
+ return FALSE;
+ }
+
+ MONO_PREPARE_BLOCKING;
+
+ ret = TransmitFile (sock, file, 0, 0, NULL, &buffers, flags);
+
+ MONO_FINISH_BLOCKING;
+
+ mono_thread_info_uninstall_interrupt (&interrupted);
+ if (interrupted) {
CloseHandle (file);
+ SetLastError (WSAEINTR);
return FALSE;
}
+ MONO_PREPARE_BLOCKING;
+
CloseHandle (file);
- return TRUE;
+
+ MONO_FINISH_BLOCKING;
+
+ return ret;
}
-void mono_network_init(void)
+void
+mono_network_init(void)
{
mono_networking_init ();
}
-void mono_network_cleanup(void)
+void
+mono_network_cleanup(void)
{
_wapi_cleanup_networking ();
mono_networking_shutdown ();
{
MonoInternalThread *internal = thread->internal_thread;
- if (mono_thread_info_new_interrupt_enabled ()) {
- mono_thread_info_abort_socket_syscall_for_close ((MonoNativeThreadId)(gsize)internal->tid);
- } else {
-#ifndef HOST_WIN32
- internal->ignore_next_signal = TRUE;
- mono_thread_kill (internal, mono_thread_get_abort_signal ());
-#endif
- }
+ mono_thread_info_abort_socket_syscall_for_close ((MonoNativeThreadId)(gsize)internal->tid);
}
#endif /* #ifndef DISABLE_SOCKETS */
projects / mono.git / blobdiff