New timing infrastructure. There's a new function schedule_timer()

[u/mdw/putty] / rlogin.c

diff --git a/rlogin.c b/rlogin.c
index afc3d2c..06c8b12 100644 (file)
--- a/rlogin.c
+++ b/rlogin.c
@@ -19,6 +19,7 @@ typedef struct rlogin_tag {
 
     Socket s;
     int bufsize;
+    int firstbyte;
     int term_width, term_height;
     void *frontend;
 } *Rlogin;
@@ -31,18 +32,19 @@ static void c_write(Rlogin rlogin, char *buf, int len)
     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 (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;
 }
@@ -69,13 +71,12 @@ static int rlogin_receive(Plug plug, int urgent, char *data, int len)
         * 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);
@@ -97,9 +98,10 @@ static void rlogin_sent(Plug plug, int bufsize)
  * 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,
@@ -107,15 +109,16 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
        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->firstbyte = 1;
     *backend_handle = rlogin;
 
     /*
@@ -127,9 +130,11 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
        logevent(rlogin->frontend, buf);
        sfree(buf);
     }
-    addr = name_lookup(host, port, realhost);
-    if ((err = sk_addr_error(addr)) != NULL)
+    addr = name_lookup(host, port, realhost, cfg);
+    if ((err = sk_addr_error(addr)) != NULL) {
+       sk_addr_free(addr);
        return err;
+    }
 
     if (port < 0)
        port = 513;                    /* default rlogin port */
@@ -145,12 +150,10 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
        sfree(buf);
     }
     rlogin->s = new_connection(addr, *realhost, port, 1, 0,
-                              nodelay, (Plug) rlogin);
+                              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
      */
@@ -168,7 +171,7 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
        sk_write(rlogin->s, cfg->termtype,
                 strlen(cfg->termtype));
        sk_write(rlogin->s, "/", 1);
-       for (p = cfg->termspeed; isdigit(*p); p++) continue;
+       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);
     }
@@ -176,6 +179,15 @@ static char *rlogin_init(void *frontend_handle, void **backend_handle,
     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).
  */
@@ -238,6 +250,15 @@ static void rlogin_special(void *handle, Telnet_Special code)
     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;
@@ -274,18 +295,23 @@ static void rlogin_provide_logctx(void *handle, void *logctx)
 
 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_init,
+    rlogin_free,
     rlogin_reconfig,
     rlogin_send,
     rlogin_sendbuffer,
     rlogin_size,
     rlogin_special,
+    rlogin_get_specials,
     rlogin_socket,
     rlogin_exitcode,
     rlogin_sendok,