} state;
Config cfg;
+
+ Pinger pinger;
} *Telnet;
#define TELNET_MAX_BACKLOG 4096
b[n++] = IAC;
b[n++] = SE;
telnet->bufsize = sk_write(telnet->s, (char *)b, n);
- logbuf = dupprintf("client:\tSB %s IS %s", telopt(telnet->sb_opt),
- n == 6 ? "<nothing>" : "<stuff>");
+ logbuf = dupprintf("client:\tSB %s IS %s%s%s%s",
+ telopt(telnet->sb_opt),
+ *telnet->cfg.username ? "USER=" : "",
+ telnet->cfg.username,
+ *telnet->cfg.username ? " " : "",
+ n == 6 ? "<nothing>" :
+ (*telnet->cfg.environmt ? "<stuff>" : ""));
logevent(telnet->frontend, logbuf);
sfree(logbuf);
}
}
}
-static int telnet_closing(Plug plug, char *error_msg, int error_code,
+static int telnet_closing(Plug plug, const char *error_msg, int error_code,
int calling_back)
{
Telnet telnet = (Telnet) plug;
if (telnet->s) {
sk_close(telnet->s);
telnet->s = NULL;
+ notify_remote_exit(telnet->frontend);
}
if (error_msg) {
/* A socket error has occurred. */
logevent(telnet->frontend, error_msg);
- connection_fatal("%s", error_msg);
+ connection_fatal(telnet->frontend, "%s", error_msg);
} /* Otherwise, the remote side closed the connection normally. */
return 0;
}
* Also places the canonical host name into `realhost'. It must be
* freed by the caller.
*/
-static char *telnet_init(void *frontend_handle, void **backend_handle,
- Config *cfg,
- char *host, int port, char **realhost, int nodelay)
+static const char *telnet_init(void *frontend_handle, void **backend_handle,
+ Config *cfg,
+ char *host, int port, char **realhost,
+ int nodelay, int keepalive)
{
static const struct plug_function_table fn_table = {
telnet_closing,
telnet_sent
};
SockAddr addr;
- char *err;
+ const char *err;
Telnet telnet;
telnet = snew(struct telnet_tag);
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;
/*
sfree(buf);
}
addr = name_lookup(host, port, realhost, &telnet->cfg);
- if ((err = sk_addr_error(addr)) != NULL)
+ if ((err = sk_addr_error(addr)) != NULL) {
+ sk_addr_free(addr);
return err;
+ }
if (port < 0)
port = 23; /* default telnet port */
sfree(buf);
}
telnet->s = new_connection(addr, *realhost, port, 0, 1,
- nodelay, (Plug) telnet, &telnet->cfg);
+ nodelay, keepalive, (Plug) telnet, &telnet->cfg);
if ((err = sk_socket_error(telnet->s)) != NULL)
return err;
- sk_addr_free(addr);
+ telnet->pinger = pinger_new(&telnet->cfg, &telnet_backend, telnet);
/*
* Initialise option states.
*/
telnet->in_synch = FALSE;
+ /*
+ * We can send special commands from the start.
+ */
+ update_specials_menu(telnet->frontend);
+
return NULL;
}
sfree(telnet->sb_buf);
if (telnet->s)
sk_close(telnet->s);
+ if (telnet->pinger)
+ pinger_free(telnet->pinger);
sfree(telnet);
}
/*
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->bufsize = sk_write(telnet->s, (char *)b, 2);
}
break;
+ default:
+ break; /* never heard of it */
}
}
+static const struct telnet_special *telnet_get_specials(void *handle)
+{
+ static const struct telnet_special specials[] = {
+ {"Are You There", TS_AYT},
+ {"Break", TS_BRK},
+ {"Synch", TS_SYNCH},
+ {"Erase Character", TS_EC},
+ {"Erase Line", TS_EL},
+ {"Go Ahead", TS_GA},
+ {"No Operation", TS_NOP},
+ {NULL, TS_SEP},
+ {"Abort Process", TS_ABORT},
+ {"Abort Output", TS_AO},
+ {"Interrupt Process", TS_IP},
+ {"Suspend Process", TS_SUSP},
+ {NULL, TS_SEP},
+ {"End Of Record", TS_EOR},
+ {"End Of File", TS_EOF},
+ {NULL, TS_EXITMENU}
+ };
+ return specials;
+}
+
static Socket telnet_socket(void *handle)
{
Telnet telnet = (Telnet) handle;
telnet_sendbuffer,
telnet_size,
telnet_special,
+ telnet_get_specials,
telnet_socket,
telnet_exitcode,
telnet_sendok,