X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/5471d09ad63fc6216fb9c2a3b52ca9c93821a054..818ab3bbbe73842da6b50d75ad4a64e40de5e2e6:/telnet.c

diff --git a/telnet.c b/telnet.c
index 40d032cc..fdbfedae 100644
--- a/telnet.c
+++ b/telnet.c
@@ -13,6 +13,9 @@
 
 static Socket s = NULL;
 
+static void *frontend;
+static int telnet_term_width, telnet_term_height;
+
 #define	IAC	255		       /* interpret as command: */
 #define	DONT	254		       /* you are not to use option */
 #define	DO	253		       /* please, you use option */
@@ -138,7 +141,7 @@ static char *telopt(int opt)
     return "<unknown>";
 }
 
-static void telnet_size(void);
+static void telnet_size(int width, int height);
 
 struct Opt {
     int send;			       /* what we initially send */
@@ -189,7 +192,7 @@ static void c_write1(int c)
 {
     int backlog;
     char cc = (char) c;
-    backlog = from_backend(0, &cc, 1);
+    backlog = from_backend(frontend, 0, &cc, 1);
     sk_set_frozen(s, backlog > TELNET_MAX_BACKLOG);
 }
 
@@ -230,7 +233,7 @@ static void option_side_effects(struct Opt *o, int enabled)
 	echoing = !enabled;
     else if (o->option == TELOPT_SGA && o->send == DO)
 	editing = !enabled;
-    ldisc_send(NULL, 0);	       /* cause ldisc to notice the change */
+    ldisc_send(NULL, 0, 0);	       /* cause ldisc to notice the change */
 
     /* Ensure we get the minimum options */
     if (!activated) {
@@ -253,7 +256,7 @@ static void option_side_effects(struct Opt *o, int enabled)
 static void activate_option(struct Opt *o)
 {
     if (o->send == WILL && o->option == TELOPT_NAWS)
-	telnet_size();
+	telnet_size(telnet_term_width, telnet_term_height);
     if (o->send == WILL &&
 	(o->option == TELOPT_NEW_ENVIRON ||
 	 o->option == TELOPT_OLD_ENVIRON)) {
@@ -451,9 +454,9 @@ static void process_subneg(void)
 }
 
 static enum {
-    TOPLEVEL, SEENIAC, SEENWILL, SEENWONT, SEENDO, SEENDONT,
+    TOP_LEVEL, SEENIAC, SEENWILL, SEENWONT, SEENDO, SEENDONT,
     SEENSB, SUBNEGOT, SUBNEG_IAC, SEENCR
-} telnet_state = TOPLEVEL;
+} telnet_state = TOP_LEVEL;
 
 static void do_telnet_read(char *buf, int len)
 {
@@ -462,10 +465,10 @@ static void do_telnet_read(char *buf, int len)
 	int c = (unsigned char) *buf++;
 
 	switch (telnet_state) {
-	  case TOPLEVEL:
+	  case TOP_LEVEL:
 	  case SEENCR:
 	    if (c == NUL && telnet_state == SEENCR)
-		telnet_state = TOPLEVEL;
+		telnet_state = TOP_LEVEL;
 	    else if (c == IAC)
 		telnet_state = SEENIAC;
 	    else {
@@ -487,7 +490,7 @@ static void do_telnet_read(char *buf, int len)
 		if (c == CR)
 		    telnet_state = SEENCR;
 		else
-		    telnet_state = TOPLEVEL;
+		    telnet_state = TOP_LEVEL;
 	    }
 	    break;
 	  case SEENIAC:
@@ -503,30 +506,30 @@ static void do_telnet_read(char *buf, int len)
 		telnet_state = SEENSB;
 	    else if (c == DM) {
 		in_synch = 0;
-		telnet_state = TOPLEVEL;
+		telnet_state = TOP_LEVEL;
 	    } else {
 		/* ignore everything else; print it if it's IAC */
 		if (c == IAC) {
 		    c_write1(c);
 		}
-		telnet_state = TOPLEVEL;
+		telnet_state = TOP_LEVEL;
 	    }
 	    break;
 	  case SEENWILL:
 	    proc_rec_opt(WILL, c);
-	    telnet_state = TOPLEVEL;
+	    telnet_state = TOP_LEVEL;
 	    break;
 	  case SEENWONT:
 	    proc_rec_opt(WONT, c);
-	    telnet_state = TOPLEVEL;
+	    telnet_state = TOP_LEVEL;
 	    break;
 	  case SEENDO:
 	    proc_rec_opt(DO, c);
-	    telnet_state = TOPLEVEL;
+	    telnet_state = TOP_LEVEL;
 	    break;
 	  case SEENDONT:
 	    proc_rec_opt(DONT, c);
-	    telnet_state = TOPLEVEL;
+	    telnet_state = TOP_LEVEL;
 	    break;
 	  case SEENSB:
 	    sb_opt = c;
@@ -559,7 +562,7 @@ static void do_telnet_read(char *buf, int len)
 		goto subneg_addchar;   /* yes, it's a hack, I know, but... */
 	    else {
 		process_subneg();
-		telnet_state = TOPLEVEL;
+		telnet_state = TOP_LEVEL;
 	    }
 	    break;
 	}
@@ -575,7 +578,8 @@ static int telnet_closing(Plug plug, char *error_msg, int error_code,
     }
     if (error_msg) {
 	/* A socket error has occurred. */
-	connection_fatal(error_msg);
+	logevent(error_msg);
+	connection_fatal("%s", error_msg);
     }				       /* Otherwise, the remote side closed the connection normally. */
     return 0;
 }
@@ -588,6 +592,11 @@ static int telnet_receive(Plug plug, int urgent, char *data, int len)
     return 1;
 }
 
+static void telnet_sent(Plug plug, int bufsize)
+{
+    telnet_bufsize = bufsize;
+}
+
 /*
  * Called to set up the Telnet connection.
  *
@@ -596,19 +605,30 @@ static int telnet_receive(Plug plug, int urgent, char *data, int len)
  * Also places the canonical host name into `realhost'. It must be
  * freed by the caller.
  */
-static char *telnet_init(char *host, int port, char **realhost)
+static char *telnet_init(void *frontend_handle,
+			 char *host, int port, char **realhost, int nodelay)
 {
     static struct plug_function_table fn_table = {
 	telnet_closing,
-	telnet_receive
+	telnet_receive,
+	telnet_sent
     }, *fn_table_ptr = &fn_table;
 
     SockAddr addr;
     char *err;
 
+    frontend = frontend_handle;
+    telnet_term_width = cfg.width;
+    telnet_term_height = cfg.height;
+
     /*
      * Try to find host.
      */
+    {
+	char buf[200];
+	sprintf(buf, "Looking up host \"%.170s\"", host);
+	logevent(buf);
+    }
     addr = sk_namelookup(host, realhost);
     if ((err = sk_addr_error(addr)))
 	return err;
@@ -619,7 +639,13 @@ static char *telnet_init(char *host, int port, char **realhost)
     /*
      * Open socket.
      */
-    s = sk_new(addr, port, 0, 1, &fn_table_ptr);
+    {
+	char buf[200], addrbuf[100];
+	sk_getaddr(addr, addrbuf, 100);
+	sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
+	logevent(buf);
+    }
+    s = new_connection(addr, *realhost, port, 0, 1, nodelay, &fn_table_ptr);
     if ((err = sk_socket_error(s)))
 	return err;
 
@@ -695,20 +721,23 @@ static int telnet_sendbuffer(void)
 /*
  * Called to set the size of the window from Telnet's POV.
  */
-static void telnet_size(void)
+static void telnet_size(int width, int height)
 {
     unsigned char b[16];
     char logbuf[50];
 
+    telnet_term_width = width;
+    telnet_term_height = height;
+
     if (s == NULL || o_naws.state != ACTIVE)
 	return;
     b[0] = IAC;
     b[1] = SB;
     b[2] = TELOPT_NAWS;
-    b[3] = cols >> 8;
-    b[4] = cols & 0xFF;
-    b[5] = rows >> 8;
-    b[6] = rows & 0xFF;
+    b[3] = telnet_term_width >> 8;
+    b[4] = telnet_term_width & 0xFF;
+    b[5] = telnet_term_height >> 8;
+    b[6] = telnet_term_height & 0xFF;
     b[7] = IAC;
     b[8] = SE;
     telnet_bufsize = sk_write(s, b, 9);
@@ -831,6 +860,12 @@ static int telnet_ldisc(int option)
     return FALSE;
 }
 
+static int telnet_exitcode(void)
+{
+    /* Telnet doesn't transmit exit codes back to the client */
+    return 0;
+}
+
 Backend telnet_backend = {
     telnet_init,
     telnet_send,
@@ -838,6 +873,7 @@ Backend telnet_backend = {
     telnet_size,
     telnet_special,
     telnet_socket,
+    telnet_exitcode,
     telnet_sendok,
     telnet_ldisc,
     telnet_unthrottle,