nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 20:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Revamp net_pending_errors using toplevel callbacks.

Browse Source 
Again, I've removed the special-purpose ad-hockery from the assorted
front end message loops that dealt with deferred handling of socket
errors, and instead uxnet.c and winnet.c arrange that for themselves
by calling the new general top-level callback mechanism.

[originally from svn r10023]
This commit is contained in:
Simon Tatham
2013-08-17 16:06:27 +00:00
parent a44366585f
commit d35a41f6ba
8 changed files with 44 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
unix/uxnet.c
View File

@ -1025,6 +1025,26 @@ void *sk_getxdmdata(void *sock, int *lenp)
return buf;
}
/*
* Deal with socket errors detected in try_send().
*/
static void socket_error_callback(void *vs)
{
Actual_Socket s = (Actual_Socket)vs;
/*
* Just in case other socket work has caused this socket to vanish
* or become somehow non-erroneous before this callback arrived...
*/
if (!find234(sktree, s, NULL) || !s->pending_error)
return;
/*
* An error has occurred on this socket. Pass it to the plug.
*/
plug_closing(s->plug, strerror(s->pending_error), s->pending_error, 0);
}
/*
* The function which tries to send on a socket once it's deemed
* writable.
@ -1073,9 +1093,10 @@ void try_send(Actual_Socket s)
*/
uxsel_tell(s);
/*
* Notify the front end that it might want to call us.
* Arrange to be called back from the top level to
* deal with the error condition on this socket.
*/
frontend_net_error_pending();
queue_toplevel_callback(socket_error_callback, s);
return;
}
} else {
@ -1352,43 +1373,6 @@ static int net_select_result(int fd, int event)
return 1;
}
/*
* Deal with socket errors detected in try_send().
*/
void net_pending_errors(void)
{
int i;
Actual_Socket s;
/*
* This might be a fiddly business, because it's just possible
* that handling a pending error on one socket might cause
* others to be closed. (I can't think of any reason this might
* happen in current SSH implementation, but to maintain
* generality of this network layer I'll assume the worst.)
*
* So what we'll do is search the socket list for _one_ socket
* with a pending error, and then handle it, and then search
* the list again _from the beginning_. Repeat until we make a
* pass with no socket errors present. That way we are
* protected against the socket list changing under our feet.
*/
do {
for (i = 0; (s = index234(sktree, i)) != NULL; i++) {
if (s->pending_error) {
/*
* An error has occurred on this socket. Pass it to the
* plug.
*/
plug_closing(s->plug, strerror(s->pending_error),
s->pending_error, 0);
break;
}
}
} while (s);
}
/*
* Each socket abstraction contains a `void *' private field in
* which the client can keep state.