#include <glib.h>
#include <string.h>
#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <errno.h>
#include <mono/metadata/object.h>
#include <mono/metadata/threadpool-internals.h>
#include <mono/metadata/domain-internals.h>
-#include <sys/time.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
flags |= MSG_PEEK;
if (sflags & SocketFlags_DontRoute)
flags |= MSG_DONTROUTE;
+#if 0
+ /* Ignore Partial - see bug 349688. Don't return -1, because
+ * according to the comment in that bug ms runtime doesn't for
+ * UDP sockets (this means we will silently ignore it for TCP
+ * too)
+ */
if (sflags & SocketFlags_Partial)
#ifdef MSG_MORE
flags |= MSG_MORE;
#else
return -1;
+#endif
#endif
if (sflags & SocketFlags_MaxIOVectorLength)
/* FIXME: Don't know what to do for MaxIOVectorLength query */
return(0);
}
-#define STASH_SYS_ASS(this) \
- if(system_assembly == NULL) { \
- system_assembly=mono_image_loaded ("System"); \
- if (!system_assembly) { \
- MonoAssembly *sa = mono_assembly_open ("System.dll", NULL); \
- if (!sa) g_assert_not_reached (); \
- else {system_assembly = mono_assembly_get_image (sa);} \
- } \
+static MonoImage *get_socket_assembly (void)
+{
+ static const char *version = NULL;
+ static gboolean moonlight;
+ static MonoImage *socket_assembly = NULL;
+
+ if (version == NULL) {
+ version = mono_get_runtime_info ()->framework_version;
+ moonlight = !strcmp (version, "2.1");
}
-
-static MonoImage *system_assembly=NULL;
-
+
+ if (socket_assembly == NULL) {
+ if (moonlight) {
+ socket_assembly = mono_image_loaded ("System.Net");
+ if (!socket_assembly) {
+ MonoAssembly *sa = mono_assembly_open ("System.Net.dll", NULL);
+
+ if (!sa) {
+ g_assert_not_reached ();
+ } else {
+ socket_assembly = mono_assembly_get_image (sa);
+ }
+ }
+ } else {
+ socket_assembly = mono_image_loaded ("System");
+ if (!socket_assembly) {
+ MonoAssembly *sa = mono_assembly_open ("System.dll", NULL);
+
+ if (!sa) {
+ g_assert_not_reached ();
+ } else {
+ socket_assembly = mono_assembly_get_image (sa);
+ }
+ }
+ }
+ }
+
+ return(socket_assembly);
+}
#ifdef AF_INET6
static gint32 get_family_hint(void)
{
- MonoClass *socket_class;
- MonoClassField *ipv6_field, *ipv4_field;
- gint32 ipv6_enabled = -1, ipv4_enabled = -1;
- MonoVTable *vtable;
-
- socket_class = mono_class_from_name (system_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");
- vtable = mono_class_vtable (mono_domain_get (), socket_class);
-
- mono_field_static_get_value(vtable, ipv4_field, &ipv4_enabled);
- mono_field_static_get_value(vtable, ipv6_field, &ipv6_enabled);
-
- if(ipv4_enabled == 1 && ipv6_enabled == 1) {
- return(PF_UNSPEC);
- } else if(ipv4_enabled == 1) {
- return(PF_INET);
- } else {
- return(PF_INET6);
+ MonoDomain *domain = mono_domain_get ();
+
+ if (!domain->inet_family_hint) {
+ 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");
+ vtable = mono_class_vtable (mono_domain_get (), socket_class);
+ mono_runtime_class_init (vtable);
+
+ mono_field_static_get_value (vtable, ipv4_field, &ipv4_enabled);
+ mono_field_static_get_value (vtable, ipv6_field, &ipv6_enabled);
+
+ mono_domain_lock (domain);
+ if (ipv4_enabled == 1 && ipv6_enabled == 1) {
+ domain->inet_family_hint = 1;
+ } else if (ipv4_enabled == 1) {
+ domain->inet_family_hint = 2;
+ } else {
+ domain->inet_family_hint = 3;
+ }
+ mono_domain_unlock (domain);
+ }
+ switch (domain->inet_family_hint) {
+ case 1: return PF_UNSPEC;
+ case 2: return PF_INET;
+ case 3: return PF_INET6;
+ default:
+ return PF_UNSPEC;
}
}
#endif
MONO_ARCH_SAVE_REGS;
- STASH_SYS_ASS(this);
-
*error = 0;
sock_family=convert_family(family);
}
#endif
-#ifndef PLATFORM_WIN32
- /* .net seems to set this by default for SOCK_STREAM,
- * not for SOCK_DGRAM (see bug #36322)
- *
- * It seems winsock has a rather different idea of what
- * SO_REUSEADDR means. If it's set, then a new socket can be
- * bound over an existing listening socket. There's a new
- * windows-specific option called SO_EXCLUSIVEADDRUSE but
- * using that means the socket MUST be closed properly, or a
- * denial of service can occur. Luckily for us, winsock
- * behaves as though any other system would when SO_REUSEADDR
- * is true, so we don't need to do anything else here. See
- * bug 53992.
- */
- {
- int ret, true = 1;
-
- ret = _wapi_setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, &true, sizeof (true));
- if(ret==SOCKET_ERROR) {
- *error = WSAGetLastError ();
-
- closesocket(sock);
- return(NULL);
- }
- }
-#endif
-
return(GUINT_TO_POINTER (sock));
}
MonoAddressFamily family;
/* Build a System.Net.SocketAddress object instance */
- sockaddr_class=mono_class_from_name(system_assembly, "System.Net", "SocketAddress");
+ sockaddr_class=mono_class_from_name(get_socket_assembly (), "System.Net", "SocketAddress");
sockaddr_obj=mono_object_new(domain, sockaddr_class);
/* Locate the SocketAddress data buffer in the object */
thread = mono_thread_current ();
}
- mono_monitor_enter (thread->synch_lock);
- leave = ((thread->state & ThreadState_AbortRequested) != 0 ||
- (thread->state & ThreadState_StopRequested) != 0);
- mono_monitor_exit (thread->synch_lock);
+ leave = mono_thread_test_state (thread, ThreadState_AbortRequested | ThreadState_StopRequested);
if (leave != 0) {
g_free (pfds);
return(ret);
}
+gint32 ves_icall_System_Net_Sockets_Socket_Receive_array_internal(SOCKET sock, MonoArray *buffers, gint32 flags, gint32 *error)
+{
+ int ret, count;
+ DWORD recv;
+ WSABUF *wsabufs;
+ DWORD recvflags = 0;
+
+ MONO_ARCH_SAVE_REGS;
+
+ *error = 0;
+
+ wsabufs = mono_array_addr (buffers, WSABUF, 0);
+ count = mono_array_length (buffers);
+
+ recvflags = convert_socketflags (flags);
+ if (recvflags == -1) {
+ *error = WSAEOPNOTSUPP;
+ return(0);
+ }
+
+ ret = WSARecv (sock, wsabufs, count, &recv, &recvflags, NULL, NULL);
+ if (ret == SOCKET_ERROR) {
+ *error = WSAGetLastError ();
+ return(0);
+ }
+
+ 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)
{
int ret;
return(ret);
}
+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;
+
+ MONO_ARCH_SAVE_REGS;
+
+ *error = 0;
+
+ wsabufs = mono_array_addr (buffers, WSABUF, 0);
+ count = mono_array_length (buffers);
+
+ sendflags = convert_socketflags (flags);
+ if (sendflags == -1) {
+ *error = WSAEOPNOTSUPP;
+ return(0);
+ }
+
+ ret = WSASend (sock, wsabufs, count, &sent, sendflags, NULL, NULL);
+ 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)
{
int ret;
MonoClass *sock_arr_class;
MonoArray *socks;
time_t start;
+ mono_array_size_t socks_size;
MONO_ARCH_SAVE_REGS;
if (thread == NULL)
thread = mono_thread_current ();
- mono_monitor_enter (thread->synch_lock);
- leave = ((thread->state & ThreadState_AbortRequested) != 0 ||
- (thread->state & ThreadState_StopRequested) != 0);
- mono_monitor_exit (thread->synch_lock);
+ leave = mono_thread_test_state (thread, ThreadState_AbortRequested | ThreadState_StopRequested);
+
if (leave != 0) {
g_free (pfds);
*sockets = NULL;
}
sock_arr_class= ((MonoObject *)*sockets)->vtable->klass;
- ret += 3; /* space for the NULL delimiters */
- socks = mono_array_new_full (mono_domain_get (), sock_arr_class, (guint32*)&ret, NULL);
- ret -= 3;
+ socks_size = ((mono_array_size_t)ret) + 3; /* space for the NULL delimiters */
+ socks = mono_array_new_full (mono_domain_get (), sock_arr_class, &socks_size, NULL);
+
mode = idx = 0;
for (i = 0; i < count && ret > 0; i++) {
mono_pollfd *pfd;
switch(name) {
case SocketOptionName_Linger:
/* build a System.Net.Sockets.LingerOption */
- obj_class=mono_class_from_name(system_assembly,
+ obj_class=mono_class_from_name(get_socket_assembly (),
"System.Net.Sockets",
"LingerOption");
obj=mono_object_new(domain, obj_class);
}
if(family == 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) {
+#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) {
projects / mono.git / blobdiff