Overview
| Comment: | Minor updates to catch NULL channels. Source: https://www.androwish.org/home/info/982ebf9d31a60440 [982ebf9d31] |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
270bf9327b0ffaa857cfa6688d994690 |
| User & Date: | bohagan on 2023-03-04 17:58:58 |
| Other Links: | manifest | tags |
Context
|
2023-03-04
| ||
| 18:54 | Added names of unavailable protocols to error messages so its easier to understand. Source: https://sourceforge.net/p/tls/patches/14/ File: protocols.patch check-in: 6a3f83340d user: bohagan tags: trunk | |
| 17:58 | Minor updates to catch NULL channels. Source: https://www.androwish.org/home/info/982ebf9d31a60440 [982ebf9d31] check-in: 270bf9327b user: bohagan tags: trunk | |
| 16:14 | Merge feature-dump-keys into main check-in: bed86d3303 user: bohagan tags: trunk | |
Changes
Modified tlsBIO.c
from [7f6303ee40]
to [2da727af1f].
| ︙ | ︙ | |||
256 257 258 259 260 261 262 |
break;
case BIO_CTRL_SET_CLOSE:
dprintf("Got BIO_SET_CLOSE");
BIO_set_shutdown(bio, num);
break;
case BIO_CTRL_EOF:
dprintf("Got BIO_CTRL_EOF");
| | | | | 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 |
break;
case BIO_CTRL_SET_CLOSE:
dprintf("Got BIO_SET_CLOSE");
BIO_set_shutdown(bio, num);
break;
case BIO_CTRL_EOF:
dprintf("Got BIO_CTRL_EOF");
ret = ((chan) ? Tcl_Eof(chan) : 1);
break;
case BIO_CTRL_PENDING:
dprintf("Got BIO_CTRL_PENDING");
ret = ((chan) ? ((Tcl_InputBuffered(chan) ? 1 : 0)) : 0);
dprintf("BIO_CTRL_PENDING(%d)", (int) ret);
break;
case BIO_CTRL_WPENDING:
dprintf("Got BIO_CTRL_WPENDING");
ret = 0;
break;
case BIO_CTRL_DUP:
dprintf("Got BIO_CTRL_DUP");
break;
case BIO_CTRL_FLUSH:
dprintf("Got BIO_CTRL_FLUSH");
ret = ((chan) && (Tcl_WriteRaw(chan, "", 0) >= 0) ? 1 : -1);
dprintf("BIO_CTRL_FLUSH returning value %li", ret);
break;
default:
dprintf("Got unknown control command (%i)", cmd);
ret = -2;
break;
}
|
| ︙ | ︙ |
Modified tlsIO.c
from [a0890258d8]
to [3a06dc9467].
| ︙ | ︙ | |||
716 717 718 719 720 721 722 |
(Tcl_GetChannelType(downChan))->watchProc(Tcl_GetChannelInstanceData(downChan), 0);
statePtr->watchMask = 0;
return;
}
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | < | 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 |
(Tcl_GetChannelType(downChan))->watchProc(Tcl_GetChannelInstanceData(downChan), 0);
statePtr->watchMask = 0;
return;
}
statePtr->watchMask = mask;
/* No channel handlers any more. We will be notified automatically
* about events on the channel below via a call to our
* 'TransformNotifyProc'. But we have to pass the interest down now.
* We are allowed to add additional 'interest' to the mask if we want
* to. But this transformation has no such interest. It just passes
* the request down, unchanged.
*/
dprintf("Registering our interest in the lower channel (chan=%p)", (void *) downChan);
(Tcl_GetChannelType(downChan))
->watchProc(Tcl_GetChannelInstanceData(downChan), mask);
/*
* Management of the internal timer.
*/
if (statePtr->timer != (Tcl_TimerToken) NULL) {
dprintf("A timer was found, deleting it");
Tcl_DeleteTimerHandler(statePtr->timer);
statePtr->timer = (Tcl_TimerToken) NULL;
}
if ((mask & TCL_READABLE) &&
((Tcl_InputBuffered(statePtr->self) > 0) || (BIO_ctrl_pending(statePtr->bio) > 0))) {
/*
* There is interest in readable events and we actually have
* data waiting, so generate a timer to flush that.
*/
dprintf("Creating a new timer since data appears to be waiting");
statePtr->timer = Tcl_CreateTimerHandler(TLS_TCL_DELAY, TlsChannelHandlerTimer, (ClientData) statePtr);
}
}
/*
*-------------------------------------------------------------------
*
* TlsGetHandleProc --
*
|
| ︙ | ︙ |