nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Duplicate r7795 in uxnet.c.

Browse Source 
[originally from svn r7796]
[r7795 == 712b4689c8]
This commit is contained in:
Simon Tatham 2007-11-28 20:45:50 +00:00
parent 712b4689c8
commit 020c481dd4
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
unix/uxnet.c
View File

@ -97,6 +97,10 @@ static int cmpfortree(void *av, void *bv)
return -1;
if (as > bs)
return +1;
if (a < b)
return -1;
if (a > b)
return +1;
return 0;
}
@ -453,6 +457,14 @@ static int try_connect(Actual_Socket sock)
short localport;
int fl, salen;
/*
* Remove the socket from the tree before we overwrite its
* internal socket id, because that forms part of the tree's
* sorting criterion. We'll add it back before exiting this
* function, whether we changed anything or not.
*/
del234(sktree, sock);
if (sock->s >= 0)
close(sock->s);
@ -605,9 +617,14 @@ static int try_connect(Actual_Socket sock)
}
uxsel_tell(sock);
add234(sktree, sock);
ret:
/*
* No matter what happened, put the socket back in the tree.
*/
add234(sktree, sock);
if (err)
plug_log(sock->plug, 1, sock->addr, sock->port, strerror(err), err);
return err;