nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix handling of IPv6 dynamic forwardings.

Browse Source 
During the Conf revamp, I changed the internal representation of
dynamic forwardings so that they were stored as the conceptually
sensible L12345=D rather than the old D12345, and added compensation
code to translate to the latter form for backwards-compatible data
storage and for OpenSSH-harmonised GUI display. Unfortunately I forgot
that keys in the forwarding data can also prefix the L/R with a
character indicating IPv4/IPv6, and my translations didn't take
account of that possibility. Fix them.

[originally from svn r10031]
This commit is contained in:
Simon Tatham 2013-08-22 17:45:26 +00:00
parent 6805bdcd6a
commit 597cbddbb9
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config.c
View File

@ -1083,9 +1083,23 @@ static void portfwd_handler(union control *ctrl, void *dlg,
val != NULL; val != NULL;
val = conf_get_str_strs(conf, CONF_portfwd, key, &key)) { val = conf_get_str_strs(conf, CONF_portfwd, key, &key)) {
char *p; char *p;
if (!strcmp(val, "D")) if (!strcmp(val, "D")) {
p = dupprintf("D%s\t", key+1); char *L;
else /*
* A dynamic forwarding is stored as L12345=D or
* 6L12345=D (since it's mutually exclusive with
* L12345=anything else), but displayed as D12345
* to match the fiction that 'Local', 'Remote' and
* 'Dynamic' are three distinct modes and also to
* align with OpenSSH's command line option syntax
* that people will already be used to. So, for
* display purposes, find the L in the key string
* and turn it into a D.
*/
p = dupprintf("%s\t", key);
L = strchr(p, 'L');
if (L) *L = 'D';
} else
p = dupprintf("%s\t%s", key, val); p = dupprintf("%s\t%s", key, val);
dlg_listbox_add(ctrl, dlg, p); dlg_listbox_add(ctrl, dlg, p);
sfree(p); sfree(p);

13
settings.c
View File

@ -178,7 +178,7 @@ static int gppmap(void *handle, char *name, Conf *conf, int primary)
val = q; val = q;
*q = '\0'; *q = '\0';
if (primary == CONF_portfwd && buf[0] == 'D') { if (primary == CONF_portfwd && strchr(buf, 'D') != NULL) {
/* /*
* Backwards-compatibility hack: dynamic forwardings are * Backwards-compatibility hack: dynamic forwardings are
* indexed in the data store as a third type letter in the * indexed in the data store as a third type letter in the
@ -188,9 +188,10 @@ static int gppmap(void *handle, char *name, Conf *conf, int primary)
* _listening_ on a local port, and are hence mutually * _listening_ on a local port, and are hence mutually
* exclusive on the same port number. So here we translate * exclusive on the same port number. So here we translate
* the legacy storage format into the sensible internal * the legacy storage format into the sensible internal
* form. * form, by finding the D and turning it into a L.
*/ */
char *newkey = dupcat("L", buf+1, NULL); char *newkey = dupstr(buf);
*strchr(newkey, 'D') = 'L';
conf_set_str_str(conf, primary, newkey, "D"); conf_set_str_str(conf, primary, newkey, "D");
sfree(newkey); sfree(newkey);
} else { } else {
@ -232,9 +233,13 @@ static void wmap(void *handle, char const *outkey, Conf *conf, int primary)
* conceptually incoherent legacy storage format (key * conceptually incoherent legacy storage format (key
* "D<port>", value empty). * "D<port>", value empty).
*/ */
char *L;
realkey = key; /* restore it at end of loop */ realkey = key; /* restore it at end of loop */
val = ""; val = "";
key = dupcat("D", key+1, NULL); key = dupstr(key);
L = strchr(key, 'L');
if (L) *L = 'D';
} else { } else {
realkey = NULL; realkey = NULL;
} }