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

Cleanups to reduce dependency on Windows SFTP tools always having a

Browse Source 
real network socket.

[originally from svn r6804]
This commit is contained in:
Simon Tatham 2006-08-26 10:18:31 +00:00
parent 5765f8ceb9
commit b2fec9f576
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
windows/winsftp.c
View File

@ -463,25 +463,13 @@ extern int select_result(WPARAM, LPARAM);
int do_eventsel_loop(HANDLE other_event) int do_eventsel_loop(HANDLE other_event)
{ {
int n, nhandles, nallhandles; int n, nhandles, nallhandles, netindex, otherindex;
long next, ticks; long next, ticks;
HANDLE *handles; HANDLE *handles;
SOCKET *sklist; SOCKET *sklist;
int skcount; int skcount;
long now = GETTICKCOUNT(); long now = GETTICKCOUNT();
if (!netevent) {
return -1; /* doom */
}
handles = handle_get_events(&nhandles);
handles = sresize(handles, nhandles+2, HANDLE);
nallhandles = nhandles;
handles[nallhandles++] = netevent;
if (other_event)
handles[nallhandles++] = other_event;
if (run_timers(now, &next)) { if (run_timers(now, &next)) {
ticks = next - GETTICKCOUNT(); ticks = next - GETTICKCOUNT();
if (ticks < 0) ticks = 0; /* just in case */ if (ticks < 0) ticks = 0; /* just in case */
@ -489,12 +477,25 @@ int do_eventsel_loop(HANDLE other_event)
ticks = INFINITE; ticks = INFINITE;
} }
handles = handle_get_events(&nhandles);
handles = sresize(handles, nhandles+2, HANDLE);
nallhandles = nhandles;
if (netevent)
handles[netindex = nallhandles++] = netevent;
else
netindex = -1;
if (other_event)
handles[otherindex = nallhandles++] = other_event;
else
otherindex = -1;
n = MsgWaitForMultipleObjects(nallhandles, handles, FALSE, ticks, n = MsgWaitForMultipleObjects(nallhandles, handles, FALSE, ticks,
QS_POSTMESSAGE); QS_POSTMESSAGE);
if ((unsigned)(n - WAIT_OBJECT_0) < (unsigned)nhandles) { if ((unsigned)(n - WAIT_OBJECT_0) < (unsigned)nhandles) {
handle_got_event(handles[n - WAIT_OBJECT_0]); handle_got_event(handles[n - WAIT_OBJECT_0]);
} else if (n == WAIT_OBJECT_0 + nhandles) { } else if (netindex >= 0 && n == WAIT_OBJECT_0 + netindex) {
WSANETWORKEVENTS things; WSANETWORKEVENTS things;
SOCKET socket; SOCKET socket;
extern SOCKET first_socket(int *), next_socket(int *); extern SOCKET first_socket(int *), next_socket(int *);
@ -564,7 +565,7 @@ int do_eventsel_loop(HANDLE other_event)
now = GETTICKCOUNT(); now = GETTICKCOUNT();
} }
if (other_event && n == WAIT_OBJECT_0 + nhandles + 1) if (otherindex >= 0 && n == WAIT_OBJECT_0 + otherindex)
return 1; return 1;
return 0; return 0;
@ -581,14 +582,14 @@ int do_eventsel_loop(HANDLE other_event)
*/ */
int ssh_sftp_loop_iteration(void) int ssh_sftp_loop_iteration(void)
{ {
if (sftp_ssh_socket == INVALID_SOCKET)
return -1; /* doom */
if (p_WSAEventSelect == NULL) { if (p_WSAEventSelect == NULL) {
fd_set readfds; fd_set readfds;
int ret; int ret;
long now = GETTICKCOUNT(); long now = GETTICKCOUNT();
if (sftp_ssh_socket == INVALID_SOCKET)
return -1; /* doom */
if (socket_writable(sftp_ssh_socket)) if (socket_writable(sftp_ssh_socket))
select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_WRITE); select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_WRITE);