nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-23 15:09:24 -05:00
Code Issues Projects Releases Wiki Activity

I've changed my mind about what the IP version selection options in

Browse Source 
the config should do when IPv6 is configured out. They shouldn't sit
there looking silly with only `Auto' and `IPv4' settings: they
should instead be completely absent. I had thought the former was
acceptable since IPv4-only was a configuration that people should
only be using if their compilers didn't support IPv6, but now it
occurs to me that ports to fundamentally non-IPv6-supporting
platforms are not implausible, and on such ports the presence of a
vestigial config option under the _standard_ build conditions would
be a low-quality solution.

[originally from svn r5084]
This commit is contained in:
Simon Tatham 2005-01-09 11:44:21 +00:00
parent c57e9f0672
commit c1d3784a52
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
config.c
View File

@ -1378,23 +1378,18 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
'p', HELPCTX(connection_tcpkeepalive), 'p', HELPCTX(connection_tcpkeepalive),
dlg_stdcheckbox_handler, dlg_stdcheckbox_handler,
I(offsetof(Config,tcp_keepalives))); I(offsetof(Config,tcp_keepalives)));
#ifndef NO_IPV6
s = ctrl_getset(b, "Connection", "ipversion", s = ctrl_getset(b, "Connection", "ipversion",
"Internet protocol version"); "Internet protocol version");
ctrl_radiobuttons(s, NULL, NO_SHORTCUT, ctrl_radiobuttons(s, NULL, NO_SHORTCUT, 3,
#ifndef NO_IPV6
3,
#else
2,
#endif
HELPCTX(connection_ipversion), HELPCTX(connection_ipversion),
dlg_stdradiobutton_handler, dlg_stdradiobutton_handler,
I(offsetof(Config, addressfamily)), I(offsetof(Config, addressfamily)),
"Auto", NO_SHORTCUT, I(ADDRTYPE_UNSPEC), "Auto", NO_SHORTCUT, I(ADDRTYPE_UNSPEC),
"IPv4", NO_SHORTCUT, I(ADDRTYPE_IPV4), "IPv4", NO_SHORTCUT, I(ADDRTYPE_IPV4),
#ifndef NO_IPV6
"IPv6", NO_SHORTCUT, I(ADDRTYPE_IPV6), "IPv6", NO_SHORTCUT, I(ADDRTYPE_IPV6),
#endif
NULL); NULL);
#endif
} }
/* /*
@ -1801,21 +1796,16 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
"Remote", 'm', P(NULL), "Remote", 'm', P(NULL),
"Dynamic", 'y', P(NULL), "Dynamic", 'y', P(NULL),
NULL); NULL);
pfd->addressfamily =
ctrl_radiobuttons(s, NULL, NO_SHORTCUT,
#ifndef NO_IPV6 #ifndef NO_IPV6
3, pfd->addressfamily =
#else ctrl_radiobuttons(s, NULL, NO_SHORTCUT, 3,
2,
#endif
HELPCTX(ssh_tunnels_portfwd_ipversion), HELPCTX(ssh_tunnels_portfwd_ipversion),
portfwd_handler, P(pfd), portfwd_handler, P(pfd),
"Auto", NO_SHORTCUT, I(ADDRTYPE_UNSPEC), "Auto", NO_SHORTCUT, I(ADDRTYPE_UNSPEC),
"IPv4", NO_SHORTCUT, I(ADDRTYPE_IPV4), "IPv4", NO_SHORTCUT, I(ADDRTYPE_IPV4),
#ifndef NO_IPV6
"IPv6", NO_SHORTCUT, I(ADDRTYPE_IPV6), "IPv6", NO_SHORTCUT, I(ADDRTYPE_IPV6),
#endif
NULL); NULL);
#endif
ctrl_tabdelay(s, pfd->addbutton); ctrl_tabdelay(s, pfd->addbutton);
ctrl_columns(s, 1, 100); ctrl_columns(s, 1, 100);