}
}
+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)
{
{ "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 }
};
struct sessionsaver_data {
union control *editbox, *listbox, *loadbutton, *savebutton, *delbutton;
union control *okbutton, *cancelbutton;
- struct sesslist *sesslist;
+ struct sesslist sesslist;
int midsession;
};
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 {
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) {
+ int top, bottom, halfway, i;
if (ctrl == ssd->editbox) {
dlg_editbox_get(ctrl, dlg, savedsession,
SAVEDSESSION_LEN);
+ top = ssd->sesslist.nsessions;
+ bottom = -1;
+ while (top-bottom > 1) {
+ halfway = (top+bottom)/2;
+ i = strcmp(savedsession, ssd->sesslist.sessions[halfway]);
+ if (i <= 0 ) {
+ top = halfway;
+ } else {
+ bottom = halfway;
+ }
+ }
+ if (top == ssd->sesslist.nsessions) {
+ top -= 1;
+ }
+ dlg_listbox_select(ssd->listbox, dlg, top);
}
} else if (event == EVENT_ACTION) {
if (!ssd->midsession &&
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 {
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 &&
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) {
}
}
+struct ttymodes_data {
+ union control *modelist, *valradio, *valbox;
+ union control *addbutton, *rembutton, *listbox;
+};
+
+static void ttymodes_handler(union control *ctrl, void *dlg,
+ void *data, int event)
+{
+ Config *cfg = (Config *)data;
+ struct ttymodes_data *td =
+ (struct ttymodes_data *)ctrl->generic.context.p;
+
+ if (event == EVENT_REFRESH) {
+ if (ctrl == td->listbox) {
+ char *p = cfg->ttymodes;
+ dlg_update_start(ctrl, dlg);
+ dlg_listbox_clear(ctrl, dlg);
+ while (*p) {
+ int tabpos = strchr(p, '\t') - p;
+ char *disp = dupprintf("%.*s\t%s", tabpos, p,
+ (p[tabpos+1] == 'A') ? "(auto)" :
+ p+tabpos+2);
+ dlg_listbox_add(ctrl, dlg, disp);
+ p += strlen(p) + 1;
+ sfree(disp);
+ }
+ dlg_update_done(ctrl, dlg);
+ } else if (ctrl == td->modelist) {
+ int i;
+ dlg_update_start(ctrl, dlg);
+ dlg_listbox_clear(ctrl, dlg);
+ for (i = 0; ttymodes[i]; i++)
+ dlg_listbox_add(ctrl, dlg, ttymodes[i]);
+ dlg_listbox_select(ctrl, dlg, 0); /* *shrug* */
+ dlg_update_done(ctrl, dlg);
+ } else if (ctrl == td->valradio) {
+ dlg_radiobutton_set(ctrl, dlg, 0);
+ }
+ } else if (event == EVENT_ACTION) {
+ if (ctrl == td->addbutton) {
+ int ind = dlg_listbox_index(td->modelist, dlg);
+ if (ind >= 0) {
+ char type = dlg_radiobutton_get(td->valradio, dlg) ? 'V' : 'A';
+ int slen, left;
+ char *p, str[lenof(cfg->ttymodes)];
+ /* Construct new entry */
+ memset(str, 0, lenof(str));
+ strncpy(str, ttymodes[ind], lenof(str)-3);
+ slen = strlen(str);
+ str[slen] = '\t';
+ str[slen+1] = type;
+ slen += 2;
+ if (type == 'V') {
+ dlg_editbox_get(td->valbox, dlg, str+slen, lenof(str)-slen);
+ }
+ /* Find end of list, deleting any existing instance */
+ p = cfg->ttymodes;
+ left = lenof(cfg->ttymodes);
+ while (*p) {
+ int t = strchr(p, '\t') - p;
+ if (t == strlen(ttymodes[ind]) &&
+ strncmp(p, ttymodes[ind], t) == 0) {
+ memmove(p, p+strlen(p)+1, left - (strlen(p)+1));
+ continue;
+ }
+ left -= strlen(p) + 1;
+ p += strlen(p) + 1;
+ }
+ /* Append new entry */
+ memset(p, 0, left);
+ strncpy(p, str, left - 2);
+ dlg_refresh(td->listbox, dlg);
+ } else
+ dlg_beep(dlg);
+ } else if (ctrl == td->rembutton) {
+ char *p = cfg->ttymodes;
+ int i = 0, len = lenof(cfg->ttymodes);
+ while (*p) {
+ if (dlg_listbox_issel(td->listbox, dlg, i)) {
+ memmove(p, p+strlen(p)+1, len - (strlen(p)+1));
+ i++;
+ continue;
+ }
+ len -= strlen(p) + 1;
+ p += strlen(p) + 1;
+ i++;
+ }
+ memset(p, 0, lenof(cfg->ttymodes) - len);
+ dlg_refresh(td->listbox, dlg);
+ }
+ }
+}
+
struct environ_data {
union control *varbox, *valbox, *addbutton, *rembutton, *listbox;
};
struct portfwd_data {
union control *addbutton, *rembutton, *listbox;
union control *sourcebox, *destbox, *direction;
+#ifndef NO_IPV6
union control *addressfamily;
+#endif
};
static void portfwd_handler(union control *ctrl, void *dlg,
* Default is Local.
*/
dlg_radiobutton_set(ctrl, dlg, 0);
- } else if (ctrl == pfd->addressfamily) {
+#ifndef NO_IPV6
+ } else if (ctrl == pfd->addressfamily) {
dlg_radiobutton_set(ctrl, dlg, 0);
+#endif
}
} else if (event == EVENT_ACTION) {
if (ctrl == pfd->addbutton) {
int whichbutton;
i = 0;
+#ifndef NO_IPV6
whichbutton = dlg_radiobutton_get(pfd->addressfamily, dlg);
if (whichbutton == 1)
str[i++] = '4';
else if (whichbutton == 2)
str[i++] = '6';
+#endif
whichbutton = dlg_radiobutton_get(pfd->direction, dlg);
if (whichbutton == 0)
if (type != 'D') {
*p++ = '\t';
dlg_editbox_get(pfd->destbox, dlg, p,
- sizeof(str)-1 - (p - str));
+ sizeof(str) - (p - str));
if (!*p || !strchr(p, ':')) {
dlg_error_msg(dlg,
"You need to specify a destination address\n"
p++;
p++;
}
- if ((p - cfg->portfwd) + strlen(str) + 2 <
+ if ((p - cfg->portfwd) + strlen(str) + 2 <=
sizeof(cfg->portfwd)) {
strcpy(p, str);
p[strlen(str) + 1] = '\0';
}
}
-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;
struct charclass_data *ccd;
struct colour_data *cd;
+ struct ttymodes_data *td;
struct environ_data *ed;
struct portfwd_data *pfd;
union control *c;
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));
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),
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));
'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);
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
}
I(sizeof(((Config *)0)->remote_cmd)));
s = ctrl_getset(b, "Connection/SSH", "protocol", "Protocol options");
- ctrl_checkbox(s, "Don't allocate a pseudo-terminal", 'p',
- HELPCTX(ssh_nopty),
- dlg_stdcheckbox_handler,
- I(offsetof(Config,nopty)));
ctrl_checkbox(s, "Don't start a shell or command at all", 'n',
HELPCTX(ssh_noshell),
dlg_stdcheckbox_handler,
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)));
/*
* 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",
ctrl_settitle(b, "Connection/SSH/Auth",
"Options controlling SSH authentication");
+ s = ctrl_getset(b, "Connection/SSH/Auth", "main", NULL);
+ ctrl_checkbox(s, "Bypass authentication entirely (SSH-2 only)", 'b',
+ HELPCTX(ssh_auth_bypass),
+ dlg_stdcheckbox_handler,
+ I(offsetof(Config,ssh_no_userauth)));
+
s = ctrl_getset(b, "Connection/SSH/Auth", "methods",
"Authentication methods");
- ctrl_checkbox(s, "Attempt TIS or CryptoCard auth (SSH1)", 'm',
+ ctrl_checkbox(s, "Attempt authentication using Pageant", 'p',
+ HELPCTX(ssh_auth_pageant),
+ dlg_stdcheckbox_handler,
+ I(offsetof(Config,tryagent)));
+ 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)));
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)));
if (!midsession) {
/*
+ * The Connection/SSH/TTY panel.
+ */
+ ctrl_settitle(b, "Connection/SSH/TTY", "Remote terminal settings");
+
+ s = ctrl_getset(b, "Connection/SSH/TTY", "sshtty", NULL);
+ ctrl_checkbox(s, "Don't allocate a pseudo-terminal", 'p',
+ HELPCTX(ssh_nopty),
+ dlg_stdcheckbox_handler,
+ I(offsetof(Config,nopty)));
+
+ s = ctrl_getset(b, "Connection/SSH/TTY", "ttymodes",
+ "Terminal modes");
+ td = (struct ttymodes_data *)
+ ctrl_alloc(b, sizeof(struct ttymodes_data));
+ ctrl_columns(s, 2, 75, 25);
+ c = ctrl_text(s, "Terminal modes to send:", HELPCTX(ssh_ttymodes));
+ c->generic.column = 0;
+ td->rembutton = ctrl_pushbutton(s, "Remove", 'r',
+ HELPCTX(ssh_ttymodes),
+ ttymodes_handler, P(td));
+ td->rembutton->generic.column = 1;
+ td->rembutton->generic.tabdelay = 1;
+ ctrl_columns(s, 1, 100);
+ td->listbox = ctrl_listbox(s, NULL, NO_SHORTCUT,
+ HELPCTX(ssh_ttymodes),
+ ttymodes_handler, P(td));
+ td->listbox->listbox.multisel = 1;
+ td->listbox->listbox.height = 4;
+ td->listbox->listbox.ncols = 2;
+ td->listbox->listbox.percentages = snewn(2, int);
+ td->listbox->listbox.percentages[0] = 40;
+ td->listbox->listbox.percentages[1] = 60;
+ ctrl_tabdelay(s, td->rembutton);
+ ctrl_columns(s, 2, 75, 25);
+ td->modelist = ctrl_droplist(s, "Mode:", 'm', 67,
+ HELPCTX(ssh_ttymodes),
+ ttymodes_handler, P(td));
+ td->modelist->generic.column = 0;
+ td->addbutton = ctrl_pushbutton(s, "Add", 'd',
+ HELPCTX(ssh_ttymodes),
+ ttymodes_handler, P(td));
+ td->addbutton->generic.column = 1;
+ td->addbutton->generic.tabdelay = 1;
+ ctrl_columns(s, 1, 100); /* column break */
+ /* Bit of a hack to get the value radio buttons and
+ * edit-box on the same row. */
+ ctrl_columns(s, 3, 25, 50, 25);
+ c = ctrl_text(s, "Value:", HELPCTX(ssh_ttymodes));
+ c->generic.column = 0;
+ td->valradio = ctrl_radiobuttons(s, NULL, NO_SHORTCUT, 2,
+ HELPCTX(ssh_ttymodes),
+ ttymodes_handler, P(td),
+ "Auto", NO_SHORTCUT, P(NULL),
+ "This:", NO_SHORTCUT, P(NULL),
+ NULL);
+ td->valradio->generic.column = 1;
+ td->valbox = ctrl_editbox(s, NULL, NO_SHORTCUT, 100,
+ HELPCTX(ssh_ttymodes),
+ ttymodes_handler, P(td), P(NULL));
+ td->valbox->generic.column = 2;
+ ctrl_tabdelay(s, td->addbutton);
+
+ }
+
+ if (!midsession) {
+ /*
* The Connection/SSH/X11 panel.
*/
ctrl_settitle(b, "Connection/SSH/X11",
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)));
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);
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)));
}
projects / u / mdw / putty / blobdiff