Socket s;
int bufsize;
+ int firstbyte;
int term_width, term_height;
void *frontend;
} *Rlogin;
sk_set_frozen(rlogin->s, backlog > RLOGIN_MAX_BACKLOG);
}
-static int rlogin_closing(Plug plug, char *error_msg, int error_code,
+static void rlogin_log(Plug plug, int type, SockAddr addr, int port,
+ const char *error_msg, int error_code)
+{
+ Rlogin rlogin = (Rlogin) plug;
+ char addrbuf[256], *msg;
+
+ sk_getaddr(addr, addrbuf, lenof(addrbuf));
+
+ if (type == 0)
+ msg = dupprintf("Connecting to %s port %d", addrbuf, port);
+ else
+ msg = dupprintf("Failed to connect to %s: %s", addrbuf, error_msg);
+
+ logevent(rlogin->frontend, msg);
+}
+
+static int rlogin_closing(Plug plug, const char *error_msg, int error_code,
int calling_back)
{
Rlogin rlogin = (Rlogin) plug;
if (rlogin->s) {
sk_close(rlogin->s);
rlogin->s = NULL;
+ notify_remote_exit(rlogin->frontend);
}
if (error_msg) {
/* A socket error has occurred. */
logevent(rlogin->frontend, error_msg);
- connection_fatal("%s", error_msg);
+ connection_fatal(rlogin->frontend, "%s", error_msg);
} /* Otherwise, the remote side closed the connection normally. */
return 0;
}
* 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);
* Also places the canonical host name into `realhost'. It must be
* freed by the caller.
*/
-static char *rlogin_init(void *frontend_handle, void **backend_handle,
- char *host, int port, char **realhost, int nodelay)
+static const char *rlogin_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 = {
+ rlogin_log,
rlogin_closing,
rlogin_receive,
rlogin_sent
};
SockAddr addr;
- char *err;
+ const char *err;
Rlogin rlogin;
- rlogin = smalloc(sizeof(*rlogin));
+ 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 = cfg->width;
+ rlogin->term_height = cfg->height;
+ rlogin->firstbyte = 1;
*backend_handle = rlogin;
/*
*/
{
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(rlogin->frontend, buf);
sfree(buf);
}
- addr = name_lookup(host, port, realhost);
- if ((err = sk_addr_error(addr)))
+ addr = name_lookup(host, port, realhost, cfg, cfg->addressfamily);
+ if ((err = sk_addr_error(addr)) != NULL) {
+ sk_addr_free(addr);
return err;
+ }
if (port < 0)
port = 513; /* default rlogin port */
/*
* Open socket.
*/
- {
- char *buf, addrbuf[100];
- sk_getaddr(addr, addrbuf, 100);
- buf = dupprintf("Connecting to %s port %d", addrbuf, port);
- logevent(rlogin->frontend, buf);
- sfree(buf);
- }
rlogin->s = new_connection(addr, *realhost, port, 1, 0,
- nodelay, (Plug) rlogin);
- if ((err = sk_socket_error(rlogin->s)))
+ nodelay, keepalive, (Plug) rlogin, cfg);
+ if ((err = sk_socket_error(rlogin->s)) != NULL)
return err;
- sk_addr_free(addr);
-
/*
* Send local username, remote username, terminal/speed
*/
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((unsigned char)*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.
*/
return;
}
+/*
+ * Return a list of the special codes that make sense in this
+ * protocol.
+ */
+static const struct telnet_special *rlogin_get_specials(void *handle)
+{
+ return NULL;
+}
+
static Socket rlogin_socket(void *handle)
{
Rlogin rlogin = (Rlogin) handle;
static int rlogin_exitcode(void *handle)
{
- /* Rlogin rlogin = (Rlogin) handle; */
- /* If we ever implement RSH, we'll probably need to do this properly */
+ Rlogin rlogin = (Rlogin) handle;
+ if (rlogin->s != NULL)
+ return -1; /* still connected */
+ else
+ /* If we ever implement RSH, we'll probably need to do this properly */
+ return 0;
+}
+
+/*
+ * cfg_info for rlogin does nothing at all.
+ */
+static int rlogin_cfg_info(void *handle)
+{
return 0;
}
Backend rlogin_backend = {
rlogin_init,
+ rlogin_free,
+ rlogin_reconfig,
rlogin_send,
rlogin_sendbuffer,
rlogin_size,
rlogin_special,
+ rlogin_get_specials,
rlogin_socket,
rlogin_exitcode,
rlogin_sendok,
rlogin_provide_ldisc,
rlogin_provide_logctx,
rlogin_unthrottle,
+ rlogin_cfg_info,
1
};
projects / u / mdw / putty / blobdiff