~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rationalise access to, and content of, backends[] array.
[sgt/putty]
/
config.c
diff --git
a/config.c
b/config.c
index
41bb494
..
39740b8
100644
(file)
--- a/
config.c
+++ b/
config.c
@@
-15,20
+15,6
@@
#define HOST_BOX_TITLE "Host Name (or IP address)"
#define PORT_BOX_TITLE "Port"
#define HOST_BOX_TITLE "Host Name (or IP address)"
#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,
void *data, int event)
{
static void config_host_handler(union control *ctrl, void *dlg,
void *data, int event)
{
@@
-1166,7
+1152,7
@@
void setup_config_box(struct controlbox *b, int midsession,
hp->port = c;
ctrl_columns(s, 1, 100);
hp->port = c;
ctrl_columns(s, 1, 100);
- if (!
have_backend
(PROT_SSH)) {
+ if (!
backend_from_proto
(PROT_SSH)) {
ctrl_radiobuttons(s, "Connection type:", NO_SHORTCUT, 3,
HELPCTX(session_hostname),
config_protocolbuttons_handler, P(hp),
ctrl_radiobuttons(s, "Connection type:", NO_SHORTCUT, 3,
HELPCTX(session_hostname),
config_protocolbuttons_handler, P(hp),
@@
-1257,7
+1243,7
@@
void setup_config_box(struct controlbox *b, int midsession,
{
char *sshlogname, *sshrawlogname;
if ((midsession && protocol == PROT_SSH) ||
{
char *sshlogname, *sshrawlogname;
if ((midsession && protocol == PROT_SSH) ||
- (!midsession &&
have_backend
(PROT_SSH))) {
+ (!midsession &&
backend_from_proto
(PROT_SSH))) {
sshlogname = "SSH packets";
sshrawlogname = "SSH packets and raw data";
} else {
sshlogname = "SSH packets";
sshrawlogname = "SSH packets and raw data";
} else {
@@
-1293,7
+1279,7
@@
void setup_config_box(struct controlbox *b, int midsession,
dlg_stdcheckbox_handler, I(offsetof(Config,logflush)));
if ((midsession && protocol == PROT_SSH) ||
dlg_stdcheckbox_handler, I(offsetof(Config,logflush)));
if ((midsession && protocol == PROT_SSH) ||
- (!midsession &&
have_backend
(PROT_SSH))) {
+ (!midsession &&
backend_from_proto
(PROT_SSH))) {
s = ctrl_getset(b, "Session/Logging", "ssh",
"Options specific to SSH packet logging");
ctrl_checkbox(s, "Omit known password fields", 'k',
s = ctrl_getset(b, "Session/Logging", "ssh",
"Options specific to SSH packet logging");
ctrl_checkbox(s, "Omit known password fields", 'k',
@@
-1912,7
+1898,7
@@
void setup_config_box(struct controlbox *b, int midsession,
* when we're not doing SSH.
*/
* when we're not doing SSH.
*/
- if (
have_backend
(PROT_SSH) && (!midsession || protocol == PROT_SSH)) {
+ if (
backend_from_proto
(PROT_SSH) && (!midsession || protocol == PROT_SSH)) {
/*
* The Connection/SSH panel.
/*
* The Connection/SSH panel.