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
67db0fd
..
6789e5d
100644
(file)
--- a/
telnet.c
+++ b/
telnet.c
@@
-244,6
+244,8
@@
typedef struct telnet_tag {
} state;
Config cfg;
} state;
Config cfg;
+
+ Pinger pinger;
} *Telnet;
#define TELNET_MAX_BACKLOG 4096
} *Telnet;
#define TELNET_MAX_BACKLOG 4096
@@
-644,6
+646,7
@@
static int telnet_closing(Plug plug, const char *error_msg, int error_code,
if (telnet->s) {
sk_close(telnet->s);
telnet->s = NULL;
if (telnet->s) {
sk_close(telnet->s);
telnet->s = NULL;
+ notify_remote_exit(telnet->frontend);
}
if (error_msg) {
/* A socket error has occurred. */
}
if (error_msg) {
/* A socket error has occurred. */
@@
-703,6
+706,8
@@
static const char *telnet_init(void *frontend_handle, void **backend_handle,
telnet->term_width = telnet->cfg.width;
telnet->term_height = telnet->cfg.height;
telnet->state = TOP_LEVEL;
telnet->term_width = telnet->cfg.width;
telnet->term_height = telnet->cfg.height;
telnet->state = TOP_LEVEL;
+ telnet->ldisc = NULL;
+ telnet->pinger = NULL;
*backend_handle = telnet;
/*
*backend_handle = telnet;
/*
@@
-710,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;
@@
-738,6
+746,8
@@
static const char *telnet_init(void *frontend_handle, void **backend_handle,
if ((err = sk_socket_error(telnet->s)) != NULL)
return err;
if ((err = sk_socket_error(telnet->s)) != NULL)
return err;
+ telnet->pinger = pinger_new(&telnet->cfg, &telnet_backend, telnet);
+
/*
* Initialise option states.
*/
/*
* Initialise option states.
*/
@@
-777,6
+787,8
@@
static void telnet_free(void *handle)
sfree(telnet->sb_buf);
if (telnet->s)
sk_close(telnet->s);
sfree(telnet->sb_buf);
if (telnet->s)
sk_close(telnet->s);
+ if (telnet->pinger)
+ pinger_free(telnet->pinger);
sfree(telnet);
}
/*
sfree(telnet);
}
/*
@@
-787,6
+799,7
@@
static void telnet_free(void *handle)
static void telnet_reconfig(void *handle, Config *cfg)
{
Telnet telnet = (Telnet) handle;
static void telnet_reconfig(void *handle, Config *cfg)
{
Telnet telnet = (Telnet) handle;
+ pinger_reconfig(telnet->pinger, &telnet->cfg, cfg);
telnet->cfg = *cfg; /* STRUCTURE COPY */
}
telnet->cfg = *cfg; /* STRUCTURE COPY */
}
@@
-1040,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,
@@
-1056,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
};