mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-07-12 08:43:53 -05:00
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an arbitrary length limit on every single one of those settings which is stored in string form. In place of it is 'Conf', an opaque data type everywhere outside the new file conf.c, which stores a list of (key, value) pairs in which every key contains an integer identifying a configuration setting, and for some of those integers the key also contains extra parts (so that, for instance, CONF_environmt is a string-to-string mapping). Everywhere that a Config was previously used, a Conf is now; everywhere there was a Config structure copy, conf_copy() is called; every lookup, adjustment, load and save operation on a Config has been rewritten; and there's a mechanism for serialising a Conf into a binary blob and back for use with Duplicate Session. User-visible effects of this change _should_ be minimal, though I don't doubt I've introduced one or two bugs here and there which will eventually be found. The _intended_ visible effects of this change are that all arbitrary limits on configuration strings and lists (e.g. limit on number of port forwardings) should now disappear; that list boxes in the configuration will now be displayed in a sorted order rather than the arbitrary order in which they were added to the list (since the underlying data structure is now a sorted tree234 rather than an ad-hoc comma-separated string); and one more specific change, which is that local and dynamic port forwardings on the same port number are now mutually exclusive in the configuration (putting 'D' in the key rather than the value was a mistake in the first place). One other reorganisation as a result of this is that I've moved all the dialog.c standard handlers (dlg_stdeditbox_handler and friends) out into config.c, because I can't really justify calling them generic any more. When they took a pointer to an arbitrary structure type and the offset of a field within that structure, they were independent of whether that structure was a Config or something completely different, but now they really do expect to talk to a Conf, which can _only_ be used for PuTTY configuration, so I've renamed them all things like conf_editbox_handler and moved them out of the nominally independent dialog-box management module into the PuTTY-specific config.c. [originally from svn r9214]
This commit is contained in:
Simon Tatham
@ -83,7 +83,7 @@ WSAEVENT netevent;
|
||||
|
||||
static Backend *back;
|
||||
static void *backhandle;
|
||||
static Config cfg;
|
||||
static Conf *conf;
|
||||
|
||||
int term_ldisc(Terminal *term, int mode)
|
||||
{
|
||||
@ -298,10 +298,11 @@ int main(int argc, char **argv)
|
||||
/*
|
||||
* Process the command line.
|
||||
*/
|
||||
do_defaults(NULL, &cfg);
|
||||
conf = conf_new();
|
||||
do_defaults(NULL, conf);
|
||||
loaded_session = FALSE;
|
||||
default_protocol = cfg.protocol;
|
||||
default_port = cfg.port;
|
||||
default_protocol = conf_get_int(conf, CONF_protocol);
|
||||
default_port = conf_get_int(conf, CONF_port);
|
||||
errors = 0;
|
||||
{
|
||||
/*
|
||||
@ -311,8 +312,10 @@ int main(int argc, char **argv)
|
||||
if (p) {
|
||||
const Backend *b = backend_from_name(p);
|
||||
if (b) {
|
||||
default_protocol = cfg.protocol = b->protocol;
|
||||
default_port = cfg.port = b->default_port;
|
||||
default_protocol = b->protocol;
|
||||
default_port = b->default_port;
|
||||
conf_set_int(conf, CONF_protocol, default_protocol);
|
||||
conf_set_int(conf, CONF_port, default_port);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -320,7 +323,7 @@ int main(int argc, char **argv)
|
||||
char *p = *++argv;
|
||||
if (*p == '-') {
|
||||
int ret = cmdline_process_param(p, (argc > 1 ? argv[1] : NULL),
|
||||
1, &cfg);
|
||||
1, conf);
|
||||
if (ret == -2) {
|
||||
fprintf(stderr,
|
||||
"plink: option \"%s\" requires an argument\n", p);
|
||||
@ -332,7 +335,7 @@ int main(int argc, char **argv)
|
||||
} else if (!strcmp(p, "-batch")) {
|
||||
console_batch_mode = 1;
|
||||
} else if (!strcmp(p, "-s")) {
|
||||
/* Save status to write to cfg later. */
|
||||
/* Save status to write to conf later. */
|
||||
use_subsystem = 1;
|
||||
} else if (!strcmp(p, "-V")) {
|
||||
version();
|
||||
@ -344,7 +347,7 @@ int main(int argc, char **argv)
|
||||
errors = 1;
|
||||
}
|
||||
} else if (*p) {
|
||||
if (!cfg_launchable(&cfg) || !(got_host || loaded_session)) {
|
||||
if (!conf_launchable(conf) || !(got_host || loaded_session)) {
|
||||
char *q = p;
|
||||
/*
|
||||
* If the hostname starts with "telnet:", set the
|
||||
@ -357,7 +360,7 @@ int main(int argc, char **argv)
|
||||
q += 7;
|
||||
if (q[0] == '/' && q[1] == '/')
|
||||
q += 2;
|
||||
cfg.protocol = PROT_TELNET;
|
||||
conf_set_int(conf, CONF_protocol, PROT_TELNET);
|
||||
p = q;
|
||||
while (*p && *p != ':' && *p != '/')
|
||||
p++;
|
||||
@ -365,11 +368,10 @@ int main(int argc, char **argv)
|
||||
if (*p)
|
||||
*p++ = '\0';
|
||||
if (c == ':')
|
||||
cfg.port = atoi(p);
|
||||
conf_set_int(conf, CONF_port, atoi(p));
|
||||
else
|
||||
cfg.port = -1;
|
||||
strncpy(cfg.host, q, sizeof(cfg.host) - 1);
|
||||
cfg.host[sizeof(cfg.host) - 1] = '\0';
|
||||
conf_set_int(conf, CONF_port, -1);
|
||||
conf_set_str(conf, CONF_host, q);
|
||||
got_host = TRUE;
|
||||
} else {
|
||||
char *r, *user, *host;
|
||||
@ -384,7 +386,9 @@ int main(int argc, char **argv)
|
||||
*r = '\0';
|
||||
b = backend_from_name(p);
|
||||
if (b) {
|
||||
default_protocol = cfg.protocol = b->protocol;
|
||||
default_protocol = b->protocol;
|
||||
conf_set_int(conf, CONF_protocol,
|
||||
default_protocol);
|
||||
portnumber = b->default_port;
|
||||
}
|
||||
p = r + 1;
|
||||
@ -411,26 +415,24 @@ int main(int argc, char **argv)
|
||||
* same name as the hostname.
|
||||
*/
|
||||
{
|
||||
Config cfg2;
|
||||
do_defaults(host, &cfg2);
|
||||
if (loaded_session || !cfg_launchable(&cfg2)) {
|
||||
Conf *conf2 = conf_new();
|
||||
do_defaults(host, conf2);
|
||||
if (loaded_session || !conf_launchable(conf2)) {
|
||||
/* No settings for this host; use defaults */
|
||||
/* (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;
|
||||
conf_set_str(conf, CONF_host, host);
|
||||
conf_set_int(conf, CONF_port, default_port);
|
||||
got_host = TRUE;
|
||||
} else {
|
||||
cfg = cfg2;
|
||||
conf_copy_into(conf, conf2);
|
||||
loaded_session = TRUE;
|
||||
}
|
||||
conf_free(conf2);
|
||||
}
|
||||
|
||||
if (user) {
|
||||
/* Patch in specified username. */
|
||||
strncpy(cfg.username, user,
|
||||
sizeof(cfg.username) - 1);
|
||||
cfg.username[sizeof(cfg.username) - 1] = '\0';
|
||||
conf_set_str(conf, CONF_username, user);
|
||||
}
|
||||
|
||||
}
|
||||
@ -457,9 +459,9 @@ int main(int argc, char **argv)
|
||||
}
|
||||
if (cmdlen) command[--cmdlen]='\0';
|
||||
/* change trailing blank to NUL */
|
||||
cfg.remote_cmd_ptr = command;
|
||||
cfg.remote_cmd_ptr2 = NULL;
|
||||
cfg.nopty = TRUE; /* command => no terminal */
|
||||
conf_set_str(conf, CONF_remote_cmd, command);
|
||||
conf_set_str(conf, CONF_remote_cmd2, "");
|
||||
conf_set_int(conf, CONF_nopty, TRUE); /* command => no tty */
|
||||
|
||||
break; /* done with cmdline */
|
||||
}
|
||||
@ -469,70 +471,78 @@ int main(int argc, char **argv)
|
||||
if (errors)
|
||||
return 1;
|
||||
|
||||
if (!cfg_launchable(&cfg) || !(got_host || loaded_session)) {
|
||||
if (!conf_launchable(conf) || !(got_host || loaded_session)) {
|
||||
usage();
|
||||
}
|
||||
|
||||
/*
|
||||
* Trim leading whitespace off the hostname if it's there.
|
||||
* Muck about with the hostname in various ways.
|
||||
*/
|
||||
{
|
||||
int space = strspn(cfg.host, " \t");
|
||||
memmove(cfg.host, cfg.host+space, 1+strlen(cfg.host)-space);
|
||||
}
|
||||
char *hostbuf = dupstr(conf_get_str(conf, CONF_host));
|
||||
char *host = hostbuf;
|
||||
char *p, *q;
|
||||
|
||||
/* See if host is of the form user@host */
|
||||
if (cfg_launchable(&cfg)) {
|
||||
char *atsign = strrchr(cfg.host, '@');
|
||||
/* Make sure we're not overflowing the user field */
|
||||
if (atsign) {
|
||||
if (atsign - cfg.host < sizeof cfg.username) {
|
||||
strncpy(cfg.username, cfg.host, atsign - cfg.host);
|
||||
cfg.username[atsign - cfg.host] = '\0';
|
||||
/*
|
||||
* Trim leading whitespace.
|
||||
*/
|
||||
host += strspn(host, " \t");
|
||||
|
||||
/*
|
||||
* See if host is of the form user@host, and separate out
|
||||
* the username if so.
|
||||
*/
|
||||
if (host[0] != '\0') {
|
||||
char *atsign = strrchr(host, '@');
|
||||
if (atsign) {
|
||||
*atsign = '\0';
|
||||
conf_set_str(conf, CONF_username, host);
|
||||
host = atsign + 1;
|
||||
}
|
||||
memmove(cfg.host, atsign + 1, 1 + strlen(atsign + 1));
|
||||
}
|
||||
|
||||
/*
|
||||
* Trim off a colon suffix if it's there.
|
||||
*/
|
||||
host[strcspn(host, ":")] = '\0';
|
||||
|
||||
/*
|
||||
* Remove any remaining whitespace.
|
||||
*/
|
||||
p = hostbuf;
|
||||
q = host;
|
||||
while (*q) {
|
||||
if (*q != ' ' && *q != '\t')
|
||||
*p++ = *q;
|
||||
q++;
|
||||
}
|
||||
*p = '\0';
|
||||
|
||||
conf_set_str(conf, CONF_host, hostbuf);
|
||||
sfree(hostbuf);
|
||||
}
|
||||
|
||||
/*
|
||||
* Perform command-line overrides on session configuration.
|
||||
*/
|
||||
cmdline_run_saved(&cfg);
|
||||
cmdline_run_saved(conf);
|
||||
|
||||
/*
|
||||
* Apply subsystem status.
|
||||
*/
|
||||
if (use_subsystem)
|
||||
cfg.ssh_subsys = TRUE;
|
||||
conf_set_int(conf, CONF_ssh_subsys, TRUE);
|
||||
|
||||
/*
|
||||
* Trim a colon suffix off the hostname if it's there.
|
||||
*/
|
||||
cfg.host[strcspn(cfg.host, ":")] = '\0';
|
||||
|
||||
/*
|
||||
* Remove any remaining whitespace from the hostname.
|
||||
*/
|
||||
{
|
||||
int p1 = 0, p2 = 0;
|
||||
while (cfg.host[p2] != '\0') {
|
||||
if (cfg.host[p2] != ' ' && cfg.host[p2] != '\t') {
|
||||
cfg.host[p1] = cfg.host[p2];
|
||||
p1++;
|
||||
}
|
||||
p2++;
|
||||
}
|
||||
cfg.host[p1] = '\0';
|
||||
}
|
||||
|
||||
if (!cfg.remote_cmd_ptr && !*cfg.remote_cmd && !*cfg.ssh_nc_host)
|
||||
if (!*conf_get_str(conf, CONF_remote_cmd) &&
|
||||
!*conf_get_str(conf, CONF_remote_cmd2) &&
|
||||
!*conf_get_str(conf, CONF_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.
|
||||
*/
|
||||
back = backend_from_proto(cfg.protocol);
|
||||
back = backend_from_proto(conf_get_int(conf, CONF_protocol));
|
||||
if (back == NULL) {
|
||||
fprintf(stderr,
|
||||
"Internal fault: Unsupported protocol found\n");
|
||||
@ -543,7 +553,7 @@ int main(int argc, char **argv)
|
||||
* Select port.
|
||||
*/
|
||||
if (portnumber != -1)
|
||||
cfg.port = portnumber;
|
||||
conf_set_int(conf, CONF_port, portnumber);
|
||||
|
||||
sk_init();
|
||||
if (p_WSAEventSelect == NULL) {
|
||||
@ -551,7 +561,7 @@ int main(int argc, char **argv)
|
||||
return 1;
|
||||
}
|
||||
|
||||
logctx = log_init(NULL, &cfg);
|
||||
logctx = log_init(NULL, conf);
|
||||
console_provide_logctx(logctx);
|
||||
|
||||
/*
|
||||
@ -562,11 +572,14 @@ int main(int argc, char **argv)
|
||||
const char *error;
|
||||
char *realhost;
|
||||
/* nodelay is only useful if stdin is a character device (console) */
|
||||
int nodelay = cfg.tcp_nodelay &&
|
||||
int nodelay = conf_get_int(conf, CONF_tcp_nodelay) &&
|
||||
(GetFileType(GetStdHandle(STD_INPUT_HANDLE)) == FILE_TYPE_CHAR);
|
||||
|
||||
error = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port,
|
||||
&realhost, nodelay, cfg.tcp_keepalives);
|
||||
error = back->init(NULL, &backhandle, conf,
|
||||
conf_get_str(conf, CONF_host),
|
||||
conf_get_int(conf, CONF_port),
|
||||
&realhost, nodelay,
|
||||
conf_get_int(conf, CONF_tcp_keepalives));
|
||||
if (error) {
|
||||
fprintf(stderr, "Unable to open connection:\n%s", error);
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user