X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2d466ffd08675d26db45e524c2fe6a8cf4628e2b..2184a5d91ffbcf2de2f730c83dda2d9443035f50:/settings.c diff --git a/settings.c b/settings.c index 618d7538..24d6aeb5 100644 --- a/settings.c +++ b/settings.c @@ -8,6 +8,19 @@ #include "putty.h" #include "storage.h" +/* + * Tables of string <-> enum value mappings + */ +struct keyval { char *s; int v; }; + +static const struct keyval ciphernames[] = { + { "aes", CIPHER_AES }, + { "blowfish", CIPHER_BLOWFISH }, + { "3des", CIPHER_3DES }, + { "WARN", CIPHER_WARN }, + { "des", CIPHER_DES } +}; + static void gpps(void *handle, char *name, char *def, char *val, int len) { if (!read_setting_s(handle, name, val, len)) { @@ -21,6 +34,88 @@ static void gppi(void *handle, char *name, int def, int *i) *i = read_setting_i(handle, name, def); } +static int key2val(const struct keyval *mapping, int nmaps, char *key) +{ + int i; + for (i = 0; i < nmaps; i++) + if (!strcmp(mapping[i].s, key)) return mapping[i].v; + return -1; +} + +static const char *val2key(const struct keyval *mapping, int nmaps, int val) +{ + int i; + for (i = 0; i < nmaps; i++) + if (mapping[i].v == val) return mapping[i].s; + return NULL; +} + +/* + * Helper function to parse a comma-separated list of strings into + * a preference list array of values. Any missing values are added + * to the end and duplicates are weeded. + * XXX: assumes vals in 'mapping' are small +ve integers + */ +static void gprefs(void *sesskey, char *name, char *def, + const struct keyval *mapping, int nvals, + int *array) +{ + char commalist[80]; + int n; + unsigned long seen = 0; /* bitmap for weeding dups etc */ + gpps(sesskey, name, def, commalist, sizeof(commalist)); + + /* Grotty parsing of commalist. */ + n = 0; + do { + int v; + char *key; + key = strtok(n==0 ? commalist : NULL, ","); /* sorry */ + if (!key) break; + if (((v = key2val(mapping, nvals, key)) != -1) && + !(seen & 1< 0 && i < nvals; i++) { + const char *s = val2key(mapping, nvals, array[i]); + if (s) { + int sl = strlen(s); + if (i > 0) { + strncat(buf, ",", l); + l--; + } + strncat(buf, s, l); + l -= sl; + } + } + write_setting_s(sesskey, name, buf); +} + void save_settings(char *section, int do_host, Config * cfg) { int i; @@ -50,6 +145,7 @@ void save_settings(char *section, int do_host, Config * cfg) write_setting_i(sesskey, "WarnOnClose", !!cfg->warn_on_close); write_setting_i(sesskey, "PingInterval", cfg->ping_interval / 60); /* minutes */ write_setting_i(sesskey, "PingIntervalSecs", cfg->ping_interval % 60); /* seconds */ + write_setting_i(sesskey, "TCPNoDelay", cfg->tcp_nodelay); write_setting_s(sesskey, "TerminalType", cfg->termtype); write_setting_s(sesskey, "TerminalSpeed", cfg->termspeed); { @@ -76,11 +172,10 @@ void save_settings(char *section, int do_host, Config * cfg) write_setting_i(sesskey, "NoPTY", cfg->nopty); write_setting_i(sesskey, "Compression", cfg->compression); write_setting_i(sesskey, "AgentFwd", cfg->agentfwd); - write_setting_s(sesskey, "Cipher", - cfg->cipher == CIPHER_BLOWFISH ? "blowfish" : - cfg->cipher == CIPHER_DES ? "des" : - cfg->cipher == CIPHER_AES ? "aes" : "3des"); + wprefs(sesskey, "Cipher", ciphernames, CIPHER_MAX, + cfg->ssh_cipherlist); write_setting_i(sesskey, "AuthTIS", cfg->try_tis_auth); + write_setting_i(sesskey, "AuthKI", cfg->try_ki_auth); write_setting_i(sesskey, "SshProt", cfg->sshprot); write_setting_i(sesskey, "BuggyMAC", cfg->buggymac); write_setting_s(sesskey, "PublicKeyFile", cfg->keyfile); @@ -105,11 +200,14 @@ void save_settings(char *section, int do_host, Config * cfg) write_setting_i(sesskey, "LocalEdit", cfg->localedit); write_setting_s(sesskey, "Answerback", cfg->answerback); write_setting_i(sesskey, "AlwaysOnTop", cfg->alwaysontop); + write_setting_i(sesskey, "FullScreenOnAltEnter", cfg->fullscreenonaltenter); write_setting_i(sesskey, "HideMousePtr", cfg->hide_mouseptr); write_setting_i(sesskey, "SunkenEdge", cfg->sunken_edge); + write_setting_i(sesskey, "WindowBorder", cfg->window_border); write_setting_i(sesskey, "CurType", cfg->cursor_type); write_setting_i(sesskey, "BlinkCur", cfg->blink_cur); write_setting_i(sesskey, "Beep", cfg->beep); + write_setting_i(sesskey, "BeepInd", cfg->beep_ind); write_setting_s(sesskey, "BellWaveFile", cfg->bell_wavefile); write_setting_i(sesskey, "BellOverload", cfg->bellovl); write_setting_i(sesskey, "BellOverloadN", cfg->bellovl_n); @@ -138,7 +236,10 @@ void save_settings(char *section, int do_host, Config * cfg) write_setting_s(sesskey, buf, buf2); } write_setting_i(sesskey, "RawCNP", cfg->rawcnp); + write_setting_i(sesskey, "PasteRTF", cfg->rtf_paste); write_setting_i(sesskey, "MouseIsXterm", cfg->mouse_is_xterm); + write_setting_i(sesskey, "RectSelect", cfg->rect_select); + write_setting_i(sesskey, "MouseOverride", cfg->mouse_override); for (i = 0; i < 256; i += 32) { char buf[20], buf2[256]; int j; @@ -151,14 +252,36 @@ void save_settings(char *section, int do_host, Config * cfg) write_setting_s(sesskey, buf, buf2); } write_setting_s(sesskey, "LineCodePage", cfg->line_codepage); + write_setting_i(sesskey, "CapsLockCyr", cfg->xlat_capslockcyr); write_setting_i(sesskey, "ScrollBar", cfg->scrollbar); + write_setting_i(sesskey, "ScrollBarFullScreen", cfg->scrollbar_in_fullscreen); write_setting_i(sesskey, "ScrollOnKey", cfg->scroll_on_key); write_setting_i(sesskey, "ScrollOnDisp", cfg->scroll_on_disp); - write_setting_i(sesskey, "LockSize", cfg->locksize); + write_setting_i(sesskey, "LockSize", cfg->resize_action); write_setting_i(sesskey, "BCE", cfg->bce); write_setting_i(sesskey, "BlinkText", cfg->blinktext); write_setting_i(sesskey, "X11Forward", cfg->x11_forward); write_setting_s(sesskey, "X11Display", cfg->x11_display); + write_setting_i(sesskey, "LocalPortAcceptAll", cfg->lport_acceptall); + { + char buf[2 * sizeof(cfg->portfwd)], *p, *q; + p = buf; + q = cfg->portfwd; + while (*q) { + while (*q) { + int c = *q++; + if (c == '=' || c == ',' || c == '\\') + *p++ = '\\'; + if (c == '\t') + c = '='; + *p++ = c; + } + *p++ = ','; + q++; + } + *p = '\0'; + write_setting_s(sesskey, "PortForwardings", buf); + } close_settings_w(sesskey); } @@ -173,9 +296,13 @@ void load_settings(char *section, int do_host, Config * cfg) cfg->ssh_subsys = 0; /* FIXME: load this properly */ cfg->remote_cmd_ptr = cfg->remote_cmd; + cfg->remote_cmd_ptr2 = NULL; - gpps(sesskey, "HostName", "", cfg->host, sizeof(cfg->host)); - gppi(sesskey, "PortNumber", default_port, &cfg->port); + if (do_host) { + gpps(sesskey, "HostName", "", cfg->host, sizeof(cfg->host)); + } else { + cfg->host[0] = '\0'; /* blank hostname */ + } gpps(sesskey, "LogFileName", "putty.log", cfg->logfilename, sizeof(cfg->logfilename)); gppi(sesskey, "LogType", 0, &cfg->logtype); @@ -183,9 +310,11 @@ void load_settings(char *section, int do_host, Config * cfg) gpps(sesskey, "Protocol", "default", prot, 10); cfg->protocol = default_protocol; + cfg->port = default_port; for (i = 0; backends[i].name != NULL; i++) if (!strcmp(prot, backends[i].name)) { cfg->protocol = backends[i].protocol; + gppi(sesskey, "PortNumber", default_port, &cfg->port); break; } @@ -198,6 +327,7 @@ void load_settings(char *section, int do_host, Config * cfg) gppi(sesskey, "PingIntervalSecs", 0, &pingsec); cfg->ping_interval = pingmin * 60 + pingsec; } + gppi(sesskey, "TCPNoDelay", 1, &cfg->tcp_nodelay); gpps(sesskey, "TerminalType", "xterm", cfg->termtype, sizeof(cfg->termtype)); gpps(sesskey, "TerminalSpeed", "38400,38400", cfg->termspeed, @@ -228,21 +358,12 @@ void load_settings(char *section, int do_host, Config * cfg) gppi(sesskey, "NoPTY", 0, &cfg->nopty); gppi(sesskey, "Compression", 0, &cfg->compression); gppi(sesskey, "AgentFwd", 0, &cfg->agentfwd); - { - char cipher[10]; - gpps(sesskey, "Cipher", "3des", cipher, 10); - if (!strcmp(cipher, "blowfish")) - cfg->cipher = CIPHER_BLOWFISH; - else if (!strcmp(cipher, "des")) - cfg->cipher = CIPHER_DES; - else if (!strcmp(cipher, "aes")) - cfg->cipher = CIPHER_AES; - else - cfg->cipher = CIPHER_3DES; - } + gprefs(sesskey, "Cipher", "\0", + ciphernames, CIPHER_MAX, cfg->ssh_cipherlist); gppi(sesskey, "SshProt", 1, &cfg->sshprot); gppi(sesskey, "BuggyMAC", 0, &cfg->buggymac); gppi(sesskey, "AuthTIS", 0, &cfg->try_tis_auth); + gppi(sesskey, "AuthKI", 1, &cfg->try_ki_auth); gpps(sesskey, "PublicKeyFile", "", cfg->keyfile, sizeof(cfg->keyfile)); gpps(sesskey, "RemoteCommand", "", cfg->remote_cmd, sizeof(cfg->remote_cmd)); @@ -267,12 +388,15 @@ void load_settings(char *section, int do_host, Config * cfg) gpps(sesskey, "Answerback", "PuTTY", cfg->answerback, sizeof(cfg->answerback)); gppi(sesskey, "AlwaysOnTop", 0, &cfg->alwaysontop); + gppi(sesskey, "FullScreenOnAltEnter", 0, &cfg->fullscreenonaltenter); gppi(sesskey, "HideMousePtr", 0, &cfg->hide_mouseptr); gppi(sesskey, "SunkenEdge", 0, &cfg->sunken_edge); + gppi(sesskey, "WindowBorder", 1, &cfg->window_border); gppi(sesskey, "CurType", 0, &cfg->cursor_type); gppi(sesskey, "BlinkCur", 0, &cfg->blink_cur); /* pedantic compiler tells me I can't use &cfg->beep as an int * :-) */ gppi(sesskey, "Beep", 1, &i); cfg->beep = i; + gppi(sesskey, "BeepInd", 0, &i); cfg->beep_ind = i; gpps(sesskey, "BellWaveFile", "", cfg->bell_wavefile, sizeof(cfg->bell_wavefile)); gppi(sesskey, "BellOverload", 1, &cfg->bellovl); @@ -287,7 +411,7 @@ void load_settings(char *section, int do_host, Config * cfg) gpps(sesskey, "WinTitle", "", cfg->wintitle, sizeof(cfg->wintitle)); gppi(sesskey, "TermWidth", 80, &cfg->width); gppi(sesskey, "TermHeight", 24, &cfg->height); - gpps(sesskey, "Font", "Courier", cfg->font, sizeof(cfg->font)); + gpps(sesskey, "Font", "Courier New", cfg->font, sizeof(cfg->font)); gppi(sesskey, "FontIsBold", 0, &cfg->fontisbold); gppi(sesskey, "FontCharSet", ANSI_CHARSET, &cfg->fontcharset); gppi(sesskey, "FontHeight", 10, &cfg->fontheight); @@ -303,7 +427,7 @@ void load_settings(char *section, int do_host, Config * cfg) newh--; cfg->fontheight = newh; } - gppi(sesskey, "FontVTMode", VT_OEMANSI, (int *) &cfg->vtmode); + gppi(sesskey, "FontVTMode", VT_UNICODE, (int *) &cfg->vtmode); gppi(sesskey, "TryPalette", 0, &cfg->try_palette); gppi(sesskey, "BoldAsColour", 1, &cfg->bold_colour); for (i = 0; i < 22; i++) { @@ -325,7 +449,10 @@ void load_settings(char *section, int do_host, Config * cfg) } } gppi(sesskey, "RawCNP", 0, &cfg->rawcnp); + gppi(sesskey, "PasteRTF", 0, &cfg->rtf_paste); gppi(sesskey, "MouseIsXterm", 0, &cfg->mouse_is_xterm); + gppi(sesskey, "RectSelect", 0, &cfg->rect_select); + gppi(sesskey, "MouseOverride", 1, &cfg->mouse_override); for (i = 0; i < 256; i += 32) { static char *defaults[] = { "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0", @@ -351,18 +478,46 @@ void load_settings(char *section, int do_host, Config * cfg) cfg->wordness[j] = atoi(q); } } + /* + * The empty default for LineCodePage will be converted later + * into a plausible default for the locale. + */ gpps(sesskey, "LineCodePage", "", cfg->line_codepage, sizeof(cfg->line_codepage)); + gppi (sesskey, "CapsLockCyr", 0, &cfg->xlat_capslockcyr); gppi(sesskey, "ScrollBar", 1, &cfg->scrollbar); + gppi(sesskey, "ScrollBarFullScreen", 0, &cfg->scrollbar_in_fullscreen); gppi(sesskey, "ScrollOnKey", 0, &cfg->scroll_on_key); gppi(sesskey, "ScrollOnDisp", 1, &cfg->scroll_on_disp); - gppi(sesskey, "LockSize", 0, &cfg->locksize); + gppi(sesskey, "LockSize", 0, &cfg->resize_action); gppi(sesskey, "BCE", 0, &cfg->bce); gppi(sesskey, "BlinkText", 0, &cfg->blinktext); gppi(sesskey, "X11Forward", 0, &cfg->x11_forward); gpps(sesskey, "X11Display", "localhost:0", cfg->x11_display, sizeof(cfg->x11_display)); + gppi(sesskey, "LocalPortAcceptAll", 0, &cfg->lport_acceptall); + { + char buf[2 * sizeof(cfg->portfwd)], *p, *q; + gpps(sesskey, "PortForwardings", "", buf, sizeof(buf)); + p = buf; + q = cfg->portfwd; + while (*p) { + while (*p && *p != ',') { + int c = *p++; + if (c == '=') + c = '\t'; + if (c == '\\') + c = *p++; + *q++ = c; + } + if (*p == ',') + p++; + *q++ = '\0'; + } + *q = '\0'; + } + close_settings_r(sesskey); } @@ -387,6 +542,10 @@ static int sessioncmp(const void *av, const void *bv) return -1; /* a comes first */ if (!strcmp(b, "Default Settings")) return +1; /* b comes first */ + /* + * FIXME: perhaps we should ignore the first & in determining + * sort order. + */ return strcmp(a, b); /* otherwise, compare normally */ }