summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorstanton <stanton>1999-02-03 00:51:19 (GMT)
committerstanton <stanton>1999-02-03 00:51:19 (GMT)
commitd302d0e71085efc1f3c7d150e571cd9bb1901600 (patch)
tree046fb0eda048d3c0c480c5401841aeb295469df9 /win
parentbfede94fa75c69f6d063f4eca7c4b2fe9d74bb64 (diff)
downloadtcl-d302d0e71085efc1f3c7d150e571cd9bb1901600.zip
tcl-d302d0e71085efc1f3c7d150e571cd9bb1901600.tar.gz
tcl-d302d0e71085efc1f3c7d150e571cd9bb1901600.tar.bz2
* unix/tclUnixChan.c:
* win/tclWinSock.c: * doc/socket.n: Applied Gordon Chaffee's patch to handle failures during asynchronous socket connection operations. This adds a new "-error" fconfgure option to socket channels. [Bug: 893]
Diffstat (limited to 'win')
-rw-r--r--win/tclWinSock.c24
1 files changed, 21 insertions, 3 deletions
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 00e7f22..a8f2a2f 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinSock.c,v 1.4 1998/12/04 01:01:55 stanton Exp $
+ * RCS: @(#) $Id: tclWinSock.c,v 1.5 1999/02/03 00:51:20 stanton Exp $
*/
#include "tclInt.h"
@@ -699,7 +699,7 @@ SocketEventProc(evPtr, flags)
}
}
- if (events & FD_WRITE) {
+ if (events & (FD_WRITE | FD_CONNECT)) {
mask |= TCL_WRITABLE;
}
@@ -1741,6 +1741,24 @@ TcpGetOptionProc(instanceData, interp, optionName, dsPtr)
len = strlen(optionName);
}
+ if ((len > 1) && (optionName[1] == 'e') &&
+ (strncmp(optionName, "-error", len) == 0)) {
+ int optlen;
+ int err, ret;
+
+ optlen = sizeof(int);
+ ret = TclWinGetSockOpt(sock, SOL_SOCKET, SO_ERROR,
+ (char *)&err, &optlen);
+ if (ret == SOCKET_ERROR) {
+ err = (*winSock.WSAGetLastError)();
+ }
+ if (err) {
+ TclWinConvertWSAError(err);
+ Tcl_DStringAppend(dsPtr, Tcl_ErrnoMsg(Tcl_GetErrno()), -1);
+ }
+ return TCL_OK;
+ }
+
if ((len == 0) ||
((len > 1) && (optionName[1] == 'p') &&
(strncmp(optionName, "-peername", len) == 0))) {
@@ -1868,7 +1886,7 @@ TcpWatchProc(instanceData, mask)
infoPtr->watchEvents |= (FD_READ|FD_CLOSE|FD_ACCEPT);
}
if (mask & TCL_WRITABLE) {
- infoPtr->watchEvents |= (FD_WRITE);
+ infoPtr->watchEvents |= (FD_WRITE|FD_CONNECT);
}
/*