X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=raw.c;h=8b1b1e9b15e9e843e9854f775c95d358f6ab8ab1;hb=bee5812a496b6d24b6ac5bb13e8aa4de1d2f61b7;hp=e7a159cd4daad5a2de527dde8d9ae375c0872bd4;hpb=0bfe876b5702a11c79ab38f6eae0eda0efa51091;p=PuTTY.git

diff --git a/raw.c b/raw.c
index e7a159cd..8b1b1e9b 100644
--- a/raw.c
+++ b/raw.c
@@ -29,7 +29,7 @@ static void c_write(Raw raw, char *buf, int len)
     sk_set_frozen(raw->s, backlog > RAW_MAX_BACKLOG);
 }
 
-static int raw_closing(Plug plug, char *error_msg, int error_code,
+static int raw_closing(Plug plug, const char *error_msg, int error_code,
 		       int calling_back)
 {
     Raw raw = (Raw) plug;
@@ -37,6 +37,7 @@ static int raw_closing(Plug plug, char *error_msg, int error_code,
     if (raw->s) {
         sk_close(raw->s);
         raw->s = NULL;
+	notify_remote_exit(raw->frontend);
     }
     if (error_msg) {
 	/* A socket error has occurred. */
@@ -67,9 +68,10 @@ static void raw_sent(Plug plug, int bufsize)
  * Also places the canonical host name into `realhost'. It must be
  * freed by the caller.
  */
-static char *raw_init(void *frontend_handle, void **backend_handle,
-		      Config *cfg,
-		      char *host, int port, char **realhost, int nodelay)
+static const char *raw_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 = {
 	raw_closing,
@@ -77,7 +79,7 @@ static char *raw_init(void *frontend_handle, void **backend_handle,
 	raw_sent
     };
     SockAddr addr;
-    char *err;
+    const char *err;
     Raw raw;
 
     raw = snew(struct raw_backend_data);
@@ -97,8 +99,10 @@ static char *raw_init(void *frontend_handle, void **backend_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 = 23;		       /* default telnet port */
@@ -113,13 +117,11 @@ static char *raw_init(void *frontend_handle, void **backend_handle,
 	logevent(raw->frontend, buf);
 	sfree(buf);
     }
-    raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay,
+    raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay, keepalive,
 			    (Plug) raw, cfg);
     if ((err = sk_socket_error(raw->s)) != NULL)
 	return err;
 
-    sk_addr_free(addr);
-
     return NULL;
 }