Socket s;
int bufsize;
+ int firstbyte;
int term_width, term_height;
void *frontend;
} *Rlogin;
* byte is expected to be NULL and is ignored, and the rest
* is printed.
*/
- static int firstbyte = 1;
- if (firstbyte) {
+ if (rlogin->firstbyte) {
if (data[0] == '\0') {
data++;
len--;
}
- firstbyte = 0;
+ rlogin->firstbyte = 0;
}
if (len > 0)
c_write(rlogin, data, len);
* freed by the caller.
*/
static char *rlogin_init(void *frontend_handle, void **backend_handle,
+ Config *cfg,
char *host, int port, char **realhost, int nodelay)
{
static const struct plug_function_table fn_table = {
rlogin->fn = &fn_table;
rlogin->s = NULL;
rlogin->frontend = frontend_handle;
- rlogin->term_width = cfg.width;
- rlogin->term_height = cfg.height;
+ rlogin->term_width = cfg->width;
+ rlogin->term_height = cfg->height;
+ rlogin->firstbyte = 1;
*backend_handle = rlogin;
/*
logevent(rlogin->frontend, buf);
sfree(buf);
}
- addr = name_lookup(host, port, realhost);
- if ((err = sk_addr_error(addr)))
+ addr = name_lookup(host, port, realhost, cfg);
+ if ((err = sk_addr_error(addr)) != NULL)
return err;
if (port < 0)
sfree(buf);
}
rlogin->s = new_connection(addr, *realhost, port, 1, 0,
- nodelay, (Plug) rlogin);
- if ((err = sk_socket_error(rlogin->s)))
+ nodelay, (Plug) rlogin, cfg);
+ if ((err = sk_socket_error(rlogin->s)) != NULL)
return err;
sk_addr_free(addr);
char z = 0;
char *p;
sk_write(rlogin->s, &z, 1);
- sk_write(rlogin->s, cfg.localusername, strlen(cfg.localusername));
+ sk_write(rlogin->s, cfg->localusername,
+ strlen(cfg->localusername));
sk_write(rlogin->s, &z, 1);
- sk_write(rlogin->s, cfg.username, strlen(cfg.username));
+ sk_write(rlogin->s, cfg->username,
+ strlen(cfg->username));
sk_write(rlogin->s, &z, 1);
- sk_write(rlogin->s, cfg.termtype, strlen(cfg.termtype));
+ sk_write(rlogin->s, cfg->termtype,
+ strlen(cfg->termtype));
sk_write(rlogin->s, "/", 1);
- for (p = cfg.termspeed; isdigit(*p); p++);
- sk_write(rlogin->s, cfg.termspeed, p - cfg.termspeed);
+ for (p = cfg->termspeed; isdigit(*p); p++) continue;
+ sk_write(rlogin->s, cfg->termspeed, p - cfg->termspeed);
rlogin->bufsize = sk_write(rlogin->s, &z, 1);
}
return NULL;
}
+static void rlogin_free(void *handle)
+{
+ Rlogin rlogin = (Rlogin) handle;
+
+ if (rlogin->s)
+ sk_close(rlogin->s);
+ sfree(rlogin);
+}
+
+/*
+ * Stub routine (we don't have any need to reconfigure this backend).
+ */
+static void rlogin_reconfig(void *handle, Config *cfg)
+{
+}
+
/*
* Called to send data down the rlogin connection.
*/
Backend rlogin_backend = {
rlogin_init,
+ rlogin_free,
+ rlogin_reconfig,
rlogin_send,
rlogin_sendbuffer,
rlogin_size,