#define MAX_STDIN_BACKLOG 4096
+void *logctx;
+
+static struct termios orig_termios;
+
void fatalbox(char *p, ...)
{
+ struct termios cf;
va_list ap;
+ premsg(&cf);
fprintf(stderr, "FATAL ERROR: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
+ postmsg(&cf);
+ if (logctx) {
+ log_free(logctx);
+ logctx = NULL;
+ }
cleanup_exit(1);
}
void modalfatalbox(char *p, ...)
{
+ struct termios cf;
va_list ap;
+ premsg(&cf);
fprintf(stderr, "FATAL ERROR: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
+ postmsg(&cf);
+ if (logctx) {
+ log_free(logctx);
+ logctx = NULL;
+ }
cleanup_exit(1);
}
void connection_fatal(void *frontend, char *p, ...)
{
+ struct termios cf;
va_list ap;
+ premsg(&cf);
fprintf(stderr, "FATAL ERROR: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
+ postmsg(&cf);
+ if (logctx) {
+ log_free(logctx);
+ logctx = NULL;
+ }
cleanup_exit(1);
}
void cmdline_error(char *p, ...)
{
+ struct termios cf;
va_list ap;
+ premsg(&cf);
fprintf(stderr, "plink: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
+ postmsg(&cf);
exit(1);
}
-static int local_tty = 0; /* do we have a local tty? */
-static struct termios orig_termios;
+static int local_tty = FALSE; /* do we have a local tty? */
static Backend *back;
static void *backhandle;
return dupstr(getenv("TERM"));
if (!strcmp(name, "UserName"))
return get_username();
+ if (!strcmp(name, "SerialLine"))
+ return dupstr("/dev/ttyS0");
return NULL;
}
if (!strcmp(name, "TermWidth") ||
!strcmp(name, "TermHeight")) {
struct winsize size;
- if (ioctl(0, TIOCGWINSZ, (void *)&size) >= 0)
+ if (ioctl(STDIN_FILENO, TIOCGWINSZ, (void *)&size) >= 0)
return (!strcmp(name, "TermWidth") ? size.ws_col : size.ws_row);
}
return def;
*/
mode.c_iflag = (mode.c_iflag | INPCK | PARMRK) & ~IGNPAR;
- tcsetattr(0, TCSANOW, &mode);
+ tcsetattr(STDIN_FILENO, TCSANOW, &mode);
}
/* Helper function to extract a special character from a termios. */
void cleanup_termios(void)
{
if (local_tty)
- tcsetattr(0, TCSANOW, &orig_termios);
+ tcsetattr(STDIN_FILENO, TCSANOW, &orig_termios);
}
bufchain stdout_data, stderr_data;
void try_output(int is_stderr)
{
bufchain *chain = (is_stderr ? &stderr_data : &stdout_data);
- int fd = (is_stderr ? 2 : 1);
+ int fd = (is_stderr ? STDERR_FILENO : STDOUT_FILENO);
void *senddata;
- int sendlen, ret;
+ int sendlen, ret, fl;
if (bufchain_size(chain) == 0)
return;
bufchain_prefix(chain, &senddata, &sendlen);
+ fl = fcntl(fd, F_GETFL);
+ if (fl != -1 && !(fl & O_NONBLOCK))
+ fcntl(fd, F_SETFL, fl | O_NONBLOCK);
ret = write(fd, senddata, sendlen);
+ if (fl != -1 && !(fl & O_NONBLOCK))
+ fcntl(fd, F_SETFL, fl);
if (ret > 0)
bufchain_consume(chain, ret);
- else if (ret < 0) {
+ else if (ret < 0 && errno != EAGAIN) {
perror(is_stderr ? "stderr: write" : "stdout: write");
exit(1);
}
if (is_stderr) {
bufchain_add(&stderr_data, data, len);
- try_output(1);
+ try_output(TRUE);
} else {
bufchain_add(&stdout_data, data, len);
- try_output(0);
+ try_output(FALSE);
}
osize = bufchain_size(&stdout_data);
/*
* Handle data from a local tty in PARMRK format.
*/
-static void from_tty(void *buf, unsigned len)
+static void from_tty(void *vbuf, unsigned len)
{
- char *p, *q, *end;
+ char *p, *q, *end, *buf = vbuf;
static enum {NORMAL, FF, FF00} state = NORMAL;
p = buf; end = buf + len;
printf(" -4 -6 force use of IPv4 or IPv6\n");
printf(" -C enable compression\n");
printf(" -i key private key file for authentication\n");
+ printf(" -noagent disable use of Pageant\n");
+ printf(" -agent enable use of Pageant\n");
printf(" -m file read remote command(s) from file\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");
+ printf(" -nc host:port\n");
+ printf(" open tunnel in place of session (SSH-2 only)\n");
exit(1);
}
int exitcode;
int errors;
int use_subsystem = 0;
- void *ldisc, *logctx;
+ void *ldisc;
long now;
fdlist = NULL;
default_protocol = PROT_SSH;
default_port = 22;
- flags = FLAG_STDERR;
+ flags = FLAG_STDERR | FLAG_STDERR_TTY;
+
+ stderr_tty_init();
/*
* Process the command line.
*/
* Override the default protocol if PLINK_PROTOCOL is set.
*/
char *p = getenv("PLINK_PROTOCOL");
- int i;
if (p) {
- for (i = 0; backends[i].backend != NULL; i++) {
- if (!strcmp(backends[i].name, p)) {
- default_protocol = cfg.protocol = backends[i].protocol;
- default_port = cfg.port =
- backends[i].backend->default_port;
- break;
- }
+ const Backend *b = backend_from_name(p);
+ if (b) {
+ default_protocol = cfg.protocol = b->protocol;
+ default_port = cfg.port = b->default_port;
}
}
}
errors = 1;
}
} else if (*p) {
- if (!*cfg.host) {
+ if (!cfg_launchable(&cfg)) {
char *q = p;
- do_defaults(NULL, &cfg);
-
/*
* If the hostname starts with "telnet:", set the
* protocol to Telnet and process the string as a
*/
r = strchr(p, ',');
if (r) {
- int i, j;
- for (i = 0; backends[i].backend != NULL; i++) {
- j = strlen(backends[i].name);
- if (j == r - p &&
- !memcmp(backends[i].name, p, j)) {
- default_protocol = cfg.protocol =
- backends[i].protocol;
- portnumber =
- backends[i].backend->default_port;
- p = r + 1;
- break;
- }
+ const Backend *b;
+ *r = '\0';
+ b = backend_from_name(p);
+ if (b) {
+ default_protocol = cfg.protocol = b->protocol;
+ portnumber = b->default_port;
}
+ p = r + 1;
}
/*
{
Config cfg2;
do_defaults(host, &cfg2);
- if (loaded_session || cfg2.host[0] == '\0') {
+ if (loaded_session || !cfg_launchable(&cfg2)) {
/* No settings for this host; use defaults */
/* (or session was already loaded with -load) */
strncpy(cfg.host, host, sizeof(cfg.host) - 1);
if (errors)
return 1;
- if (!*cfg.host) {
+ if (!cfg_launchable(&cfg)) {
usage();
}
cfg.host[p1] = '\0';
}
- if (!cfg.remote_cmd_ptr && !*cfg.remote_cmd)
+ if (!cfg.remote_cmd_ptr && !*cfg.remote_cmd && !*cfg.ssh_nc_host)
flags |= FLAG_INTERACTIVE;
/*
* Select protocol. This is farmed out into a table in a
* separate file to enable an ssh-free variant.
*/
- {
- int i;
- back = NULL;
- for (i = 0; backends[i].backend != NULL; i++)
- if (backends[i].protocol == cfg.protocol) {
- back = backends[i].backend;
- break;
- }
- if (back == NULL) {
- fprintf(stderr,
- "Internal fault: Unsupported protocol found\n");
- return 1;
- }
+ back = backend_from_proto(cfg.protocol);
+ if (back == NULL) {
+ fprintf(stderr,
+ "Internal fault: Unsupported protocol found\n");
+ return 1;
}
/*
uxsel_init();
/*
+ * Unix Plink doesn't provide any way to add forwardings after the
+ * connection is set up, so if there are none now, we can safely set
+ * the "simple" flag.
+ */
+ if (cfg.protocol == PROT_SSH && !cfg.x11_forward && !cfg.agentfwd &&
+ cfg.portfwd[0] == '\0' && cfg.portfwd[1] == '\0')
+ cfg.ssh_simple = TRUE;
+ /*
* Start up the connection.
*/
logctx = log_init(NULL, &cfg);
* fails, because we know we aren't necessarily running in a
* console.
*/
- local_tty = (tcgetattr(0, &orig_termios) == 0);
+ local_tty = (tcgetattr(STDIN_FILENO, &orig_termios) == 0);
atexit(cleanup_termios);
ldisc_update(NULL, 1, 1);
sending = FALSE;
FD_SET_MAX(signalpipe[0], maxfd, rset);
if (connopen && !sending &&
- back->socket(backhandle) != NULL &&
+ back->connected(backhandle) &&
back->sendok(backhandle) &&
back->sendbuffer(backhandle) < MAX_STDIN_BACKLOG) {
/* If we're OK to send, then try to read from stdin. */
- FD_SET_MAX(0, maxfd, rset);
+ FD_SET_MAX(STDIN_FILENO, maxfd, rset);
}
if (bufchain_size(&stdout_data) > 0) {
/* If we have data for stdout, try to write to stdout. */
- FD_SET_MAX(1, maxfd, wset);
+ FD_SET_MAX(STDOUT_FILENO, maxfd, wset);
}
if (bufchain_size(&stderr_data) > 0) {
/* If we have data for stderr, try to write to stderr. */
- FD_SET_MAX(2, maxfd, wset);
+ FD_SET_MAX(STDERR_FILENO, maxfd, wset);
}
/* Count the currently active fds. */
back->size(backhandle, size.ws_col, size.ws_row);
}
- if (FD_ISSET(0, &rset)) {
+ if (FD_ISSET(STDIN_FILENO, &rset)) {
char buf[4096];
int ret;
- if (connopen && back->socket(backhandle) != NULL) {
- ret = read(0, buf, sizeof(buf));
+ if (connopen && back->connected(backhandle)) {
+ ret = read(STDIN_FILENO, buf, sizeof(buf));
if (ret < 0) {
perror("stdin: read");
exit(1);
}
}
- if (FD_ISSET(1, &wset)) {
- try_output(0);
+ if (FD_ISSET(STDOUT_FILENO, &wset)) {
+ try_output(FALSE);
}
- if (FD_ISSET(2, &wset)) {
- try_output(1);
+ if (FD_ISSET(STDERR_FILENO, &wset)) {
+ try_output(TRUE);
}
- if ((!connopen || back->socket(backhandle) == NULL) &&
+ if ((!connopen || !back->connected(backhandle)) &&
bufchain_size(&stdout_data) == 0 &&
bufchain_size(&stderr_data) == 0)
break; /* we closed the connection */