* PLink - a command-line (stdin/stdout) variant of PuTTY.
*/
-#ifndef AUTO_WINSOCK
-#include <winsock2.h>
-#endif
-#include <windows.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include "storage.h"
#include "tree234.h"
+#define WM_AGENT_CALLBACK (WM_XUSER + 4)
+
#define MAX_STDIN_BACKLOG 4096
+struct agent_callback {
+ void (*callback)(void *, void *, int);
+ void *callback_ctx;
+ void *data;
+ int len;
+};
+
void fatalbox(char *p, ...)
{
va_list ap;
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
- WSACleanup();
cleanup_exit(1);
}
void modalfatalbox(char *p, ...)
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
- WSACleanup();
cleanup_exit(1);
}
void connection_fatal(void *frontend, char *p, ...)
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
- WSACleanup();
cleanup_exit(1);
}
void cmdline_error(char *p, ...)
exit(1);
}
-static char *password = NULL;
-
HANDLE inhandle, outhandle, errhandle;
DWORD orig_console_mode;
static Backend *back;
static void *backhandle;
+static Config cfg;
int term_ldisc(Terminal *term, int mode)
{
}
}
-int from_backend(void *frontend_handle, int is_stderr, char *data, int len)
+int from_backend(void *frontend_handle, int is_stderr,
+ const char *data, int len)
{
- HANDLE h = (is_stderr ? errhandle : outhandle);
int osize, esize;
- assert(len > 0);
-
if (is_stderr) {
bufchain_add(&stderr_data, data, len);
try_output(1);
return osize + esize;
}
+static DWORD main_thread_id;
+
+void agent_schedule_callback(void (*callback)(void *, void *, int),
+ void *callback_ctx, void *data, int len)
+{
+ struct agent_callback *c = snew(struct agent_callback);
+ c->callback = callback;
+ c->callback_ctx = callback_ctx;
+ c->data = data;
+ c->len = len;
+ PostThreadMessage(main_thread_id, WM_AGENT_CALLBACK, 0, (LPARAM)c);
+}
+
/*
* Short description of parameters.
*/
printf(" -batch disable all interactive prompts\n");
printf("The following options only apply to SSH connections:\n");
printf(" -pw passw login with specified password\n");
+ printf(" -D listen-port Dynamic SOCKS-based port forwarding\n");
printf(" -L listen-port:host:port Forward local port to "
"remote address\n");
printf(" -R listen-port:host:port Forward remote port to"
printf(" -1 -2 force use of particular protocol version\n");
printf(" -C enable compression\n");
printf(" -i key private key file for authentication\n");
+ printf(" -s remote command is an SSH subsystem (SSH-2 only)\n");
exit(1);
}
} else {
events = 0;
}
- if (WSAEventSelect(skt, netevent, events) == SOCKET_ERROR) {
- switch (WSAGetLastError()) {
+ if (p_WSAEventSelect(skt, netevent, events) == SOCKET_ERROR) {
+ switch (p_WSAGetLastError()) {
case WSAENETDOWN:
return "Network is down";
default:
- return "WSAAsyncSelect(): unknown error";
+ return "WSAEventSelect(): unknown error";
}
}
return NULL;
int main(int argc, char **argv)
{
- WSADATA wsadata;
- WORD winsock_ver;
WSAEVENT stdinevent, stdoutevent, stderrevent;
HANDLE handles[4];
DWORD in_threadid, out_threadid, err_threadid;
int skcount, sksize;
int connopen;
int exitcode;
+ int errors;
+ int use_subsystem = 0;
ssh_get_line = console_get_line;
do_defaults(NULL, &cfg);
default_protocol = cfg.protocol;
default_port = cfg.port;
+ errors = 0;
{
/*
* Override the default protocol if PLINK_PROTOCOL is set.
while (--argc) {
char *p = *++argv;
if (*p == '-') {
- int ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL), 1);
+ int ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL),
+ 1, &cfg);
if (ret == -2) {
fprintf(stderr,
"plink: option \"%s\" requires an argument\n", p);
+ errors = 1;
} else if (ret == 2) {
--argc, ++argv;
} else if (ret == 1) {
continue;
} else if (!strcmp(p, "-batch")) {
console_batch_mode = 1;
+ } else if (!strcmp(p, "-s")) {
+ /* Save status to write to cfg later. */
+ use_subsystem = 1;
+ } else {
+ fprintf(stderr, "plink: unknown option \"%s\"\n", p);
+ errors = 1;
}
} else if (*p) {
if (!*cfg.host) {
while (*p) {
if (cmdlen >= cmdsize) {
cmdsize = cmdlen + 512;
- command = srealloc(command, cmdsize);
+ command = sresize(command, cmdsize, char);
}
command[cmdlen++]=*p++;
}
if (cmdlen >= cmdsize) {
cmdsize = cmdlen + 512;
- command = srealloc(command, cmdsize);
+ command = sresize(command, cmdsize, char);
}
command[cmdlen++]=' '; /* always add trailing space */
if (--argc) p = *++argv;
}
}
+ if (errors)
+ return 1;
+
if (!*cfg.host) {
usage();
}
/*
* Perform command-line overrides on session configuration.
*/
- cmdline_run_saved();
+ cmdline_run_saved(&cfg);
+
+ /*
+ * Apply subsystem status.
+ */
+ if (use_subsystem)
+ cfg.ssh_subsys = TRUE;
/*
* Trim a colon suffix off the hostname if it's there.
if (portnumber != -1)
cfg.port = portnumber;
- /*
- * Initialise WinSock.
- */
- winsock_ver = MAKEWORD(2, 0);
- if (WSAStartup(winsock_ver, &wsadata)) {
- MessageBox(NULL, "Unable to initialise WinSock", "WinSock Error",
- MB_OK | MB_ICONEXCLAMATION);
- return 1;
- }
- if (LOBYTE(wsadata.wVersion) != 2 || HIBYTE(wsadata.wVersion) != 0) {
- MessageBox(NULL, "WinSock version is incompatible with 2.0",
- "WinSock Error", MB_OK | MB_ICONEXCLAMATION);
- WSACleanup();
+ sk_init();
+ if (p_WSAEventSelect == NULL) {
+ fprintf(stderr, "Plink requires WinSock 2\n");
return 1;
}
- sk_init();
/*
* Start up the connection.
*/
netevent = CreateEvent(NULL, FALSE, FALSE, NULL);
{
- char *error;
+ const char *error;
char *realhost;
/* nodelay is only useful if stdin is a character device (console) */
int nodelay = cfg.tcp_nodelay &&
(GetFileType(GetStdHandle(STD_INPUT_HANDLE)) == FILE_TYPE_CHAR);
- error = back->init(NULL, &backhandle, cfg.host, cfg.port,
+ error = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port,
&realhost, nodelay);
if (error) {
fprintf(stderr, "Unable to open connection:\n%s", error);
return 1;
}
- logctx = log_init(NULL);
+ logctx = log_init(NULL, &cfg);
back->provide_logctx(backhandle, logctx);
+ console_provide_logctx(logctx);
sfree(realhost);
}
connopen = 1;
GetConsoleMode(inhandle, &orig_console_mode);
SetConsoleMode(inhandle, ENABLE_PROCESSED_INPUT);
+ main_thread_id = GetCurrentThreadId();
+
/*
* Turn off ECHO and LINE input modes. We don't care if this
* call fails, because we know we aren't necessarily running in
sending = TRUE;
}
- n = WaitForMultipleObjects(4, handles, FALSE, INFINITE);
+ n = MsgWaitForMultipleObjects(4, handles, FALSE, INFINITE,
+ QS_POSTMESSAGE);
if (n == 0) {
WSANETWORKEVENTS things;
SOCKET socket;
/* Expand the buffer if necessary. */
if (i > sksize) {
sksize = i + 16;
- sklist = srealloc(sklist, sksize * sizeof(*sklist));
+ sklist = sresize(sklist, sksize, SOCKET);
}
/* Retrieve the sockets into sklist. */
WPARAM wp;
socket = sklist[i];
wp = (WPARAM) socket;
- if (!WSAEnumNetworkEvents(socket, NULL, &things)) {
+ if (!p_WSAEnumNetworkEvents(socket, NULL, &things)) {
static const struct { int bit, mask; } eventtypes[] = {
{FD_CONNECT_BIT, FD_CONNECT},
{FD_READ_BIT, FD_READ},
back->unthrottle(backhandle, bufchain_size(&stdout_data) +
bufchain_size(&stderr_data));
}
+ } else if (n == 4) {
+ MSG msg;
+ while (PeekMessage(&msg, INVALID_HANDLE_VALUE,
+ WM_AGENT_CALLBACK, WM_AGENT_CALLBACK,
+ PM_REMOVE)) {
+ struct agent_callback *c = (struct agent_callback *)msg.lParam;
+ c->callback(c->callback_ctx, c->data, c->len);
+ sfree(c);
+ }
}
if (!reading && back->sendbuffer(backhandle) < MAX_STDIN_BACKLOG) {
SetEvent(idata.eventback);
bufchain_size(&stderr_data) == 0)
break; /* we closed the connection */
}
- WSACleanup();
exitcode = back->exitcode(backhandle);
if (exitcode < 0) {
fprintf(stderr, "Remote process exit code unavailable\n");
exitcode = 1; /* this is an error condition */
}
- return exitcode;
+ cleanup_exit(exitcode);
+ return 0; /* placate compiler warning */
}
projects / u / mdw / putty / blobdiff