Check-in [f79122ae17]
EuroTcl/OpenACS 11 - 12 JULY 2024, VIENNA
Overview
Comment:Updated to fatally fail if the handshake fatally fails
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: f79122ae17687a1a3e945cc7362949ad57ccc077
User & Date: rkeene on 2016-12-13 08:48:33
Other Links: manifest | tags
References
2016-12-13
15:29
Reverted [f79122ae17] check-in: 50d8da007b user: rkeene tags: trunk
Context
2016-12-13
15:29
Reverted [f79122ae17] check-in: 50d8da007b user: rkeene tags: trunk
08:48
Updated to fatally fail if the handshake fatally fails check-in: f79122ae17 user: rkeene tags: trunk
08:30
Added new remote file check-in: a81aa8026e user: rkeene tags: trunk
Changes

Modified tlsIO.c from [cd83a9c489] to [3765b3df61].

212
213
214
215
216
217
218





219
220
221
222
223
224
225
		return(0);
	}

	dprintf("Calling Tls_WaitForConnect");
	tlsConnect = Tls_WaitForConnect(statePtr, errorCodePtr);
	if (tlsConnect < 0) {
		dprintf("Got an error waiting to connect (tlsConnect = %i, *errorCodePtr = %i)", tlsConnect, *errorCodePtr);






		bytesRead = -1;
		if (*errorCodePtr == ECONNRESET) {
			dprintf("Got connection reset");
			/* Soft EOF */
			*errorCodePtr = 0;
			bytesRead = 0;







>
>
>
>
>







212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
		return(0);
	}

	dprintf("Calling Tls_WaitForConnect");
	tlsConnect = Tls_WaitForConnect(statePtr, errorCodePtr);
	if (tlsConnect < 0) {
		dprintf("Got an error waiting to connect (tlsConnect = %i, *errorCodePtr = %i)", tlsConnect, *errorCodePtr);

		if (statePtr->flags & TLS_TCL_HANDSHAKE_FAILED) {
			dprintf("The handshake completely failed, returning in failure");
			return(-1);
		}

		bytesRead = -1;
		if (*errorCodePtr == ECONNRESET) {
			dprintf("Got connection reset");
			/* Soft EOF */
			*errorCodePtr = 0;
			bytesRead = 0;
336
337
338
339
340
341
342





343
344
345
346
347
348
349
		return(-1);
	}

	dprintf("Calling Tls_WaitForConnect");
	tlsConnect = Tls_WaitForConnect(statePtr, errorCodePtr);
	if (tlsConnect < 0) {
		dprintf("Got an error waiting to connect (tlsConnect = %i, *errorCodePtr = %i)", tlsConnect, *errorCodePtr);






		written = -1;
		if (*errorCodePtr == ECONNRESET) {
			dprintf("Got connection reset");
			/* Soft EOF */
			*errorCodePtr = 0;
			written = 0;







>
>
>
>
>







341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
		return(-1);
	}

	dprintf("Calling Tls_WaitForConnect");
	tlsConnect = Tls_WaitForConnect(statePtr, errorCodePtr);
	if (tlsConnect < 0) {
		dprintf("Got an error waiting to connect (tlsConnect = %i, *errorCodePtr = %i)", tlsConnect, *errorCodePtr);

		if (statePtr->flags & TLS_TCL_HANDSHAKE_FAILED) {
			dprintf("The handshake completely failed, returning in failure");
			return(-1);
		}

		written = -1;
		if (*errorCodePtr == ECONNRESET) {
			dprintf("Got connection reset");
			/* Soft EOF */
			*errorCodePtr = 0;
			written = 0;