mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-25 01:02:24 +00:00
810e21de82
Whenever we successfully send some data to standard output/error, we're supposed to notify the backend that this has happened, and tell it how much backlog still remains, by calling backend_unthrottle(). In Unix Plink, the call to backend_unthrottle() was happening on some but not all calls to try_output(). In particular, it was happening when we called try_output() as a result of stdout or stderr having just been reported writable by poll(), but not when we called it from plink_output() after the backend had just sent us some more data. Of course that _normally_ works - if you were polling stdout for writability at all then it's because a previous call had returned EAGAIN, so that's when you _have_ backlog to dispose of. But it's also possible, by an accident of timing, that before you get round to doing that poll, the seat passes you further data and you call try_output() anyway, and by chance, the blockage has cleared. In that situation, you end up having cleared your backlog but forgotten to tell the backend about it - which might mean the backend never unfreezes the channel or (in 'simple' mode) the entire SSH socket. A user reported (and I reproduced) that when Plink is compiled on MacOS, running an interactive session through it and doing output-intensive activity like scrolling around in htop(1) can quite easily get it into what turned out to be that stuck state. (I don't know why MacOS and not any other platform, but since it's a race condition, that seems like a plausible enough cause of a difference in timing.) Also, we were inconsistently computing the backlog size: sometimes it was the total size of the stdout and stderr bufchains, and sometimes it was just the size of the one we'd made an effort to empty. Now the backlog size is consistently stdout+stderr (the same as it is in Windows Plink), and the call to backend_unthrottle() happens _inside_ try_output(), so that I don't have to remember it at every call site. |
||
|---|---|---|
| .. | ||
| utils | ||
| agent-client.c | ||
| agent-socket.c | ||
| askpass.c | ||
| cliloop.c | ||
| CMakeLists.txt | ||
| columns.c | ||
| columns.h | ||
| config-gtk.c | ||
| config-unix.c | ||
| console.c | ||
| dialog.c | ||
| fd-socket.c | ||
| gss.c | ||
| gtk-common.c | ||
| gtkcompat.h | ||
| gtkmisc.h | ||
| keygen-noise.c | ||
| local-proxy.c | ||
| main-gtk-application.c | ||
| main-gtk-simple.c | ||
| network.c | ||
| no-gtk.c | ||
| noaskpass.c | ||
| noise.c | ||
| osxlaunch.c | ||
| pageant.c | ||
| peerinfo.c | ||
| platform.h | ||
| plink.c | ||
| printing.c | ||
| procnet.c | ||
| psocks.c | ||
| psusan.c | ||
| pterm-config-xpm.c | ||
| pterm-xpm.c | ||
| pterm.bundle | ||
| pterm.c | ||
| pterm.plist | ||
| pty.c | ||
| putty-config-xpm.c | ||
| putty-xpm.c | ||
| putty.bundle | ||
| putty.c | ||
| putty.plist | ||
| serial.c | ||
| sftp.c | ||
| sftpserver.c | ||
| sharing.c | ||
| storage.c | ||
| unicode.c | ||
| unifont.c | ||
| unifont.h | ||
| uppity.c | ||
| uxsel.c | ||
| window.c | ||
| x11.c | ||
| x11misc.h | ||