X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/89adc0e26d9020cfbe23fd4b0eec5ff33055a694..ffd835c11f5c4d7266fcc7ef57638f5e1a2a6c41:/config.c diff --git a/config.c b/config.c index 5b44c01f..638e3d8d 100644 --- a/config.c +++ b/config.c @@ -50,6 +50,33 @@ static void protocolbuttons_handler(union control *ctrl, void *dlg, } } +static void loggingbuttons_handler(union control *ctrl, void *dlg, + void *data, int event) +{ + int button; + Config *cfg = (Config *)data; + /* This function works just like the standard radio-button handler, + * but it has to fall back to "no logging" in situations where the + * configured logging type isn't applicable. + */ + if (event == EVENT_REFRESH) { + for (button = 0; button < ctrl->radio.nbuttons; button++) + if (cfg->logtype == ctrl->radio.buttondata[button].i) + break; + + /* We fell off the end, so we lack the configured logging type */ + if (button == ctrl->radio.nbuttons) { + button=0; + cfg->logtype=LGTYP_NONE; + } + dlg_radiobutton_set(ctrl, dlg, button); + } else if (event == EVENT_VALCHANGE) { + button = dlg_radiobutton_get(ctrl, dlg); + assert(button >= 0 && button < ctrl->radio.nbuttons); + cfg->logtype = ctrl->radio.buttondata[button].i; + } +} + static void numeric_keypad_handler(union control *ctrl, void *dlg, void *data, int event) { @@ -92,7 +119,8 @@ static void cipherlist_handler(union control *ctrl, void *dlg, { "3DES", CIPHER_3DES }, { "Blowfish", CIPHER_BLOWFISH }, { "DES", CIPHER_DES }, - { "AES (SSH 2 only)", CIPHER_AES }, + { "AES (SSH-2 only)", CIPHER_AES }, + { "Arcfour (SSH-2 only)", CIPHER_ARCFOUR }, { "-- warn below here --", CIPHER_WARN } }; @@ -251,7 +279,7 @@ static void sshbug_handler(union control *ctrl, void *dlg, struct sessionsaver_data { union control *editbox, *listbox, *loadbutton, *savebutton, *delbutton; union control *okbutton, *cancelbutton; - struct sesslist *sesslist; + struct sesslist sesslist; int midsession; }; @@ -270,10 +298,10 @@ static int load_selected_session(struct sessionsaver_data *ssd, dlg_beep(dlg); return 0; } - isdef = !strcmp(ssd->sesslist->sessions[i], "Default Settings"); - load_settings(ssd->sesslist->sessions[i], !isdef, cfg); + isdef = !strcmp(ssd->sesslist.sessions[i], "Default Settings"); + load_settings(ssd->sesslist.sessions[i], !isdef, cfg); if (!isdef) { - strncpy(savedsession, ssd->sesslist->sessions[i], + strncpy(savedsession, ssd->sesslist.sessions[i], SAVEDSESSION_LEN); savedsession[SAVEDSESSION_LEN-1] = '\0'; } else { @@ -317,8 +345,8 @@ static void sessionsaver_handler(union control *ctrl, void *dlg, int i; dlg_update_start(ctrl, dlg); dlg_listbox_clear(ctrl, dlg); - for (i = 0; i < ssd->sesslist->nsessions; i++) - dlg_listbox_add(ctrl, dlg, ssd->sesslist->sessions[i]); + for (i = 0; i < ssd->sesslist.nsessions; i++) + dlg_listbox_add(ctrl, dlg, ssd->sesslist.sessions[i]); dlg_update_done(ctrl, dlg); } } else if (event == EVENT_VALCHANGE) { @@ -349,9 +377,9 @@ static void sessionsaver_handler(union control *ctrl, void *dlg, dlg_beep(dlg); return; } - isdef = !strcmp(ssd->sesslist->sessions[i], "Default Settings"); + isdef = !strcmp(ssd->sesslist.sessions[i], "Default Settings"); if (!isdef) { - strncpy(savedsession, ssd->sesslist->sessions[i], + strncpy(savedsession, ssd->sesslist.sessions[i], SAVEDSESSION_LEN); savedsession[SAVEDSESSION_LEN-1] = '\0'; } else { @@ -365,8 +393,8 @@ static void sessionsaver_handler(union control *ctrl, void *dlg, sfree(errmsg); } } - get_sesslist(ssd->sesslist, FALSE); - get_sesslist(ssd->sesslist, TRUE); + get_sesslist(&ssd->sesslist, FALSE); + get_sesslist(&ssd->sesslist, TRUE); dlg_refresh(ssd->editbox, dlg); dlg_refresh(ssd->listbox, dlg); } else if (!ssd->midsession && @@ -375,9 +403,9 @@ static void sessionsaver_handler(union control *ctrl, void *dlg, if (i <= 0) { dlg_beep(dlg); } else { - del_settings(ssd->sesslist->sessions[i]); - get_sesslist(ssd->sesslist, FALSE); - get_sesslist(ssd->sesslist, TRUE); + del_settings(ssd->sesslist.sessions[i]); + get_sesslist(&ssd->sesslist, FALSE); + get_sesslist(&ssd->sesslist, TRUE); dlg_refresh(ssd->listbox, dlg); } } else if (ctrl == ssd->okbutton) { @@ -792,8 +820,8 @@ static void portfwd_handler(union control *ctrl, void *dlg, } } -void setup_config_box(struct controlbox *b, struct sesslist *sesslist, - int midsession, int protocol, int protcfginfo) +void setup_config_box(struct controlbox *b, int midsession, + int protocol, int protcfginfo) { struct controlset *s; struct sessionsaver_data *ssd; @@ -877,7 +905,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist, midsession ? "Save the current session settings" : "Load, save or delete a stored session"); ctrl_columns(s, 2, 75, 25); - ssd->sesslist = sesslist; + get_sesslist(&ssd->sesslist, TRUE); ssd->editbox = ctrl_editbox(s, "Saved Sessions", 'e', 100, HELPCTX(session_saved), sessionsaver_handler, P(ssd), P(NULL)); @@ -947,7 +975,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist, sshlogname = NULL; /* this will disable the button */ ctrl_radiobuttons(s, "Session logging:", NO_SHORTCUT, 1, HELPCTX(logging_main), - dlg_stdradiobutton_handler, + loggingbuttons_handler, I(offsetof(Config, logtype)), "Logging turned off completely", 't', I(LGTYP_NONE), "Log printable output only", 'p', I(LGTYP_ASCII), @@ -1215,7 +1243,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist, s = ctrl_getset(b, "Window/Appearance", "border", "Adjust the window border"); - ctrl_editbox(s, "Gap between text and window edge:", NO_SHORTCUT, 20, + ctrl_editbox(s, "Gap between text and window edge:", 'e', 20, HELPCTX(appearance_border), dlg_stdeditbox_handler, I(offsetof(Config,window_border)), I(-1)); @@ -1255,6 +1283,11 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist, 'r', 100, HELPCTX(translation_codepage), codepage_handler, P(NULL), P(NULL)); + s = ctrl_getset(b, "Window/Translation", "tweaks", NULL); + ctrl_checkbox(s, "Treat CJK ambiguous characters as wide", 'w', + HELPCTX(translation_cjk_ambig_wide), + dlg_stdcheckbox_handler, I(offsetof(Config,cjk_ambig_wide))); + str = dupprintf("Adjust how %s handles line drawing characters", appname); s = ctrl_getset(b, "Window/Translation", "linedraw", str); sfree(str); @@ -1391,9 +1424,9 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist, HELPCTX(connection_ipversion), dlg_stdradiobutton_handler, I(offsetof(Config, addressfamily)), - "Auto", NO_SHORTCUT, I(ADDRTYPE_UNSPEC), - "IPv4", NO_SHORTCUT, I(ADDRTYPE_IPV4), - "IPv6", NO_SHORTCUT, I(ADDRTYPE_IPV6), + "Auto", 'u', I(ADDRTYPE_UNSPEC), + "IPv4", '4', I(ADDRTYPE_IPV4), + "IPv6", '6', I(ADDRTYPE_IPV6), NULL); #endif } @@ -1647,7 +1680,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist, cipherlist_handler, P(NULL)); c->listbox.height = 6; - ctrl_checkbox(s, "Enable legacy use of single-DES in SSH 2", 'i', + ctrl_checkbox(s, "Enable legacy use of single-DES in SSH-2", 'i', HELPCTX(ssh_ciphers), dlg_stdcheckbox_handler, I(offsetof(Config,ssh2_des_cbc))); @@ -1656,7 +1689,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist, /* * The Connection/SSH/Kex panel. (Owing to repeat key * exchange, this is all meaningful in mid-session _if_ - * we're using SSH2 or haven't decided yet.) + * we're using SSH-2 or haven't decided yet.) */ if (protcfginfo != 1) { ctrl_settitle(b, "Connection/SSH/Kex", @@ -1696,11 +1729,11 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist, s = ctrl_getset(b, "Connection/SSH/Auth", "methods", "Authentication methods"); - ctrl_checkbox(s, "Attempt TIS or CryptoCard auth (SSH1)", 'm', + ctrl_checkbox(s, "Attempt TIS or CryptoCard auth (SSH-1)", 'm', HELPCTX(ssh_auth_tis), dlg_stdcheckbox_handler, I(offsetof(Config,try_tis_auth))); - ctrl_checkbox(s, "Attempt \"keyboard-interactive\" auth (SSH2)", + ctrl_checkbox(s, "Attempt \"keyboard-interactive\" auth (SSH-2)", 'i', HELPCTX(ssh_auth_ki), dlg_stdcheckbox_handler, I(offsetof(Config,try_ki_auth))); @@ -1710,7 +1743,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist, ctrl_checkbox(s, "Allow agent forwarding", 'f', HELPCTX(ssh_auth_agentfwd), dlg_stdcheckbox_handler, I(offsetof(Config,agentfwd))); - ctrl_checkbox(s, "Allow attempted changes of username in SSH2", 'u', + ctrl_checkbox(s, "Allow attempted changes of username in SSH-2", 'u', HELPCTX(ssh_auth_changeuser), dlg_stdcheckbox_handler, I(offsetof(Config,change_username))); @@ -1755,7 +1788,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist, HELPCTX(ssh_tunnels_portfwd_localhost), dlg_stdcheckbox_handler, I(offsetof(Config,lport_acceptall))); - ctrl_checkbox(s, "Remote ports do the same (SSH v2 only)", 'p', + ctrl_checkbox(s, "Remote ports do the same (SSH-2 only)", 'p', HELPCTX(ssh_tunnels_portfwd_localhost), dlg_stdcheckbox_handler, I(offsetof(Config,rport_acceptall))); @@ -1807,9 +1840,9 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist, ctrl_radiobuttons(s, NULL, NO_SHORTCUT, 3, HELPCTX(ssh_tunnels_portfwd_ipversion), portfwd_handler, P(pfd), - "Auto", NO_SHORTCUT, I(ADDRTYPE_UNSPEC), - "IPv4", NO_SHORTCUT, I(ADDRTYPE_IPV4), - "IPv6", NO_SHORTCUT, I(ADDRTYPE_IPV6), + "Auto", 'u', I(ADDRTYPE_UNSPEC), + "IPv4", '4', I(ADDRTYPE_IPV4), + "IPv6", '6', I(ADDRTYPE_IPV6), NULL); #endif ctrl_tabdelay(s, pfd->addbutton); @@ -1824,28 +1857,28 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist, s = ctrl_getset(b, "Connection/SSH/Bugs", "main", "Detection of known bugs in SSH servers"); - ctrl_droplist(s, "Chokes on SSH1 ignore messages", 'i', 20, + ctrl_droplist(s, "Chokes on SSH-1 ignore messages", 'i', 20, HELPCTX(ssh_bugs_ignore1), sshbug_handler, I(offsetof(Config,sshbug_ignore1))); - ctrl_droplist(s, "Refuses all SSH1 password camouflage", 's', 20, + ctrl_droplist(s, "Refuses all SSH-1 password camouflage", 's', 20, HELPCTX(ssh_bugs_plainpw1), sshbug_handler, I(offsetof(Config,sshbug_plainpw1))); - ctrl_droplist(s, "Chokes on SSH1 RSA authentication", 'r', 20, + ctrl_droplist(s, "Chokes on SSH-1 RSA authentication", 'r', 20, HELPCTX(ssh_bugs_rsa1), sshbug_handler, I(offsetof(Config,sshbug_rsa1))); - ctrl_droplist(s, "Miscomputes SSH2 HMAC keys", 'm', 20, + ctrl_droplist(s, "Miscomputes SSH-2 HMAC keys", 'm', 20, HELPCTX(ssh_bugs_hmac2), sshbug_handler, I(offsetof(Config,sshbug_hmac2))); - ctrl_droplist(s, "Miscomputes SSH2 encryption keys", 'e', 20, + ctrl_droplist(s, "Miscomputes SSH-2 encryption keys", 'e', 20, HELPCTX(ssh_bugs_derivekey2), sshbug_handler, I(offsetof(Config,sshbug_derivekey2))); - ctrl_droplist(s, "Requires padding on SSH2 RSA signatures", 'p', 20, + ctrl_droplist(s, "Requires padding on SSH-2 RSA signatures", 'p', 20, HELPCTX(ssh_bugs_rsapad2), sshbug_handler, I(offsetof(Config,sshbug_rsapad2))); - ctrl_droplist(s, "Misuses the session ID in PK auth", 'n', 20, + ctrl_droplist(s, "Misuses the session ID in SSH-2 PK auth", 'n', 20, HELPCTX(ssh_bugs_pksessid2), sshbug_handler, I(offsetof(Config,sshbug_pksessid2))); - ctrl_droplist(s, "Handles key re-exchange badly", 'k', 20, + ctrl_droplist(s, "Handles SSH-2 key re-exchange badly", 'k', 20, HELPCTX(ssh_bugs_rekey2), sshbug_handler, I(offsetof(Config,sshbug_rekey2))); }