nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Use the new host_str* functions to improve IPv6 literal support.

Browse Source 
I've gone through everywhere we handle host names / addresses (on
command lines, in PuTTY config, in port forwarding, in X display
names, in host key storage...) and tried to make them handle IPv6
literals sensibly, by using the host_str* functions I introduced in my
previous commit. Generally it's now OK to use a bracketed IPv6 literal
anywhere a hostname might have been valid; in a few cases where no
ambiguity exists (e.g. no :port suffix is permitted anyway)
unbracketed IPv6 literals are also acceptable.

[originally from svn r10120]
This commit is contained in:
Simon Tatham
2014-01-25 15:58:54 +00:00
parent 0348f57077
commit 8da4fa5063
14 changed files with 65 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ssh.c
View File

@ -3411,25 +3411,27 @@ static const char *connect_to_host(Ssh ssh, char *host, int port,
loghost = conf_get_str(ssh->conf, CONF_loghost);
if (*loghost) {
char *colon;
char *tmphost;
char *colon;
ssh->savedhost = dupstr(loghost);
tmphost = dupstr(loghost);
ssh->savedport = 22; /* default ssh port */
/*
* A colon suffix on savedhost also lets us affect
* A colon suffix on the hostname string also lets us affect
* savedport.
*
* (FIXME: do something about IPv6 address literals here.)
*/
colon = strrchr(ssh->savedhost, ':');
colon = host_strrchr(tmphost, ':');
if (colon) {
*colon++ = '\0';
if (*colon)
ssh->savedport = atoi(colon);
}
ssh->savedhost = host_strduptrim(tmphost);
sfree(tmphost);
} else {
ssh->savedhost = dupstr(host);
ssh->savedhost = host_strduptrim(host);
if (port < 0)
port = 22; /* default ssh port */
ssh->savedport = port;
@ -4915,13 +4917,15 @@ static void ssh_setup_portfwd(Ssh ssh, Conf *conf)
if (*kp == 'L' || *kp == 'R')
type = *kp++;
if ((kp2 = strchr(kp, ':')) != NULL) {
if ((kp2 = host_strchr(kp, ':')) != NULL) {
/*
* There's a colon in the middle of the source port
* string, which means that the part before it is
* actually a source address.
*/
saddr = dupprintf("%.*s", (int)(kp2 - kp), kp);
char *saddr_tmp = dupprintf("%.*s", (int)(kp2 - kp), kp);
saddr = host_strduptrim(saddr_tmp);
sfree(saddr_tmp);
sports = kp2+1;
} else {
saddr = NULL;
@ -4948,7 +4952,7 @@ static void ssh_setup_portfwd(Ssh ssh, Conf *conf)
} else {
/* ordinary forwarding */
vp = val;
vp2 = vp + strcspn(vp, ":");
vp2 = vp + host_strcspn(vp, ":");
host = dupprintf("%.*s", (int)(vp2 - vp), vp);
if (vp2)
vp2++;
@ -11024,7 +11028,11 @@ void ssh_send_port_open(void *channel, char *hostname, int port, char *org)
PKT_END);
} else {
pktout = ssh2_chanopen_init(c, "direct-tcpip");
ssh2_pkt_addstring(pktout, hostname);
{
char *trimmed_host = host_strduptrim(hostname);
ssh2_pkt_addstring(pktout, trimmed_host);
sfree(trimmed_host);
}
ssh2_pkt_adduint32(pktout, port);
/*
* We make up values for the originator data; partly it's