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)
gint32 ipv6_enabled = -1, ipv4_enabled = -1;
MonoVTable *vtable;
- socket_class = mono_class_from_name (system_assembly, "System.Net.Sockets", "Socket");
+ 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_ARCH_SAVE_REGS;
- STASH_SYS_ASS(this);
-
*error = 0;
sock_family=convert_family(family);
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 */
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;
}
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);
projects / mono.git / blobdiff