#include <stdlib.h>
#include "putty.h"
+#include "terminal.h"
#ifndef FALSE
#define FALSE 0
static Socket s = NULL;
+static void *frontend;
+
#define IAC 255 /* interpret as command: */
#define DONT 254 /* you are not to use option */
#define DO 253 /* please, you use option */
{
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);
}
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) {
}
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)
{
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 {
if (c == CR)
telnet_state = SEENCR;
else
- telnet_state = TOPLEVEL;
+ telnet_state = TOP_LEVEL;
}
break;
case SEENIAC:
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;
goto subneg_addchar; /* yes, it's a hack, I know, but... */
else {
process_subneg();
- telnet_state = TOPLEVEL;
+ telnet_state = TOP_LEVEL;
}
break;
}
}
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;
}
return 1;
}
+static void telnet_sent(Plug plug, int bufsize)
+{
+ telnet_bufsize = bufsize;
+}
+
/*
* Called to set up the Telnet connection.
*
* 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;
+
/*
* 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;
/*
* 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;
unsigned char b[16];
char logbuf[50];
- if (s == NULL || o_naws.state != ACTIVE)
+ if (s == NULL || term == 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] = term->cols >> 8;
+ b[4] = term->cols & 0xFF;
+ b[5] = term->rows >> 8;
+ b[6] = term->rows & 0xFF;
b[7] = IAC;
b[8] = SE;
telnet_bufsize = sk_write(s, b, 9);
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,
telnet_size,
telnet_special,
telnet_socket,
+ telnet_exitcode,
telnet_sendok,
telnet_ldisc,
telnet_unthrottle,