X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/7dbb9f565cd73e01515dadd6825c3cd0322b9783..96621a840849b4afb6582424d2a1eea08a0be418:/telnet.c

diff --git a/telnet.c b/telnet.c
index cd70d9b8..29daf0f1 100644
--- a/telnet.c
+++ b/telnet.c
@@ -174,7 +174,7 @@ static void deactivate_option (struct Opt *o) {
 static void option_side_effects(struct Opt *o, int enabled) {
     if (o->option == TELOPT_ECHO && o->send == DO)
         echoing = !enabled;
-    else if (o->option = TELOPT_SGA && o->send == DO)
+    else if (o->option == TELOPT_SGA && o->send == DO)
         editing = !enabled;
     ldisc_send(NULL, 0);               /* cause ldisc to notice the change */
 }
@@ -465,19 +465,18 @@ static void do_telnet_read (char *buf, int len) {
     }
 }
 
-static int telnet_receive(Socket skt, int urgent, char *data, int len) {
-    if (urgent==3) {
+static int telnet_closing (Plug plug, char *error_msg, int error_code, int calling_back) {
+    sk_close(s);
+    s = NULL;
+    if (error_msg) {
         /* A socket error has occurred. */
-        s = NULL;
-        connection_fatal(data);
-        len = 0;
-    }
-    if (!len) {
-	/* Connection has closed. */
-	sk_close(s);
-	s = NULL;
-	return 0;
-    }
+        connection_fatal (error_msg);
+    } /* Otherwise, the remote side closed the connection normally. */
+    return 0;
+}
+
+static int telnet_receive(Plug plug, int urgent, char *data, int len) {
+    if(urgent) in_synch = TRUE;
     do_telnet_read (data, len);
     return 1;
 }
@@ -490,6 +489,11 @@ static int telnet_receive(Socket skt, int urgent, char *data, int len) {
  * Also places the canonical host name into `realhost'.
  */
 static char *telnet_init (char *host, int port, char **realhost) {
+    static struct plug_function_table fn_table = {
+	telnet_closing,
+	telnet_receive
+    }, *fn_table_ptr = &fn_table;
+
     SockAddr addr;
     char *err;
 
@@ -506,7 +510,7 @@ static char *telnet_init (char *host, int port, char **realhost) {
     /*
      * Open socket.
      */
-    s = sk_new(addr, port, 0, telnet_receive);
+    s = sk_new(addr, port, 0, 1, &fn_table_ptr);
     if ( (err = sk_socket_error(s)) )
 	return err;