sk_set_frozen(rlogin->s, backlog > RLOGIN_MAX_BACKLOG);
}
-static int rlogin_closing(Plug plug, char *error_msg, int error_code,
+static int rlogin_closing(Plug plug, const char *error_msg, int error_code,
int calling_back)
{
Rlogin rlogin = (Rlogin) plug;
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;
}
* 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,
- Config *cfg,
- 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_closing,
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;
sfree(buf);
}
addr = name_lookup(host, port, realhost, 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 = 513; /* default rlogin port */
sfree(buf);
}
rlogin->s = new_connection(addr, *realhost, port, 1, 0,
- nodelay, (Plug) rlogin, cfg);
+ 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
*/
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 */
- return 0;
+ 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;
}
Backend rlogin_backend = {
rlogin_sendbuffer,
rlogin_size,
rlogin_special,
+ rlogin_get_specials,
rlogin_socket,
rlogin_exitcode,
rlogin_sendok,