diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-08 14:06:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-08 14:06:46 (GMT) |
| commit | 607e3a5ba3c721c845b29c89db243882f25c5ba5 (patch) | |
| tree | 8e8492a75a0e05961ffc8e8cbd97b6ef56b4ebfe /generic/tclTest.c | |
| parent | 67be0a6752a150bad176f36988e3af03f25cc4d3 (diff) | |
| download | tcl-607e3a5ba3c721c845b29c89db243882f25c5ba5.zip tcl-607e3a5ba3c721c845b29c89db243882f25c5ba5.tar.gz tcl-607e3a5ba3c721c845b29c89db243882f25c5ba5.tar.bz2 | |
Combine flags and testFlags in TcpState. That should unbreak socket testcase failure
Diffstat (limited to 'generic/tclTest.c')
| -rw-r--r-- | generic/tclTest.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index d13b7ce..f6515c1 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -97,8 +97,7 @@ typedef struct TcpState TcpState; struct TcpState { Tcl_Channel channel; /* Channel associated with this socket. */ - int testFlags; /* bit field for tests. Is set by testsocket - * test procedure */ + int flags; /* ORed combination of various bitfields. */ }; TCL_DECLARE_MUTEX(asyncTestMutex) @@ -6442,6 +6441,10 @@ TestChannelEventCmd( *---------------------------------------------------------------------- */ +#define TCP_ASYNC_TEST_MODE (1<<8) /* Async testing activated. Do not + * automatically continue connection + * process. */ + static int TestSocketCmd( TCL_UNUSED(void *), @@ -6463,6 +6466,7 @@ TestSocketCmd( if ((cmdName[0] == 't') && (strncmp(cmdName, "testflags", len) == 0)) { Tcl_Channel hChannel; int modePtr; + int testMode; TcpState *statePtr; /* Set test value in the socket driver */ @@ -6484,7 +6488,14 @@ TestSocketCmd( NULL); return TCL_ERROR; } - statePtr->testFlags = atoi(argv[3]); + if (Tcl_GetBoolean(interp, argv[3], &testMode) != TCL_OK) { + return TCL_ERROR; + } + if (testMode) { + statePtr->flags |= TCP_ASYNC_TEST_MODE; + } else { + statePtr->flags &= ~TCP_ASYNC_TEST_MODE; + } return TCL_OK; } |