saves[pri].nsaved++;
}
+void cmdline_cleanup(void)
+{
+ int pri;
+
+ for (pri = 0; pri < NPRIORITIES; pri++)
+ sfree(saves[pri].params);
+}
+
#define SAVEABLE(pri) do { \
if (need_save) { cmdline_save_param(p, value, pri); return ret; } \
} while (0)
-char *cmdline_password = NULL;
+static char *cmdline_password = NULL;
+
+/*
+ * Similar interface to get_userpass_input(), except that here a -1
+ * return means that we aren't capable of processing the prompt and
+ * someone else should do it.
+ */
+int cmdline_get_passwd_input(prompts_t *p, unsigned char *in, int inlen) {
-static int cmdline_get_line(const char *prompt, char *str,
- int maxlen, int is_pw)
-{
static int tried_once = 0;
- assert(is_pw && cmdline_password);
+ /*
+ * We only handle prompts which don't echo (which we assume to be
+ * passwords), and (currently) we only cope with a password prompt
+ * that comes in a prompt-set on its own.
+ */
+ if (!cmdline_password || in || p->n_prompts != 1 || p->prompts[0]->echo) {
+ return -1;
+ }
- if (tried_once) {
+ /*
+ * If we've tried once, return utter failure (no more passwords left
+ * to try).
+ */
+ if (tried_once)
return 0;
- } else {
- strncpy(str, cmdline_password, maxlen);
- str[maxlen - 1] = '\0';
- tried_once = 1;
- return 1;
- }
+
+ strncpy(p->prompts[0]->result, cmdline_password,
+ p->prompts[0]->result_len);
+ p->prompts[0]->result[p->prompts[0]->result_len-1] = '\0';
+ memset(cmdline_password, 0, strlen(cmdline_password));
+ tried_once = 1;
+ return 1;
+
}
/*
* Process a standard command-line parameter. `p' is the parameter
* in question; `value' is the subsequent element of argv, which
* may or may not be required as an operand to the parameter.
+ * If `need_save' is 1, arguments which need to be saved as
+ * described at this top of this file are, for later execution;
+ * if 0, they are processed normally. (-1 is a special value used
+ * by pterm to count arguments for a preliminary pass through the
+ * argument list; it causes immediate return with an appropriate
+ * value with no action taken.)
* Return value is 2 if both arguments were used; 1 if only p was
* used; 0 if the parameter wasn't one we recognised; -2 if it
* should have been 2 but value was NULL.
#define RETURN(x) do { \
if ((x) == 2 && !value) return -2; \
ret = x; \
+ if (need_save < 0) return x; \
} while (0)
int cmdline_process_param(char *p, char *value, int need_save, Config *cfg)
/* This parameter must be processed immediately rather than being
* saved. */
do_defaults(value, cfg);
+ loaded_session = TRUE;
return 2;
}
if (!strcmp(p, "-ssh")) {
RETURN(1);
- UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
SAVEABLE(0);
default_protocol = cfg->protocol = PROT_SSH;
default_port = cfg->port = 22;
}
if (!strcmp(p, "-telnet")) {
RETURN(1);
- UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
SAVEABLE(0);
default_protocol = cfg->protocol = PROT_TELNET;
default_port = cfg->port = 23;
}
if (!strcmp(p, "-rlogin")) {
RETURN(1);
- UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
SAVEABLE(0);
default_protocol = cfg->protocol = PROT_RLOGIN;
default_port = cfg->port = 513;
}
if (!strcmp(p, "-raw")) {
RETURN(1);
- UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
SAVEABLE(0);
default_protocol = cfg->protocol = PROT_RAW;
}
}
if (!strcmp(p, "-l")) {
RETURN(2);
+ UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
SAVEABLE(0);
strncpy(cfg->username, value, sizeof(cfg->username));
cfg->username[sizeof(cfg->username) - 1] = '\0';
}
- if ((!strcmp(p, "-L") || !strcmp(p, "-R"))) {
+ if ((!strcmp(p, "-L") || !strcmp(p, "-R") || !strcmp(p, "-D"))) {
char *fwd, *ptr, *q, *qq;
- int i=0;
+ int dynamic, i=0;
RETURN(2);
- UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
SAVEABLE(0);
+ dynamic = !strcmp(p, "-D");
fwd = value;
ptr = cfg->portfwd;
- /* if multiple forwards, find end of list */
- if (ptr[0]=='R' || ptr[0]=='L') {
- for (i = 0; i < sizeof(cfg->portfwd) - 2; i++)
- if (ptr[i]=='\000' && ptr[i+1]=='\000')
- break;
- ptr = ptr + i + 1; /* point to next forward slot */
+ /* if existing forwards, find end of list */
+ while (*ptr) {
+ while (*ptr)
+ ptr++;
+ ptr++;
}
- ptr[0] = p[1]; /* insert a 'L' or 'R' at the start */
- if (strlen(fwd) > sizeof(cfg->portfwd) - i - 2) {
+ i = ptr - cfg->portfwd;
+ ptr[0] = p[1]; /* insert a 'L', 'R' or 'D' at the start */
+ ptr++;
+ if (1 + strlen(fwd) + 2 > sizeof(cfg->portfwd) - i) {
cmdline_error("out of space for port forwardings");
return ret;
}
- strncpy(ptr+1, fwd, sizeof(cfg->portfwd) - i);
- /*
- * We expect _at least_ two colons in this string. The
- * possible formats are `sourceport:desthost:destport', or
- * `sourceip:sourceport:desthost:destport' if you're
- * specifying a particular loopback address. We need to
- * replace the one between source and dest with a \t; this
- * means we must find the second-to-last colon in the
- * string.
- */
- q = qq = strchr(ptr, ':');
- while (qq) {
- char *qqq = strchr(qq+1, ':');
- if (qqq)
- q = qq;
- qq = qqq;
+ strncpy(ptr, fwd, sizeof(cfg->portfwd) - i - 2);
+ if (!dynamic) {
+ /*
+ * We expect _at least_ two colons in this string. The
+ * possible formats are `sourceport:desthost:destport',
+ * or `sourceip:sourceport:desthost:destport' if you're
+ * specifying a particular loopback address. We need to
+ * replace the one between source and dest with a \t;
+ * this means we must find the second-to-last colon in
+ * the string.
+ */
+ q = qq = strchr(ptr, ':');
+ while (qq) {
+ char *qqq = strchr(qq+1, ':');
+ if (qqq)
+ q = qq;
+ qq = qqq;
+ }
+ if (q) *q = '\t'; /* replace second-last colon with \t */
}
- if (q) *q = '\t'; /* replace second-last colon with \t */
cfg->portfwd[sizeof(cfg->portfwd) - 1] = '\0';
cfg->portfwd[sizeof(cfg->portfwd) - 2] = '\0';
- ptr[strlen(ptr)+1] = '\000'; /* append two '\000' */
+ ptr[strlen(ptr)+1] = '\000'; /* append 2nd '\000' */
}
if (!strcmp(p, "-m")) {
char *filename, *command;
int c, d;
RETURN(2);
- UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
SAVEABLE(0);
filename = value;
}
if (!strcmp(p, "-P")) {
RETURN(2);
+ UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
SAVEABLE(1); /* lower priority than -ssh,-telnet */
cfg->port = atoi(value);
}
if (!strcmp(p, "-pw")) {
RETURN(2);
+ UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
cmdline_password = value;
- ssh_get_line = cmdline_get_line;
- ssh_getline_pw_only = TRUE;
}
if (!strcmp(p, "-A")) {
RETURN(1);
- UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
SAVEABLE(0);
cfg->agentfwd = 1;
}
if (!strcmp(p, "-a")) {
RETURN(1);
- UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
SAVEABLE(0);
cfg->agentfwd = 0;
}
if (!strcmp(p, "-X")) {
RETURN(1);
- UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
SAVEABLE(0);
cfg->x11_forward = 1;
}
if (!strcmp(p, "-x")) {
RETURN(1);
- UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
SAVEABLE(0);
cfg->x11_forward = 0;
}
if (!strcmp(p, "-t")) {
RETURN(1);
- UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
SAVEABLE(0);
cfg->nopty = 0;
}
if (!strcmp(p, "-T")) {
RETURN(1);
- UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
SAVEABLE(0);
cfg->nopty = 1;
}
+ if (!strcmp(p, "-N")) {
+ RETURN(1);
+ UNAVAILABLE_IN(TOOLTYPE_FILETRANSFER | TOOLTYPE_NONNETWORK);
+ SAVEABLE(0);
+ cfg->ssh_no_shell = 1;
+ }
+
if (!strcmp(p, "-C")) {
RETURN(1);
+ UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
SAVEABLE(0);
cfg->compression = 1;
}
if (!strcmp(p, "-1")) {
RETURN(1);
+ UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
SAVEABLE(0);
cfg->sshprot = 0; /* ssh protocol 1 only */
}
if (!strcmp(p, "-2")) {
RETURN(1);
+ UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
SAVEABLE(0);
cfg->sshprot = 3; /* ssh protocol 2 only */
}
if (!strcmp(p, "-i")) {
RETURN(2);
+ UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
SAVEABLE(0);
cfg->keyfile = filename_from_str(value);
}
+ if (!strcmp(p, "-4") || !strcmp(p, "-ipv4")) {
+ RETURN(1);
+ SAVEABLE(1);
+ cfg->addressfamily = ADDRTYPE_IPV4;
+ }
+ if (!strcmp(p, "-6") || !strcmp(p, "-ipv6")) {
+ RETURN(1);
+ SAVEABLE(1);
+ cfg->addressfamily = ADDRTYPE_IPV6;
+ }
+
return ret; /* unrecognised */
}
projects / u / mdw / putty / blobdiff