#include <stdio.h>
#include <stdlib.h>
+#include <errno.h>
#include <assert.h>
#include <stdarg.h>
+#include <signal.h>
#include <unistd.h>
#include <fcntl.h>
#include <termios.h>
-
-/* More helpful version of the FD_SET macro, to also handle maxfd. */
-#define FD_SET_MAX(fd, max, set) do { \
- FD_SET(fd, &set); \
- if (max < fd + 1) max = fd + 1; \
-} while (0)
+#include <pwd.h>
+#include <sys/ioctl.h>
#define PUTTY_DO_GLOBALS /* actually _define_ globals */
#include "putty.h"
static Backend *back;
static void *backhandle;
+static Config cfg;
+
+/*
+ * Default settings that are specific to pterm.
+ */
+char *platform_default_s(const char *name)
+{
+ if (!strcmp(name, "TermType"))
+ return dupstr(getenv("TERM"));
+ if (!strcmp(name, "UserName"))
+ return get_username();
+ return NULL;
+}
+
+int platform_default_i(const char *name, int def)
+{
+ if (!strcmp(name, "TermWidth") ||
+ !strcmp(name, "TermHeight")) {
+ struct winsize size;
+ if (ioctl(0, TIOCGWINSZ, (void *)&size) >= 0)
+ return (!strcmp(name, "TermWidth") ? size.ws_col : size.ws_row);
+ }
+ return def;
+}
+
+FontSpec platform_default_fontspec(const char *name)
+{
+ FontSpec ret;
+ *ret.name = '\0';
+ return ret;
+}
+
+Filename platform_default_filename(const char *name)
+{
+ Filename ret;
+ if (!strcmp(name, "LogFileName"))
+ strcpy(ret.path, "putty.log");
+ else
+ *ret.path = '\0';
+ return ret;
+}
-char *x_get_default(char *key)
+char *x_get_default(const char *key)
{
return NULL; /* this is a stub */
}
}
}
-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)
{
int osize, esize;
- assert(len > 0);
-
if (is_stderr) {
bufchain_add(&stderr_data, data, len);
try_output(1);
return osize + esize;
}
+int signalpipe[2];
+
+void sigwinch(int signum)
+{
+ write(signalpipe[1], "x", 1);
+}
+
+/*
+ * In Plink our selects are synchronous, so these functions are
+ * empty stubs.
+ */
+int uxsel_input_add(int fd, int rwx) { return 0; }
+void uxsel_input_remove(int id) { }
+
/*
* Short description of parameters.
*/
printf("Usage: plink [options] [user@]host [command]\n");
printf(" (\"host\" can also be a PuTTY saved session name)\n");
printf("Options:\n");
+ printf(" -V print version information\n");
printf(" -v show verbose messages\n");
printf(" -load sessname Load settings from saved session\n");
printf(" -ssh -telnet -rlogin -raw\n");
- printf(" force use of a particular protocol (default SSH)\n");
+ printf(" force use of a particular protocol\n");
printf(" -P port connect to specified port\n");
printf(" -l user connect with specified username\n");
printf(" -m file read remote command(s) from file\n");
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(" -L listen-port:host:port Forward local port to "
- "remote address\n");
- printf(" -R listen-port:host:port Forward remote port to"
- " local address\n");
+ printf(" -D [listen-IP:]listen-port\n");
+ printf(" Dynamic SOCKS-based port forwarding\n");
+ printf(" -L [listen-IP:]listen-port:host:port\n");
+ printf(" Forward local port to remote address\n");
+ printf(" -R [listen-IP:]listen-port:host:port\n");
+ printf(" Forward remote port to local address\n");
printf(" -X -x enable / disable X11 forwarding\n");
printf(" -A -a enable / disable agent forwarding\n");
printf(" -t -T enable / disable pty allocation\n");
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");
+ printf(" -N don't start a shell/command (SSH-2 only)\n");
+ exit(1);
+}
+
+static void version(void)
+{
+ printf("plink: %s\n", ver);
exit(1);
}
{
int sending;
int portnumber = -1;
- int *sklist;
- int socket;
- int i, skcount, sksize, socketstate;
+ int *fdlist;
+ int fd;
+ int i, fdcount, fdsize, fdstate;
int connopen;
int exitcode;
- void *ldisc;
+ int errors;
+ int use_subsystem = 0;
+ void *ldisc, *logctx;
+ long now;
ssh_get_line = console_get_line;
- sklist = NULL;
- skcount = sksize = 0;
+ fdlist = NULL;
+ fdcount = fdsize = 0;
/*
* Initialise port and protocol to sensible defaults. (These
* will be overridden by more or less anything.)
* Process the command line.
*/
do_defaults(NULL, &cfg);
+ loaded_session = FALSE;
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 if (!strcmp(p, "-V")) {
+ version();
} else if (!strcmp(p, "-o")) {
- if (argc <= 1)
+ if (argc <= 1) {
fprintf(stderr,
"plink: option \"-o\" requires an argument\n");
- else
- --argc, provide_xrm_string(*++argv);
+ errors = 1;
+ } else {
+ --argc;
+ provide_xrm_string(*++argv);
+ }
+ } else {
+ fprintf(stderr, "plink: unknown option \"%s\"\n", p);
+ errors = 1;
}
} else if (*p) {
if (!*cfg.host) {
strncpy(cfg.host, q, sizeof(cfg.host) - 1);
cfg.host[sizeof(cfg.host) - 1] = '\0';
} else {
- char *r;
+ char *r, *user, *host;
/*
* Before we process the [user@]host string, we
* first check for the presence of a protocol
}
/*
- * Three cases. Either (a) there's a nonzero
- * length string followed by an @, in which
- * case that's user and the remainder is host.
- * Or (b) there's only one string, not counting
- * a potential initial @, and it exists in the
- * saved-sessions database. Or (c) only one
- * string and it _doesn't_ exist in the
- * database.
+ * A nonzero length string followed by an @ is treated
+ * as a username. (We discount an _initial_ @.) The
+ * rest of the string (or the whole string if no @)
+ * is treated as a session name and/or hostname.
*/
r = strrchr(p, '@');
if (r == p)
p++, r = NULL; /* discount initial @ */
- if (r == NULL) {
- /*
- * One string.
- */
+ if (r) {
+ *r++ = '\0';
+ user = p, host = r;
+ } else {
+ user = NULL, host = p;
+ }
+
+ /*
+ * Now attempt to load a saved session with the
+ * same name as the hostname.
+ */
+ {
Config cfg2;
- do_defaults(p, &cfg2);
- if (cfg2.host[0] == '\0') {
+ do_defaults(host, &cfg2);
+ if (loaded_session || cfg2.host[0] == '\0') {
/* No settings for this host; use defaults */
- strncpy(cfg.host, p, sizeof(cfg.host) - 1);
+ /* (or session was already loaded with -load) */
+ strncpy(cfg.host, host, sizeof(cfg.host) - 1);
cfg.host[sizeof(cfg.host) - 1] = '\0';
cfg.port = default_port;
} else {
cfg = cfg2;
+ /* Ick: patch up internal pointer after copy */
cfg.remote_cmd_ptr = cfg.remote_cmd;
}
- } else {
- *r++ = '\0';
- strncpy(cfg.username, p, sizeof(cfg.username) - 1);
+ }
+
+ if (user) {
+ /* Patch in specified username. */
+ strncpy(cfg.username, user,
+ sizeof(cfg.username) - 1);
cfg.username[sizeof(cfg.username) - 1] = '\0';
- strncpy(cfg.host, r, sizeof(cfg.host) - 1);
- cfg.host[sizeof(cfg.host) - 1] = '\0';
- cfg.port = default_port;
}
+
}
} else {
char *command;
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();
}
/* See if host is of the form user@host */
if (cfg.host[0] != '\0') {
- char *atsign = strchr(cfg.host, '@');
+ char *atsign = strrchr(cfg.host, '@');
/* Make sure we're not overflowing the user field */
if (atsign) {
if (atsign - cfg.host < sizeof cfg.username) {
/*
* 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;
+ /*
+ * Set up the pipe we'll use to tell us about SIGWINCH.
+ */
+ if (pipe(signalpipe) < 0) {
+ perror("pipe");
+ exit(1);
+ }
+ putty_signal(SIGWINCH, sigwinch);
+
sk_init();
+ uxsel_init();
/*
* Start up the connection.
*/
- logctx = log_init(NULL);
+ logctx = log_init(NULL, &cfg);
+ console_provide_logctx(logctx);
{
- char *error;
+ const char *error;
char *realhost;
/* nodelay is only useful if stdin is a terminal device */
int nodelay = cfg.tcp_nodelay && isatty(0);
- error = back->init(NULL, &backhandle, cfg.host, cfg.port,
- &realhost, nodelay);
+ error = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port,
+ &realhost, nodelay, cfg.tcp_keepalives);
if (error) {
fprintf(stderr, "Unable to open connection:\n%s\n", error);
return 1;
}
back->provide_logctx(backhandle, logctx);
- ldisc = ldisc_create(NULL, back, backhandle, NULL);
+ ldisc = ldisc_create(&cfg, NULL, back, backhandle, NULL);
sfree(realhost);
}
connopen = 1;
atexit(cleanup_termios);
ldisc_update(NULL, 1, 1);
sending = FALSE;
+ now = GETTICKCOUNT();
while (1) {
fd_set rset, wset, xset;
FD_ZERO(&xset);
maxfd = 0;
+ FD_SET_MAX(signalpipe[0], maxfd, rset);
+
if (connopen && !sending &&
back->socket(backhandle) != NULL &&
back->sendok(backhandle) &&
FD_SET_MAX(2, maxfd, wset);
}
- /* Count the currently active sockets. */
+ /* Count the currently active fds. */
i = 0;
- for (socket = first_socket(&socketstate, &rwx); socket >= 0;
- socket = next_socket(&socketstate, &rwx)) i++;
+ for (fd = first_fd(&fdstate, &rwx); fd >= 0;
+ fd = next_fd(&fdstate, &rwx)) i++;
- /* Expand the sklist buffer if necessary. */
- if (i > sksize) {
- sksize = i + 16;
- sklist = srealloc(sklist, sksize * sizeof(*sklist));
+ /* Expand the fdlist buffer if necessary. */
+ if (i > fdsize) {
+ fdsize = i + 16;
+ fdlist = sresize(fdlist, fdsize, int);
}
/*
- * Add all currently open sockets to the select sets, and
- * store them in sklist as well.
+ * Add all currently open fds to the select sets, and store
+ * them in fdlist as well.
*/
- skcount = 0;
- for (socket = first_socket(&socketstate, &rwx); socket >= 0;
- socket = next_socket(&socketstate, &rwx)) {
- sklist[skcount++] = socket;
+ fdcount = 0;
+ for (fd = first_fd(&fdstate, &rwx); fd >= 0;
+ fd = next_fd(&fdstate, &rwx)) {
+ fdlist[fdcount++] = fd;
if (rwx & 1)
- FD_SET_MAX(socket, maxfd, rset);
+ FD_SET_MAX(fd, maxfd, rset);
if (rwx & 2)
- FD_SET_MAX(socket, maxfd, wset);
+ FD_SET_MAX(fd, maxfd, wset);
if (rwx & 4)
- FD_SET_MAX(socket, maxfd, xset);
+ FD_SET_MAX(fd, maxfd, xset);
}
- ret = select(maxfd, &rset, &wset, &xset, NULL);
+ do {
+ long next, ticks;
+ struct timeval tv, *ptv;
+
+ if (run_timers(now, &next)) {
+ ticks = next - GETTICKCOUNT();
+ if (ticks < 0) ticks = 0; /* just in case */
+ tv.tv_sec = ticks / 1000;
+ tv.tv_usec = ticks % 1000 * 1000;
+ ptv = &tv;
+ } else {
+ ptv = NULL;
+ }
+ ret = select(maxfd, &rset, &wset, &xset, ptv);
+ if (ret == 0)
+ now = next;
+ else
+ now = GETTICKCOUNT();
+ } while (ret < 0 && errno == EINTR);
if (ret < 0) {
perror("select");
exit(1);
}
- for (i = 0; i < skcount; i++) {
- socket = sklist[i];
+ for (i = 0; i < fdcount; i++) {
+ fd = fdlist[i];
/*
* We must process exceptional notifications before
* ordinary readability ones, or we may go straight
* past the urgent marker.
*/
- if (FD_ISSET(socket, &xset))
- select_result(socket, 4);
- if (FD_ISSET(socket, &rset))
- select_result(socket, 1);
- if (FD_ISSET(socket, &wset))
- select_result(socket, 2);
+ if (FD_ISSET(fd, &xset))
+ select_result(fd, 4);
+ if (FD_ISSET(fd, &rset))
+ select_result(fd, 1);
+ if (FD_ISSET(fd, &wset))
+ select_result(fd, 2);
+ }
+
+ if (FD_ISSET(signalpipe[0], &rset)) {
+ char c[1];
+ struct winsize size;
+ read(signalpipe[0], c, 1); /* ignore its value; it'll be `x' */
+ if (ioctl(0, TIOCGWINSZ, (void *)&size) >= 0)
+ back->size(backhandle, size.ws_col, size.ws_row);
}
if (FD_ISSET(0, &rset)) {
projects / u / mdw / putty / blobdiff