+/*
+ * Telnet backend.
+ */
+
#include <stdio.h>
#include <stdlib.h>
{ WILL, WONT, DO, DONT, TELOPT_TSPEED, OPTINDEX_TSPEED, REQUESTED };
static const struct Opt o_ttype =
{ WILL, WONT, DO, DONT, TELOPT_TTYPE, OPTINDEX_TTYPE, REQUESTED };
-static const struct Opt o_oenv = { WILL, WONT, DO, DONT, TELOPT_OLD_ENVIRON,
- OPTINDEX_OENV, INACTIVE
-};
-static const struct Opt o_nenv = { WILL, WONT, DO, DONT, TELOPT_NEW_ENVIRON,
- OPTINDEX_NENV, REQUESTED
-};
+static const struct Opt o_oenv =
+ { WILL, WONT, DO, DONT, TELOPT_OLD_ENVIRON, OPTINDEX_OENV, INACTIVE };
+static const struct Opt o_nenv =
+ { WILL, WONT, DO, DONT, TELOPT_NEW_ENVIRON, OPTINDEX_NENV, REQUESTED };
static const struct Opt o_echo =
{ DO, DONT, WILL, WONT, TELOPT_ECHO, OPTINDEX_ECHO, REQUESTED };
static const struct Opt o_we_sga =
#define SB_DELTA 1024
-static void c_write1(Telnet telnet, int c)
+static void c_write(Telnet telnet, char *buf, int len)
{
int backlog;
- char cc = (char) c;
- backlog = from_backend(telnet->frontend, 0, &cc, 1);
+ backlog = from_backend(telnet->frontend, 0, buf, len);
sk_set_frozen(telnet->s, backlog > TELNET_MAX_BACKLOG);
}
}
/*
* If we reach here, the option was one we weren't prepared to
- * cope with. So send a negative ack.
+ * cope with. If the request was positive (WILL or DO), we send
+ * a negative ack to indicate refusal. If the request was
+ * negative (WONT / DONT), we must do nothing.
*/
- send_opt(telnet, (cmd == WILL ? DONT : WONT), option);
+ if (cmd == WILL || cmd == DO)
+ send_opt(telnet, (cmd == WILL ? DONT : WONT), option);
}
static void process_subneg(Telnet telnet)
static void do_telnet_read(Telnet telnet, char *buf, int len)
{
+ char *outbuf = NULL;
+ int outbuflen = 0, outbufsize = 0;
+
+#define ADDTOBUF(c) do { \
+ if (outbuflen >= outbufsize) { \
+ outbufsize = outbuflen + 256; \
+ outbuf = sresize(outbuf, outbufsize, char); \
+ } \
+ outbuf[outbuflen++] = (c); \
+} while (0)
while (len--) {
int c = (unsigned char) *buf++;
telnet->state = SEENIAC;
else {
if (!telnet->in_synch)
- c_write1(telnet, c);
+ ADDTOBUF(c);
#if 1
/* I can't get the F***ing winsock to insert the urgent IAC
} else {
/* ignore everything else; print it if it's IAC */
if (c == IAC) {
- c_write1(telnet, c);
+ ADDTOBUF(c);
}
telnet->state = TOP_LEVEL;
}
break;
}
}
+
+ if (outbuflen)
+ c_write(telnet, outbuf, outbuflen);
+ sfree(outbuf);
+}
+
+static void telnet_log(Plug plug, int type, SockAddr addr, int port,
+ const char *error_msg, int error_code)
+{
+ Telnet telnet = (Telnet) plug;
+ char addrbuf[256], *msg;
+
+ sk_getaddr(addr, addrbuf, lenof(addrbuf));
+
+ if (type == 0)
+ msg = dupprintf("Connecting to %s port %d", addrbuf, port);
+ else
+ msg = dupprintf("Failed to connect to %s: %s", addrbuf, error_msg);
+
+ logevent(telnet->frontend, msg);
}
static int telnet_closing(Plug plug, const char *error_msg, int error_code,
notify_remote_exit(telnet->frontend);
}
if (error_msg) {
- /* A socket error has occurred. */
logevent(telnet->frontend, error_msg);
connection_fatal(telnet->frontend, "%s", error_msg);
- } /* Otherwise, the remote side closed the connection normally. */
+ }
+ /* Otherwise, the remote side closed the connection normally. */
return 0;
}
int nodelay, int keepalive)
{
static const struct plug_function_table fn_table = {
+ telnet_log,
telnet_closing,
telnet_receive,
telnet_sent
/*
* Open socket.
*/
- {
- char *buf, addrbuf[100];
- sk_getaddr(addr, addrbuf, 100);
- buf = dupprintf("Connecting to %s port %d", addrbuf, port);
- logevent(telnet->frontend, buf);
- sfree(buf);
- }
telnet->s = new_connection(addr, *realhost, port, 0, 1,
nodelay, keepalive, (Plug) telnet, &telnet->cfg);
if ((err = sk_socket_error(telnet->s)) != NULL)
return specials;
}
-static Socket telnet_socket(void *handle)
+static int telnet_connected(void *handle)
{
Telnet telnet = (Telnet) handle;
- return telnet->s;
+ return telnet->s != NULL;
}
static int telnet_sendok(void *handle)
telnet_size,
telnet_special,
telnet_get_specials,
- telnet_socket,
+ telnet_connected,
telnet_exitcode,
telnet_sendok,
telnet_ldisc,
telnet_provide_logctx,
telnet_unthrottle,
telnet_cfg_info,
+ "telnet",
+ PROT_TELNET,
23
};