union control *editbox, *listbox, *loadbutton, *savebutton, *delbutton;
union control *okbutton, *cancelbutton;
struct sesslist *sesslist;
+ int midsession;
};
/*
* allocate space to store the current contents of the saved
* session edit box (since it must persist even when we switch
* panels, but is not part of the Config).
- *
- * Of course, this doesn't need to be done mid-session.
*/
if (!ssd->editbox) {
savedsession = NULL;
SAVEDSESSION_LEN);
}
} else if (event == EVENT_ACTION) {
- if (ctrl == ssd->listbox || ctrl == ssd->loadbutton) {
+ if (!ssd->midsession &&
+ (ctrl == ssd->listbox ||
+ (ssd->loadbutton && ctrl == ssd->loadbutton))) {
/*
* The user has double-clicked a session, or hit Load.
* We must load the selected session, and then
get_sesslist(ssd->sesslist, TRUE);
dlg_refresh(ssd->editbox, dlg);
dlg_refresh(ssd->listbox, dlg);
- } else if (ctrl == ssd->delbutton) {
+ } else if (!ssd->midsession &&
+ ssd->delbutton && ctrl == ssd->delbutton) {
int i = dlg_listbox_index(ssd->listbox, dlg);
if (i <= 0) {
dlg_beep(dlg);
dlg_refresh(ssd->listbox, dlg);
}
} else if (ctrl == ssd->okbutton) {
- if (!savedsession) {
+ if (ssd->midsession) {
/* In a mid-session Change Settings, Apply is always OK. */
dlg_end(dlg, 1);
return;
struct portfwd_data {
union control *addbutton, *rembutton, *listbox;
union control *sourcebox, *destbox, *direction;
+ union control *addressfamily;
};
static void portfwd_handler(union control *ctrl, void *dlg,
* Default is Local.
*/
dlg_radiobutton_set(ctrl, dlg, 0);
+ } else if (ctrl == pfd->addressfamily) {
+ dlg_radiobutton_set(ctrl, dlg, 0);
}
} else if (event == EVENT_ACTION) {
if (ctrl == pfd->addbutton) {
char str[sizeof(cfg->portfwd)];
char *p;
- int whichbutton = dlg_radiobutton_get(pfd->direction, dlg);
+ int i, type;
+ int whichbutton;
+
+ i = 0;
+ whichbutton = dlg_radiobutton_get(pfd->addressfamily, dlg);
+ if (whichbutton == 1)
+ str[i++] = '4';
+ else if (whichbutton == 2)
+ str[i++] = '6';
+
+ whichbutton = dlg_radiobutton_get(pfd->direction, dlg);
if (whichbutton == 0)
- str[0] = 'L';
+ type = 'L';
else if (whichbutton == 1)
- str[0] = 'R';
+ type = 'R';
else
- str[0] = 'D';
- dlg_editbox_get(pfd->sourcebox, dlg, str+1, sizeof(str) - 2);
- if (!str[1]) {
+ type = 'D';
+ str[i++] = type;
+
+ dlg_editbox_get(pfd->sourcebox, dlg, str+i, sizeof(str) - i);
+ if (!str[2]) {
dlg_error_msg(dlg, "You need to specify a source port number");
return;
}
p = str + strlen(str);
- if (str[0] != 'D') {
+ if (type != 'D') {
*p++ = '\t';
dlg_editbox_get(pfd->destbox, dlg, p,
sizeof(str)-1 - (p - str));
}
void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
- int midsession, int protocol)
+ int midsession, int protocol, int protcfginfo)
{
struct controlset *s;
struct sessionsaver_data *ssd;
ssd = (struct sessionsaver_data *)
ctrl_alloc(b, sizeof(struct sessionsaver_data));
memset(ssd, 0, sizeof(*ssd));
- ssd->sesslist = (midsession ? NULL : sesslist);
+ ssd->midsession = midsession;
/*
* The standard panel that appears at the bottom of all panels:
sessionsaver_handler, P(ssd));
ssd->listbox->generic.column = 0;
ssd->listbox->listbox.height = 7;
- ssd->loadbutton = ctrl_pushbutton(s, "Load", 'l',
- HELPCTX(session_saved),
- sessionsaver_handler, P(ssd));
- ssd->loadbutton->generic.column = 1;
+ if (!midsession) {
+ ssd->loadbutton = ctrl_pushbutton(s, "Load", 'l',
+ HELPCTX(session_saved),
+ sessionsaver_handler, P(ssd));
+ ssd->loadbutton->generic.column = 1;
+ } else {
+ /* We can't offer the Load button mid-session, as it would allow the
+ * user to load and subsequently save settings they can't see. (And
+ * also change otherwise immutable settings underfoot; that probably
+ * shouldn't be a problem, but.) */
+ ssd->loadbutton = NULL;
+ }
+ /* "Save" button is permitted mid-session. */
ssd->savebutton = ctrl_pushbutton(s, "Save", 'v',
HELPCTX(session_saved),
sessionsaver_handler, P(ssd));
ssd->savebutton->generic.column = 1;
- ssd->delbutton = ctrl_pushbutton(s, "Delete", 'd',
- HELPCTX(session_saved),
- sessionsaver_handler, P(ssd));
- ssd->delbutton->generic.column = 1;
+ if (!midsession) {
+ ssd->delbutton = ctrl_pushbutton(s, "Delete", 'd',
+ HELPCTX(session_saved),
+ sessionsaver_handler, P(ssd));
+ ssd->delbutton->generic.column = 1;
+ } else {
+ /* Disable the Delete button mid-session too, for UI consistency. */
+ ssd->delbutton = NULL;
+ }
ctrl_columns(s, 1, 100);
s = ctrl_getset(b, "Session", "otheropts", NULL);
if (protocol >= 0) {
ctrl_settitle(b, "Connection", "Options controlling the connection");
+ s = ctrl_getset(b, "Connection", "keepalive",
+ "Sending of null packets to keep session active");
+ ctrl_editbox(s, "Seconds between keepalives (0 to turn off)", 'k', 20,
+ HELPCTX(connection_keepalive),
+ dlg_stdeditbox_handler, I(offsetof(Config,ping_interval)),
+ I(-1));
+
if (!midsession) {
- s = ctrl_getset(b, "Connection", "data",
- "Data to send to the server");
+ s = ctrl_getset(b, "Connection", "tcp",
+ "Low-level TCP connection options");
+ ctrl_checkbox(s, "Disable Nagle's algorithm (TCP_NODELAY option)",
+ 'n', HELPCTX(connection_nodelay),
+ dlg_stdcheckbox_handler,
+ I(offsetof(Config,tcp_nodelay)));
+ ctrl_checkbox(s, "Enable TCP keepalives (SO_KEEPALIVE option)",
+ 'p', HELPCTX(connection_tcpkeepalive),
+ dlg_stdcheckbox_handler,
+ I(offsetof(Config,tcp_keepalives)));
+ s = ctrl_getset(b, "Connection", "ipversion",
+ "Internet protocol version");
+ ctrl_radiobuttons(s, NULL, NO_SHORTCUT,
+#ifndef NO_IPV6
+ 3,
+#else
+ 2,
+#endif
+ HELPCTX(connection_ipversion),
+ dlg_stdradiobutton_handler,
+ I(offsetof(Config, addressfamily)),
+ "Auto", NO_SHORTCUT, I(ADDRTYPE_UNSPEC),
+ "IPv4", NO_SHORTCUT, I(ADDRTYPE_IPV4),
+#ifndef NO_IPV6
+ "IPv6", NO_SHORTCUT, I(ADDRTYPE_IPV6),
+#endif
+ NULL);
+ }
+
+ /*
+ * A sub-panel Connection/Data, containing options that
+ * decide on data to send to the server.
+ */
+ if (!midsession) {
+ ctrl_settitle(b, "Connection/Data", "Data to send to the server");
+
+ s = ctrl_getset(b, "Connection/Data", "login",
+ "Login details");
+ ctrl_editbox(s, "Auto-login username", 'u', 50,
+ HELPCTX(connection_username),
+ dlg_stdeditbox_handler, I(offsetof(Config,username)),
+ I(sizeof(((Config *)0)->username)));
+
+ s = ctrl_getset(b, "Connection/Data", "term",
+ "Terminal details");
ctrl_editbox(s, "Terminal-type string", 't', 50,
HELPCTX(connection_termtype),
dlg_stdeditbox_handler, I(offsetof(Config,termtype)),
HELPCTX(connection_termspeed),
dlg_stdeditbox_handler, I(offsetof(Config,termspeed)),
I(sizeof(((Config *)0)->termspeed)));
- ctrl_editbox(s, "Auto-login username", 'u', 50,
- HELPCTX(connection_username),
- dlg_stdeditbox_handler, I(offsetof(Config,username)),
- I(sizeof(((Config *)0)->username)));
- ctrl_text(s, "Environment variables:", HELPCTX(telnet_environ));
+ s = ctrl_getset(b, "Connection/Data", "env",
+ "Environment variables");
ctrl_columns(s, 2, 80, 20);
ed = (struct environ_data *)
ctrl_alloc(b, sizeof(struct environ_data));
ed->listbox->listbox.percentages[1] = 70;
}
- s = ctrl_getset(b, "Connection", "keepalive",
- "Sending of null packets to keep session active");
- ctrl_editbox(s, "Seconds between keepalives (0 to turn off)", 'k', 20,
- HELPCTX(connection_keepalive),
- dlg_stdeditbox_handler, I(offsetof(Config,ping_interval)),
- I(-1));
-
- if (!midsession) {
- s = ctrl_getset(b, "Connection", "tcp",
- "Low-level TCP connection options");
- ctrl_checkbox(s, "Disable Nagle's algorithm (TCP_NODELAY option)",
- 'n', HELPCTX(connection_nodelay),
- dlg_stdcheckbox_handler,
- I(offsetof(Config,tcp_nodelay)));
- ctrl_checkbox(s, "Enable TCP keepalives (SO_KEEPALIVE option)",
- 'p', HELPCTX(connection_tcpkeepalive),
- dlg_stdcheckbox_handler,
- I(offsetof(Config,tcp_keepalives)));
- }
-
}
if (!midsession) {
/*
* The Connection/SSH/Kex panel. (Owing to repeat key
- * exchange, this is all meaningful in mid-session.)
+ * exchange, this is all meaningful in mid-session _if_
+ * we're using SSH2 or haven't decided yet.)
*/
- ctrl_settitle(b, "Connection/SSH/Kex",
- "Options controlling SSH key exchange");
-
- s = ctrl_getset(b, "Connection/SSH/Kex", "main",
- "Key exchange algorithm options");
- c = ctrl_draglist(s, "Algorithm selection policy", 's',
- HELPCTX(ssh_kexlist),
- kexlist_handler, P(NULL));
- c->listbox.height = 5;
-
- s = ctrl_getset(b, "Connection/SSH/Kex", "repeat",
- "Options controlling key re-exchange");
-
- ctrl_editbox(s, "Max minutes before rekey (0 for no limit)", 't', 20,
- HELPCTX(ssh_kex_repeat),
- dlg_stdeditbox_handler,
- I(offsetof(Config,ssh_rekey_time)),
- I(-1));
- ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20,
- HELPCTX(ssh_kex_repeat),
- dlg_stdeditbox_handler,
- I(offsetof(Config,ssh_rekey_data)),
- I(16));
- ctrl_text(s, "(Use 1M for 1 megabyte, 1G for 1 gigabyte etc)",
- HELPCTX(ssh_kex_repeat));
+ if (protcfginfo != 1) {
+ ctrl_settitle(b, "Connection/SSH/Kex",
+ "Options controlling SSH key exchange");
+
+ s = ctrl_getset(b, "Connection/SSH/Kex", "main",
+ "Key exchange algorithm options");
+ c = ctrl_draglist(s, "Algorithm selection policy", 's',
+ HELPCTX(ssh_kexlist),
+ kexlist_handler, P(NULL));
+ c->listbox.height = 5;
+
+ s = ctrl_getset(b, "Connection/SSH/Kex", "repeat",
+ "Options controlling key re-exchange");
+
+ ctrl_editbox(s, "Max minutes before rekey (0 for no limit)", 't', 20,
+ HELPCTX(ssh_kex_repeat),
+ dlg_stdeditbox_handler,
+ I(offsetof(Config,ssh_rekey_time)),
+ I(-1));
+ ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20,
+ HELPCTX(ssh_kex_repeat),
+ dlg_stdeditbox_handler,
+ I(offsetof(Config,ssh_rekey_data)),
+ I(16));
+ ctrl_text(s, "(Use 1M for 1 megabyte, 1G for 1 gigabyte etc)",
+ HELPCTX(ssh_kex_repeat));
+ }
if (!midsession) {
dlg_stdfilesel_handler, I(offsetof(Config, keyfile)));
}
- /*
- * The Connection/SSH/Tunnels panel. Some of this _is_
- * still available in mid-session.
- */
- ctrl_settitle(b, "Connection/SSH/Tunnels",
- "Options controlling SSH tunnelling");
-
if (!midsession) {
- s = ctrl_getset(b, "Connection/SSH/Tunnels", "x11", "X11 forwarding");
+ /*
+ * The Connection/SSH/X11 panel.
+ */
+ ctrl_settitle(b, "Connection/SSH/X11",
+ "Options controlling SSH X11 forwarding");
+
+ s = ctrl_getset(b, "Connection/SSH/X11", "x11", "X11 forwarding");
ctrl_checkbox(s, "Enable X11 forwarding", 'e',
HELPCTX(ssh_tunnels_x11),
dlg_stdcheckbox_handler,I(offsetof(Config,x11_forward)));
"XDM-Authorization-1", I(X11_XDM), NULL);
}
+ /*
+ * The Tunnels panel _is_ still available in mid-session.
+ */
+ ctrl_settitle(b, "Connection/SSH/Tunnels",
+ "Options controlling SSH port forwarding");
+
s = ctrl_getset(b, "Connection/SSH/Tunnels", "portfwd",
"Port forwarding");
ctrl_checkbox(s, "Local ports accept connections from other hosts",'t',
"Remote", 'm', P(NULL),
"Dynamic", 'y', P(NULL),
NULL);
+ pfd->addressfamily =
+ ctrl_radiobuttons(s, NULL, NO_SHORTCUT,
+#ifndef NO_IPV6
+ 3,
+#else
+ 2,
+#endif
+ HELPCTX(ssh_tunnels_portfwd_ipversion),
+ portfwd_handler, P(pfd),
+ "Auto", NO_SHORTCUT, I(ADDRTYPE_UNSPEC),
+ "IPv4", NO_SHORTCUT, I(ADDRTYPE_IPV4),
+#ifndef NO_IPV6
+ "IPv6", NO_SHORTCUT, I(ADDRTYPE_IPV6),
+#endif
+ NULL);
ctrl_tabdelay(s, pfd->addbutton);
ctrl_columns(s, 1, 100);
projects / u / mdw / putty / blobdiff