nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 06:38:37 -05:00
Code Issues Projects Releases Wiki Activity

Various SSH-related things were appearing in the PuTTYtel configuration dialog,

Browse Source 
probably since the addition of the serial backend. Use a more robust check for
SSH support.

[originally from svn r7088]
This commit is contained in:
Jacob Nevins 2007-01-10 00:16:53 +00:00
parent 097fc8b43d
commit 726def0881
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
config.c
View File

@ -15,6 +15,20 @@
#define HOST_BOX_TITLE "Host Name (or IP address)" #define HOST_BOX_TITLE "Host Name (or IP address)"
#define PORT_BOX_TITLE "Port" #define PORT_BOX_TITLE "Port"
/*
* Convenience function: determine whether this binary supports a
* given backend.
*/
static int have_backend(int protocol)
{
struct backend_list *p = backends;
for (p = backends; p->name; p++) {
if (p->protocol == protocol)
return 1;
}
return 0;
}
static void config_host_handler(union control *ctrl, void *dlg, static void config_host_handler(union control *ctrl, void *dlg,
void *data, int event) void *data, int event)
{ {
@ -1059,7 +1073,6 @@ void setup_config_box(struct controlbox *b, int midsession,
if (!midsession) { if (!midsession) {
struct hostport *hp = (struct hostport *) struct hostport *hp = (struct hostport *)
ctrl_alloc(b, sizeof(struct hostport)); ctrl_alloc(b, sizeof(struct hostport));
int i, gotssh;
s = ctrl_getset(b, "Session", "hostport", s = ctrl_getset(b, "Session", "hostport",
"Specify the destination you want to connect to"); "Specify the destination you want to connect to");
@ -1076,13 +1089,7 @@ void setup_config_box(struct controlbox *b, int midsession,
hp->port = c; hp->port = c;
ctrl_columns(s, 1, 100); ctrl_columns(s, 1, 100);
gotssh = FALSE; if (!have_backend(PROT_SSH)) {
for (i = 0; backends[i].name; i++)
if (backends[i].protocol == PROT_SSH) {
gotssh = TRUE;
break;
}
if (!gotssh) {
ctrl_radiobuttons(s, "Connection type:", NO_SHORTCUT, 3, ctrl_radiobuttons(s, "Connection type:", NO_SHORTCUT, 3,
HELPCTX(session_hostname), HELPCTX(session_hostname),
config_protocolbuttons_handler, P(hp), config_protocolbuttons_handler, P(hp),
@ -1173,7 +1180,7 @@ void setup_config_box(struct controlbox *b, int midsession,
{ {
char *sshlogname, *sshrawlogname; char *sshlogname, *sshrawlogname;
if ((midsession && protocol == PROT_SSH) || if ((midsession && protocol == PROT_SSH) ||
(!midsession && backends[3].name != NULL)) { (!midsession && have_backend(PROT_SSH))) {
sshlogname = "SSH packets"; sshlogname = "SSH packets";
sshrawlogname = "SSH packets and raw data"; sshrawlogname = "SSH packets and raw data";
} else { } else {
@ -1209,7 +1216,7 @@ void setup_config_box(struct controlbox *b, int midsession,
dlg_stdcheckbox_handler, I(offsetof(Config,logflush))); dlg_stdcheckbox_handler, I(offsetof(Config,logflush)));
if ((midsession && protocol == PROT_SSH) || if ((midsession && protocol == PROT_SSH) ||
(!midsession && backends[3].name != NULL)) { (!midsession && have_backend(PROT_SSH))) {
s = ctrl_getset(b, "Session/Logging", "ssh", s = ctrl_getset(b, "Session/Logging", "ssh",
"Options specific to SSH packet logging"); "Options specific to SSH packet logging");
ctrl_checkbox(s, "Omit known password fields", 'k', ctrl_checkbox(s, "Omit known password fields", 'k',
@ -1828,7 +1835,7 @@ void setup_config_box(struct controlbox *b, int midsession,
* when we're not doing SSH. * when we're not doing SSH.
*/ */
if (backends[3].name != NULL && (!midsession || protocol == PROT_SSH)) { if (have_backend(PROT_SSH) && (!midsession || protocol == PROT_SSH)) {
/* /*
* The Connection/SSH panel. * The Connection/SSH panel.