Author: dick
Date: 2005-10-11 09:21:43 -0400 (Tue, 11 Oct 2005)
New Revision: 51566
Modified:
trunk/mono/mono/io-layer/ChangeLog
trunk/mono/mono/io-layer/error.c
trunk/mono/mono/io-layer/sockets.c
Log:
2005-10-11 Dick Porter <[EMAIL PROTECTED]>
* sockets.c (_wapi_getsockopt): Translate SO_ERROR results into
w32 error codes.
* error.c (errno_to_WSA): Don't return a bogus error if someone
asks to translate errno 0.
Modified: trunk/mono/mono/io-layer/ChangeLog
===================================================================
--- trunk/mono/mono/io-layer/ChangeLog 2005-10-11 13:20:59 UTC (rev 51565)
+++ trunk/mono/mono/io-layer/ChangeLog 2005-10-11 13:21:43 UTC (rev 51566)
@@ -1,5 +1,13 @@
2005-10-11 Dick Porter <[EMAIL PROTECTED]>
+ * sockets.c (_wapi_getsockopt): Translate SO_ERROR results into
+ w32 error codes.
+
+ * error.c (errno_to_WSA): Don't return a bogus error if someone
+ asks to translate errno 0.
+
+2005-10-11 Dick Porter <[EMAIL PROTECTED]>
+
* handles.c: Fix several race conditions
2005-10-11 Miguel de Icaza <[EMAIL PROTECTED]>
Modified: trunk/mono/mono/io-layer/error.c
===================================================================
--- trunk/mono/mono/io-layer/error.c 2005-10-11 13:20:59 UTC (rev 51565)
+++ trunk/mono/mono/io-layer/error.c 2005-10-11 13:21:43 UTC (rev 51566)
@@ -70,6 +70,7 @@
gchar *msg;
switch (code) {
+ case 0: result = ERROR_SUCCESS; break;
case EACCES: result = WSAEACCES; break;
case EADDRINUSE: result = WSAEADDRINUSE; break;
case EAFNOSUPPORT: result = WSAEAFNOSUPPORT; break;
Modified: trunk/mono/mono/io-layer/sockets.c
===================================================================
--- trunk/mono/mono/io-layer/sockets.c 2005-10-11 13:20:59 UTC (rev 51565)
+++ trunk/mono/mono/io-layer/sockets.c 2005-10-11 13:21:43 UTC (rev 51566)
@@ -429,6 +429,13 @@
*((int *) optval) = tv.tv_sec * 1000 + tv.tv_usec;
*optlen = sizeof (int);
}
+
+ if (optname == SO_ERROR) {
+ if (*((int *)optval) != 0) {
+ *((int *) optval) = errno_to_WSA (*((int *)optval),
+ __func__);
+ }
+ }
return(ret);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches