X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/514702987c9252fcb0ab98882a6603b3bd0505ce..125105d16c788398562ac03e91ce7a0dc0292492:/raw.c diff --git a/raw.c b/raw.c index f21e3ca9..10e9ce64 100644 --- a/raw.c +++ b/raw.c @@ -1,4 +1,3 @@ -#include #include #include @@ -41,7 +40,7 @@ static int raw_closing(Plug plug, char *error_msg, int error_code, } if (error_msg) { /* A socket error has occurred. */ - logevent(error_msg); + logevent(raw->frontend, error_msg); connection_fatal("%s", error_msg); } /* Otherwise, the remote side closed the connection normally. */ return 0; @@ -69,6 +68,7 @@ static void raw_sent(Plug plug, int bufsize) * 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 struct plug_function_table fn_table = { @@ -80,7 +80,7 @@ static char *raw_init(void *frontend_handle, void **backend_handle, char *err; Raw raw; - raw = smalloc(sizeof(*raw)); + raw = snew(struct raw_backend_data); raw->fn = &fn_table; raw->s = NULL; *backend_handle = raw; @@ -91,12 +91,13 @@ static char *raw_init(void *frontend_handle, void **backend_handle, * Try to find host. */ { - char buf[200]; - sprintf(buf, "Looking up host \"%.170s\"", host); - logevent(buf); + char *buf; + buf = dupprintf("Looking up host \"%s\"", host); + logevent(raw->frontend, buf); + sfree(buf); } - addr = sk_namelookup(host, realhost); - if ((err = sk_addr_error(addr))) + addr = name_lookup(host, port, realhost, cfg); + if ((err = sk_addr_error(addr)) != NULL) return err; if (port < 0) @@ -106,13 +107,15 @@ static char *raw_init(void *frontend_handle, void **backend_handle, * Open socket. */ { - char buf[200], addrbuf[100]; + char *buf, addrbuf[100]; sk_getaddr(addr, addrbuf, 100); - sprintf(buf, "Connecting to %.100s port %d", addrbuf, port); - logevent(buf); + buf = dupprintf("Connecting to %s port %d", addrbuf, port); + logevent(raw->frontend, buf); + sfree(buf); } - raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay, (Plug) raw); - if ((err = sk_socket_error(raw->s))) + raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay, + (Plug) raw, cfg); + if ((err = sk_socket_error(raw->s)) != NULL) return err; sk_addr_free(addr); @@ -120,6 +123,22 @@ static char *raw_init(void *frontend_handle, void **backend_handle, return NULL; } +static void raw_free(void *handle) +{ + Raw raw = (Raw) handle; + + if (raw->s) + sk_close(raw->s); + sfree(raw); +} + +/* + * Stub routine (we don't have any need to reconfigure this backend). + */ +static void raw_reconfig(void *handle, Config *cfg) +{ +} + /* * Called to send data down the raw connection. */ @@ -162,6 +181,15 @@ static void raw_special(void *handle, Telnet_Special code) return; } +/* + * Return a list of the special codes that make sense in this + * protocol. + */ +static const struct telnet_special *raw_get_specials(void *handle) +{ + return NULL; +} + static Socket raw_socket(void *handle) { Raw raw = (Raw) handle; @@ -186,22 +214,41 @@ static int raw_ldisc(void *handle, int option) return 0; } +static void raw_provide_ldisc(void *handle, void *ldisc) +{ + /* This is a stub. */ +} + +static void raw_provide_logctx(void *handle, void *logctx) +{ + /* This is a stub. */ +} + static int raw_exitcode(void *handle) { - /* Exit codes are a meaningless concept in the Raw protocol */ - return 0; + Raw raw = (Raw) handle; + if (raw->s != NULL) + return -1; /* still connected */ + else + /* Exit codes are a meaningless concept in the Raw protocol */ + return 0; } Backend raw_backend = { raw_init, + raw_free, + raw_reconfig, raw_send, raw_sendbuffer, raw_size, raw_special, + raw_get_specials, raw_socket, raw_exitcode, raw_sendok, raw_ldisc, + raw_provide_ldisc, + raw_provide_logctx, raw_unthrottle, 1 };