* winsftp.c: the Windows-specific parts of PSFTP and PSCP.
*/
+#include <assert.h>
+
#include "putty.h"
#include "psftp.h"
+#include "ssh.h"
+#include "int64.h"
-/* ----------------------------------------------------------------------
- * Interface to GUI driver program.
- */
+char *get_ttymode(void *frontend, const char *mode) { return NULL; }
-/* This is just a base value from which the main message numbers are
- * derived. */
-#define WM_APP_BASE 0x8000
-
-/* These two pass a single character value in wParam. They represent
- * the visible output from PSCP. */
-#define WM_STD_OUT_CHAR ( WM_APP_BASE+400 )
-#define WM_STD_ERR_CHAR ( WM_APP_BASE+401 )
-
-/* These pass a transfer status update. WM_STATS_CHAR passes a single
- * character in wParam, and is called repeatedly to pass the name of
- * the file, terminated with "\n". WM_STATS_SIZE passes the size of
- * the file being transferred in wParam. WM_STATS_ELAPSED is called
- * to pass the elapsed time (in seconds) in wParam, and
- * WM_STATS_PERCENT passes the percentage of the transfer which is
- * complete, also in wParam. */
-#define WM_STATS_CHAR ( WM_APP_BASE+402 )
-#define WM_STATS_SIZE ( WM_APP_BASE+403 )
-#define WM_STATS_PERCENT ( WM_APP_BASE+404 )
-#define WM_STATS_ELAPSED ( WM_APP_BASE+405 )
-
-/* These are used at the end of a run to pass an error code in
- * wParam: zero means success, nonzero means failure. WM_RET_ERR_CNT
- * is used after a copy, and WM_LS_RET_ERR_CNT is used after a file
- * list operation. */
-#define WM_RET_ERR_CNT ( WM_APP_BASE+406 )
-#define WM_LS_RET_ERR_CNT ( WM_APP_BASE+407 )
-
-/* More transfer status update messages. WM_STATS_DONE passes the
- * number of bytes sent so far in wParam. WM_STATS_ETA passes the
- * estimated time to completion (in seconds). WM_STATS_RATEBS passes
- * the average transfer rate (in bytes per second). */
-#define WM_STATS_DONE ( WM_APP_BASE+408 )
-#define WM_STATS_ETA ( WM_APP_BASE+409 )
-#define WM_STATS_RATEBS ( WM_APP_BASE+410 )
-
-#define NAME_STR_MAX 2048
-static char statname[NAME_STR_MAX + 1];
-static unsigned long statsize = 0;
-static unsigned long statdone = 0;
-static unsigned long stateta = 0;
-static unsigned long statratebs = 0;
-static int statperct = 0;
-static unsigned long statelapsed = 0;
-
-static HWND gui_hwnd = NULL;
-
-static void send_msg(HWND h, UINT message, WPARAM wParam)
-{
- while (!PostMessage(h, message, wParam, 0))
- SleepEx(1000, TRUE);
-}
-
-void gui_send_char(int is_stderr, int c)
-{
- unsigned int msg_id = WM_STD_OUT_CHAR;
- if (is_stderr)
- msg_id = WM_STD_ERR_CHAR;
- send_msg(gui_hwnd, msg_id, (WPARAM) c);
-}
-
-void gui_send_errcount(int list, int errs)
-{
- unsigned int msg_id = WM_RET_ERR_CNT;
- if (list)
- msg_id = WM_LS_RET_ERR_CNT;
- while (!PostMessage(gui_hwnd, msg_id, (WPARAM) errs, 0))
- SleepEx(1000, TRUE);
-}
-
-void gui_update_stats(char *name, unsigned long size,
- int percentage, unsigned long elapsed,
- unsigned long done, unsigned long eta,
- unsigned long ratebs)
-{
- unsigned int i;
-
- if (strcmp(name, statname) != 0) {
- for (i = 0; i < strlen(name); ++i)
- send_msg(gui_hwnd, WM_STATS_CHAR, (WPARAM) name[i]);
- send_msg(gui_hwnd, WM_STATS_CHAR, (WPARAM) '\n');
- strcpy(statname, name);
- }
- if (statsize != size) {
- send_msg(gui_hwnd, WM_STATS_SIZE, (WPARAM) size);
- statsize = size;
- }
- if (statdone != done) {
- send_msg(gui_hwnd, WM_STATS_DONE, (WPARAM) done);
- statdone = done;
- }
- if (stateta != eta) {
- send_msg(gui_hwnd, WM_STATS_ETA, (WPARAM) eta);
- stateta = eta;
- }
- if (statratebs != ratebs) {
- send_msg(gui_hwnd, WM_STATS_RATEBS, (WPARAM) ratebs);
- statratebs = ratebs;
- }
- if (statelapsed != elapsed) {
- send_msg(gui_hwnd, WM_STATS_ELAPSED, (WPARAM) elapsed);
- statelapsed = elapsed;
- }
- if (statperct != percentage) {
- send_msg(gui_hwnd, WM_STATS_PERCENT, (WPARAM) percentage);
- statperct = percentage;
- }
+int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
+{
+ int ret;
+ ret = cmdline_get_passwd_input(p, in, inlen);
+ if (ret == -1)
+ ret = console_get_userpass_input(p, in, inlen);
+ return ret;
}
-void gui_enable(char *arg)
+void platform_get_x11_auth(struct X11Display *display, Conf *conf)
{
- gui_hwnd = (HWND) atoi(arg);
+ /* Do nothing, therefore no auth. */
}
+const int platform_uses_x11_unix_by_default = TRUE;
/* ----------------------------------------------------------------------
* File access abstraction.
return ret;
}
-#define TIME_POSIX_TO_WIN(t, ft) (*(LONGLONG*)&(ft) = \
- ((LONGLONG) (t) + (LONGLONG) 11644473600) * (LONGLONG) 10000000)
-#define TIME_WIN_TO_POSIX(ft, t) ((t) = (unsigned long) \
- ((*(LONGLONG*)&(ft)) / (LONGLONG) 10000000 - (LONGLONG) 11644473600))
+#define TIME_POSIX_TO_WIN(t, ft) do { \
+ ULARGE_INTEGER uli; \
+ uli.QuadPart = ((ULONGLONG)(t) + 11644473600ull) * 10000000ull; \
+ (ft).dwLowDateTime = uli.LowPart; \
+ (ft).dwHighDateTime = uli.HighPart; \
+} while(0)
+#define TIME_WIN_TO_POSIX(ft, t) do { \
+ ULARGE_INTEGER uli; \
+ uli.LowPart = (ft).dwLowDateTime; \
+ uli.HighPart = (ft).dwHighDateTime; \
+ uli.QuadPart = uli.QuadPart / 10000000ull - 11644473600ull; \
+ (t) = (unsigned long) uli.QuadPart; \
+} while(0)
struct RFile {
HANDLE h;
};
-RFile *open_existing_file(char *name, unsigned long *size,
- unsigned long *mtime, unsigned long *atime)
+RFile *open_existing_file(char *name, uint64 *size,
+ unsigned long *mtime, unsigned long *atime,
+ long *perms)
{
HANDLE h;
RFile *ret;
ret->h = h;
if (size)
- *size = GetFileSize(h, NULL);
+ size->lo=GetFileSize(h, &(size->hi));
if (mtime || atime) {
FILETIME actime, wrtime;
TIME_WIN_TO_POSIX(wrtime, *mtime);
}
+ if (perms)
+ *perms = -1;
+
return ret;
}
int read_from_file(RFile *f, void *buffer, int length)
{
- int ret, read;
+ int ret;
+ DWORD read;
ret = ReadFile(f->h, buffer, length, &read, NULL);
if (!ret)
return -1; /* error */
HANDLE h;
};
-WFile *open_new_file(char *name)
+WFile *open_new_file(char *name, long perms)
{
HANDLE h;
WFile *ret;
return ret;
}
+WFile *open_existing_wfile(char *name, uint64 *size)
+{
+ HANDLE h;
+ WFile *ret;
+
+ h = CreateFile(name, GENERIC_WRITE, FILE_SHARE_READ, NULL,
+ OPEN_EXISTING, 0, 0);
+ if (h == INVALID_HANDLE_VALUE)
+ return NULL;
+
+ ret = snew(WFile);
+ ret->h = h;
+
+ if (size)
+ size->lo=GetFileSize(h, &(size->hi));
+
+ return ret;
+}
+
int write_to_file(WFile *f, void *buffer, int length)
{
- int ret, written;
+ int ret;
+ DWORD written;
ret = WriteFile(f->h, buffer, length, &written, NULL);
if (!ret)
return -1; /* error */
sfree(f);
}
+/* Seek offset bytes through file, from whence, where whence is
+ FROM_START, FROM_CURRENT, or FROM_END */
+int seek_file(WFile *f, uint64 offset, int whence)
+{
+ DWORD movemethod;
+
+ switch (whence) {
+ case FROM_START:
+ movemethod = FILE_BEGIN;
+ break;
+ case FROM_CURRENT:
+ movemethod = FILE_CURRENT;
+ break;
+ case FROM_END:
+ movemethod = FILE_END;
+ break;
+ default:
+ return -1;
+ }
+
+ SetFilePointer(f->h, offset.lo, &(offset.hi), movemethod);
+
+ if (GetLastError() != NO_ERROR)
+ return -1;
+ else
+ return 0;
+}
+
+uint64 get_file_posn(WFile *f)
+{
+ uint64 ret;
+
+ ret.hi = 0L;
+ ret.lo = SetFilePointer(f->h, 0L, &(ret.hi), FILE_CURRENT);
+
+ return ret;
+}
+
int file_type(char *name)
{
DWORD attr;
char *read_filename(DirHandle *dir)
{
- while (!dir->name) {
- WIN32_FIND_DATA fdat;
- int ok = FindNextFile(dir->h, &fdat);
-
- if (!ok)
- return NULL;
-
- if (fdat.cFileName[0] == '.' &&
- (fdat.cFileName[1] == '\0' ||
- (fdat.cFileName[1] == '.' && fdat.cFileName[2] == '\0')))
+ do {
+
+ if (!dir->name) {
+ WIN32_FIND_DATA fdat;
+ int ok = FindNextFile(dir->h, &fdat);
+ if (!ok)
+ return NULL;
+ else
+ dir->name = dupstr(fdat.cFileName);
+ }
+
+ assert(dir->name);
+ if (dir->name[0] == '.' &&
+ (dir->name[1] == '\0' ||
+ (dir->name[1] == '.' && dir->name[2] == '\0'))) {
+ sfree(dir->name);
dir->name = NULL;
- else
- dir->name = dupstr(fdat.cFileName);
- }
+ }
+
+ } while (!dir->name);
if (dir->name) {
char *ret = dir->name;
sfree(dir);
}
+int vet_filename(char *name)
+{
+ if (strchr(name, '/') || strchr(name, '\\') || strchr(name, ':'))
+ return FALSE;
+
+ if (!name[strspn(name, ".")]) /* entirely composed of dots */
+ return FALSE;
+
+ return TRUE;
+}
+
int create_directory(char *name)
{
return CreateDirectory(name, NULL) != 0;
/*
* Be told what socket we're supposed to be using.
*/
-static SOCKET sftp_ssh_socket;
+static SOCKET sftp_ssh_socket = INVALID_SOCKET;
+static HANDLE netevent = INVALID_HANDLE_VALUE;
char *do_select(SOCKET skt, int startup)
{
+ int events;
if (startup)
sftp_ssh_socket = skt;
else
sftp_ssh_socket = INVALID_SOCKET;
+
+ if (p_WSAEventSelect) {
+ if (startup) {
+ events = (FD_CONNECT | FD_READ | FD_WRITE |
+ FD_OOB | FD_CLOSE | FD_ACCEPT);
+ netevent = CreateEvent(NULL, FALSE, FALSE, NULL);
+ } else {
+ events = 0;
+ }
+ if (p_WSAEventSelect(skt, netevent, events) == SOCKET_ERROR) {
+ switch (p_WSAGetLastError()) {
+ case WSAENETDOWN:
+ return "Network is down";
+ default:
+ return "WSAEventSelect(): unknown error";
+ }
+ }
+ }
return NULL;
}
extern int select_result(WPARAM, LPARAM);
+int do_eventsel_loop(HANDLE other_event)
+{
+ int n, nhandles, nallhandles, netindex, otherindex;
+ unsigned long next, then;
+ long ticks;
+ HANDLE *handles;
+ SOCKET *sklist;
+ int skcount;
+ unsigned long now = GETTICKCOUNT();
+
+ if (run_timers(now, &next)) {
+ then = now;
+ now = GETTICKCOUNT();
+ if (now - then > next - then)
+ ticks = 0;
+ else
+ ticks = next - now;
+ } else {
+ ticks = INFINITE;
+ }
+
+ handles = handle_get_events(&nhandles);
+ handles = sresize(handles, nhandles+2, HANDLE);
+ nallhandles = nhandles;
+
+ if (netevent != INVALID_HANDLE_VALUE)
+ handles[netindex = nallhandles++] = netevent;
+ else
+ netindex = -1;
+ if (other_event != INVALID_HANDLE_VALUE)
+ handles[otherindex = nallhandles++] = other_event;
+ else
+ otherindex = -1;
+
+ n = WaitForMultipleObjects(nallhandles, handles, FALSE, ticks);
+
+ if ((unsigned)(n - WAIT_OBJECT_0) < (unsigned)nhandles) {
+ handle_got_event(handles[n - WAIT_OBJECT_0]);
+ } else if (netindex >= 0 && n == WAIT_OBJECT_0 + netindex) {
+ WSANETWORKEVENTS things;
+ SOCKET socket;
+ extern SOCKET first_socket(int *), next_socket(int *);
+ extern int select_result(WPARAM, LPARAM);
+ int i, socketstate;
+
+ /*
+ * We must not call select_result() for any socket
+ * until we have finished enumerating within the
+ * tree. This is because select_result() may close
+ * the socket and modify the tree.
+ */
+ /* Count the active sockets. */
+ i = 0;
+ for (socket = first_socket(&socketstate);
+ socket != INVALID_SOCKET;
+ socket = next_socket(&socketstate)) i++;
+
+ /* Expand the buffer if necessary. */
+ sklist = snewn(i, SOCKET);
+
+ /* Retrieve the sockets into sklist. */
+ skcount = 0;
+ for (socket = first_socket(&socketstate);
+ socket != INVALID_SOCKET;
+ socket = next_socket(&socketstate)) {
+ sklist[skcount++] = socket;
+ }
+
+ /* Now we're done enumerating; go through the list. */
+ for (i = 0; i < skcount; i++) {
+ WPARAM wp;
+ socket = sklist[i];
+ wp = (WPARAM) socket;
+ if (!p_WSAEnumNetworkEvents(socket, NULL, &things)) {
+ static const struct { int bit, mask; } eventtypes[] = {
+ {FD_CONNECT_BIT, FD_CONNECT},
+ {FD_READ_BIT, FD_READ},
+ {FD_CLOSE_BIT, FD_CLOSE},
+ {FD_OOB_BIT, FD_OOB},
+ {FD_WRITE_BIT, FD_WRITE},
+ {FD_ACCEPT_BIT, FD_ACCEPT},
+ };
+ int e;
+
+ noise_ultralight(socket);
+ noise_ultralight(things.lNetworkEvents);
+
+ for (e = 0; e < lenof(eventtypes); e++)
+ if (things.lNetworkEvents & eventtypes[e].mask) {
+ LPARAM lp;
+ int err = things.iErrorCode[eventtypes[e].bit];
+ lp = WSAMAKESELECTREPLY(eventtypes[e].mask, err);
+ select_result(wp, lp);
+ }
+ }
+ }
+
+ sfree(sklist);
+ }
+
+ sfree(handles);
+
+ if (n == WAIT_TIMEOUT) {
+ now = next;
+ } else {
+ now = GETTICKCOUNT();
+ }
+
+ if (otherindex >= 0 && n == WAIT_OBJECT_0 + otherindex)
+ return 1;
+
+ return 0;
+}
+
/*
* Wait for some network data and process it.
+ *
+ * We have two variants of this function. One uses select() so that
+ * it's compatible with WinSock 1. The other uses WSAEventSelect
+ * and MsgWaitForMultipleObjects, so that we can consistently use
+ * WSAEventSelect throughout; this enables us to also implement
+ * ssh_sftp_get_cmdline() using a parallel mechanism.
*/
int ssh_sftp_loop_iteration(void)
{
- fd_set readfds;
+ if (p_WSAEventSelect == NULL) {
+ fd_set readfds;
+ int ret;
+ unsigned long now = GETTICKCOUNT(), then;
+
+ if (sftp_ssh_socket == INVALID_SOCKET)
+ return -1; /* doom */
+
+ if (socket_writable(sftp_ssh_socket))
+ select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_WRITE);
+
+ do {
+ unsigned long next;
+ long ticks;
+ struct timeval tv, *ptv;
+
+ if (run_timers(now, &next)) {
+ then = now;
+ now = GETTICKCOUNT();
+ if (now - then > next - then)
+ ticks = 0;
+ else
+ ticks = next - now;
+ tv.tv_sec = ticks / 1000;
+ tv.tv_usec = ticks % 1000 * 1000;
+ ptv = &tv;
+ } else {
+ ptv = NULL;
+ }
+
+ FD_ZERO(&readfds);
+ FD_SET(sftp_ssh_socket, &readfds);
+ ret = p_select(1, &readfds, NULL, NULL, ptv);
+
+ if (ret < 0)
+ return -1; /* doom */
+ else if (ret == 0)
+ now = next;
+ else
+ now = GETTICKCOUNT();
+
+ } while (ret == 0);
+
+ select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_READ);
+
+ return 0;
+ } else {
+ return do_eventsel_loop(INVALID_HANDLE_VALUE);
+ }
+}
+
+/*
+ * Read a command line from standard input.
+ *
+ * In the presence of WinSock 2, we can use WSAEventSelect to
+ * mediate between the socket and stdin, meaning we can send
+ * keepalives and respond to server events even while waiting at
+ * the PSFTP command prompt. Without WS2, we fall back to a simple
+ * fgets.
+ */
+struct command_read_ctx {
+ HANDLE event;
+ char *line;
+};
+
+static DWORD WINAPI command_read_thread(void *param)
+{
+ struct command_read_ctx *ctx = (struct command_read_ctx *) param;
- if (sftp_ssh_socket == INVALID_SOCKET)
- return -1; /* doom */
+ ctx->line = fgetline(stdin);
- FD_ZERO(&readfds);
- FD_SET(sftp_ssh_socket, &readfds);
- if (p_select(1, &readfds, NULL, NULL, NULL) < 0)
- return -1; /* doom */
+ SetEvent(ctx->event);
- select_result((WPARAM) sftp_ssh_socket, (LPARAM) FD_READ);
return 0;
}
+char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok)
+{
+ int ret;
+ struct command_read_ctx actx, *ctx = &actx;
+ DWORD threadid;
+
+ fputs(prompt, stdout);
+ fflush(stdout);
+
+ if ((sftp_ssh_socket == INVALID_SOCKET && no_fds_ok) ||
+ p_WSAEventSelect == NULL) {
+ return fgetline(stdin); /* very simple */
+ }
+
+ /*
+ * Create a second thread to read from stdin. Process network
+ * and timing events until it terminates.
+ */
+ ctx->event = CreateEvent(NULL, FALSE, FALSE, NULL);
+ ctx->line = NULL;
+
+ if (!CreateThread(NULL, 0, command_read_thread,
+ ctx, 0, &threadid)) {
+ fprintf(stderr, "Unable to create command input thread\n");
+ cleanup_exit(1);
+ }
+
+ do {
+ ret = do_eventsel_loop(ctx->event);
+
+ /* Error return can only occur if netevent==NULL, and it ain't. */
+ assert(ret >= 0);
+ } while (ret == 0);
+
+ return ctx->line;
+}
+
/* ----------------------------------------------------------------------
* Main program. Parse arguments etc.
*/
~mdw / sgt / putty / blobdiff