projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrate unfix.org's IPv6 patches up to level 10, with rather a lot
[u/mdw/putty]
/
telnet.c
diff --git
a/telnet.c
b/telnet.c
index
8b2c428
..
6789e5d
100644
(file)
--- a/
telnet.c
+++ b/
telnet.c
@@
-715,11
+715,14
@@
static const char *telnet_init(void *frontend_handle, void **backend_handle,
*/
{
char *buf;
*/
{
char *buf;
- buf = dupprintf("Looking up host \"%s\"", host);
+ buf = dupprintf("Looking up host \"%s\"%s", host,
+ (cfg->addressfamily == ADDRTYPE_IPV4 ? " (IPv4)" :
+ (cfg->addressfamily == ADDRTYPE_IPV6 ? " (IPv6)" :
+ "")));
logevent(telnet->frontend, buf);
sfree(buf);
}
logevent(telnet->frontend, buf);
sfree(buf);
}
- addr = name_lookup(host, port, realhost, &telnet->cfg);
+ addr = name_lookup(host, port, realhost, &telnet->cfg
, cfg->addressfamily
);
if ((err = sk_addr_error(addr)) != NULL) {
sk_addr_free(addr);
return err;
if ((err = sk_addr_error(addr)) != NULL) {
sk_addr_free(addr);
return err;
@@
-1050,6
+1053,14
@@
static int telnet_exitcode(void *handle)
return 0;
}
return 0;
}
+/*
+ * cfg_info for Telnet does nothing at all.
+ */
+static int telnet_cfg_info(void *handle)
+{
+ return 0;
+}
+
Backend telnet_backend = {
telnet_init,
telnet_free,
Backend telnet_backend = {
telnet_init,
telnet_free,
@@
-1066,5
+1077,6
@@
Backend telnet_backend = {
telnet_provide_ldisc,
telnet_provide_logctx,
telnet_unthrottle,
telnet_provide_ldisc,
telnet_provide_logctx,
telnet_unthrottle,
+ telnet_cfg_info,
23
};
23
};