int term_width, term_height;
void *frontend;
- Config cfg;
+ Conf *conf;
/* In case we need to read a username from the terminal before starting */
prompts_t *prompt;
int calling_back)
{
Rlogin rlogin = (Rlogin) plug;
+
+ /*
+ * We don't implement independent EOF in each direction for Telnet
+ * connections; as soon as we get word that the remote side has
+ * sent us EOF, we wind up the whole connection.
+ */
+
if (rlogin->s) {
sk_close(rlogin->s);
rlogin->s = NULL;
{
char z = 0;
char *p;
+
sk_write(rlogin->s, &z, 1);
- sk_write(rlogin->s, rlogin->cfg.localusername,
- strlen(rlogin->cfg.localusername));
+ p = conf_get_str(rlogin->conf, CONF_localusername);
+ sk_write(rlogin->s, p, strlen(p));
sk_write(rlogin->s, &z, 1);
- sk_write(rlogin->s, ruser,
- strlen(ruser));
+ sk_write(rlogin->s, ruser, strlen(ruser));
sk_write(rlogin->s, &z, 1);
- sk_write(rlogin->s, rlogin->cfg.termtype,
- strlen(rlogin->cfg.termtype));
+ p = conf_get_str(rlogin->conf, CONF_termtype);
+ sk_write(rlogin->s, p, strlen(p));
sk_write(rlogin->s, "/", 1);
- for (p = rlogin->cfg.termspeed; isdigit((unsigned char)*p); p++) continue;
- sk_write(rlogin->s, rlogin->cfg.termspeed, p - rlogin->cfg.termspeed);
+ p = conf_get_str(rlogin->conf, CONF_termspeed);
+ sk_write(rlogin->s, p, strspn(p, "0123456789"));
rlogin->bufsize = sk_write(rlogin->s, &z, 1);
rlogin->prompt = NULL;
* freed by the caller.
*/
static const char *rlogin_init(void *frontend_handle, void **backend_handle,
- Config *cfg,
+ Conf *conf,
char *host, int port, char **realhost,
int nodelay, int keepalive)
{
SockAddr addr;
const char *err;
Rlogin rlogin;
- char ruser[sizeof(cfg->username)];
+ char *ruser;
+ int addressfamily;
+ char *loghost;
rlogin = snew(struct rlogin_tag);
rlogin->fn = &fn_table;
rlogin->s = NULL;
rlogin->frontend = frontend_handle;
- rlogin->term_width = cfg->width;
- rlogin->term_height = cfg->height;
+ rlogin->term_width = conf_get_int(conf, CONF_width);
+ rlogin->term_height = conf_get_int(conf, CONF_height);
rlogin->firstbyte = 1;
rlogin->cansize = 0;
rlogin->prompt = NULL;
- rlogin->cfg = *cfg; /* STRUCTURE COPY */
+ rlogin->conf = conf_copy(conf);
*backend_handle = rlogin;
+ addressfamily = conf_get_int(conf, CONF_addressfamily);
/*
* Try to find host.
*/
{
char *buf;
buf = dupprintf("Looking up host \"%s\"%s", host,
- (cfg->addressfamily == ADDRTYPE_IPV4 ? " (IPv4)" :
- (cfg->addressfamily == ADDRTYPE_IPV6 ? " (IPv6)" :
+ (addressfamily == ADDRTYPE_IPV4 ? " (IPv4)" :
+ (addressfamily == ADDRTYPE_IPV6 ? " (IPv6)" :
"")));
logevent(rlogin->frontend, buf);
sfree(buf);
}
- addr = name_lookup(host, port, realhost, cfg, cfg->addressfamily);
+ addr = name_lookup(host, port, realhost, conf, addressfamily);
if ((err = sk_addr_error(addr)) != NULL) {
sk_addr_free(addr);
return err;
* Open socket.
*/
rlogin->s = new_connection(addr, *realhost, port, 1, 0,
- nodelay, keepalive, (Plug) rlogin, cfg);
+ nodelay, keepalive, (Plug) rlogin, conf);
if ((err = sk_socket_error(rlogin->s)) != NULL)
return err;
- if (*cfg->loghost) {
+ loghost = conf_get_str(conf, CONF_loghost);
+ if (*loghost) {
char *colon;
sfree(*realhost);
- *realhost = dupstr(cfg->loghost);
+ *realhost = dupstr(loghost);
colon = strrchr(*realhost, ':');
if (colon) {
/*
* in which case we prompt for it and may end up deferring doing
* anything else until the local prompt mechanism returns.
*/
- if (get_remote_username(cfg, ruser, sizeof(ruser))) {
+ if ((ruser = get_remote_username(conf)) != NULL) {
rlogin_startup(rlogin, ruser);
+ sfree(ruser);
} else {
int ret;
rlogin->prompt = new_prompts(rlogin->frontend);
rlogin->prompt->to_server = TRUE;
rlogin->prompt->name = dupstr("Rlogin login name");
- add_prompt(rlogin->prompt, dupstr("rlogin username: "), TRUE,
- sizeof(cfg->username));
+ add_prompt(rlogin->prompt, dupstr("rlogin username: "), TRUE);
ret = get_userpass_input(rlogin->prompt, NULL, 0);
if (ret >= 0) {
rlogin_startup(rlogin, rlogin->prompt->prompts[0]->result);
free_prompts(rlogin->prompt);
if (rlogin->s)
sk_close(rlogin->s);
+ conf_free(rlogin->conf);
sfree(rlogin);
}
/*
* Stub routine (we don't have any need to reconfigure this backend).
*/
-static void rlogin_reconfig(void *handle, Config *cfg)
+static void rlogin_reconfig(void *handle, Conf *conf)
{
}