mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-09 17:38:00 +00:00
3214563d8e
My normal habit these days, in new code, is to treat int and bool as _almost_ completely separate types. I'm still willing to use C's implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine, no need to spell it out as blob.len != 0), but generally, if a variable is going to be conceptually a boolean, I like to declare it bool and assign to it using 'true' or 'false' rather than 0 or 1. PuTTY is an exception, because it predates the C99 bool, and I've stuck to its existing coding style even when adding new code to it. But it's been annoying me more and more, so now that I've decided C99 bool is an acceptable thing to require from our toolchain in the first place, here's a quite thorough trawl through the source doing 'boolification'. Many variables and function parameters are now typed as bool rather than int; many assignments of 0 or 1 to those variables are now spelled 'true' or 'false'. I managed this thorough conversion with the help of a custom clang plugin that I wrote to trawl the AST and apply heuristics to point out where things might want changing. So I've even managed to do a decent job on parts of the code I haven't looked at in years! To make the plugin's work easier, I pushed platform front ends generally in the direction of using standard 'bool' in preference to platform-specific boolean types like Windows BOOL or GTK's gboolean; I've left the platform booleans in places they _have_ to be for the platform APIs to work right, but variables only used by my own code have been converted wherever I found them. In a few places there are int values that look very like booleans in _most_ of the places they're used, but have a rarely-used third value, or a distinction between different nonzero values that most users don't care about. In these cases, I've _removed_ uses of 'true' and 'false' for the return values, to emphasise that there's something more subtle going on than a simple boolean answer: - the 'multisel' field in dialog.h's list box structure, for which the GTK front end in particular recognises a difference between 1 and 2 but nearly everything else treats as boolean - the 'urgent' parameter to plug_receive, where 1 vs 2 tells you something about the specific location of the urgent pointer, but most clients only care about 0 vs 'something nonzero' - the return value of wc_match, where -1 indicates a syntax error in the wildcard. - the return values from SSH-1 RSA-key loading functions, which use -1 for 'wrong passphrase' and 0 for all other failures (so any caller which already knows it's not loading an _encrypted private_ key can treat them as boolean) - term->esc_query, and the 'query' parameter in toggle_mode in terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h, but can also hold -1 for some other intervening character that we don't support. In a few places there's an integer that I haven't turned into a bool even though it really _can_ only take values 0 or 1 (and, as above, tried to make the call sites consistent in not calling those values true and false), on the grounds that I thought it would make it more confusing to imply that the 0 value was in some sense 'negative' or bad and the 1 positive or good: - the return value of plug_accepting uses the POSIXish convention of 0=success and nonzero=error; I think if I made it bool then I'd also want to reverse its sense, and that's a job for a separate piece of work. - the 'screen' parameter to lineptr() in terminal.c, where 0 and 1 represent the default and alternate screens. There's no obvious reason why one of those should be considered 'true' or 'positive' or 'success' - they're just indices - so I've left it as int. ssh_scp_recv had particularly confusing semantics for its previous int return value: its call sites used '<= 0' to check for error, but it never actually returned a negative number, just 0 or 1. Now the function and its call sites agree that it's a bool. In a couple of places I've renamed variables called 'ret', because I don't like that name any more - it's unclear whether it means the return value (in preparation) for the _containing_ function or the return value received from a subroutine call, and occasionally I've accidentally used the same variable for both and introduced a bug. So where one of those got in my way, I've renamed it to 'toret' or 'retd' (the latter short for 'returned') in line with my usual modern practice, but I haven't done a thorough job of finding all of them. Finally, one amusing side effect of doing this is that I've had to separate quite a few chained assignments. It used to be perfectly fine to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a the 'true' defined by stdbool.h, that idiom provokes a warning from gcc: 'suggest parentheses around assignment used as truth value'!
328 lines
7.3 KiB
C
328 lines
7.3 KiB
C
/*
|
|
* "Raw" backend.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <limits.h>
|
|
|
|
#include "putty.h"
|
|
|
|
#define RAW_MAX_BACKLOG 4096
|
|
|
|
typedef struct Raw Raw;
|
|
struct Raw {
|
|
Socket *s;
|
|
bool closed_on_socket_error;
|
|
int bufsize;
|
|
Seat *seat;
|
|
LogContext *logctx;
|
|
bool sent_console_eof, sent_socket_eof, session_started;
|
|
|
|
Conf *conf;
|
|
|
|
Plug plug;
|
|
Backend backend;
|
|
};
|
|
|
|
static void raw_size(Backend *be, int width, int height);
|
|
|
|
static void c_write(Raw *raw, const void *buf, int len)
|
|
{
|
|
int backlog = seat_stdout(raw->seat, buf, len);
|
|
sk_set_frozen(raw->s, backlog > RAW_MAX_BACKLOG);
|
|
}
|
|
|
|
static void raw_log(Plug *plug, int type, SockAddr *addr, int port,
|
|
const char *error_msg, int error_code)
|
|
{
|
|
Raw *raw = container_of(plug, Raw, plug);
|
|
backend_socket_log(raw->seat, raw->logctx, type, addr, port,
|
|
error_msg, error_code, raw->conf, raw->session_started);
|
|
}
|
|
|
|
static void raw_check_close(Raw *raw)
|
|
{
|
|
/*
|
|
* Called after we send EOF on either the socket or the console.
|
|
* Its job is to wind up the session once we have sent EOF on both.
|
|
*/
|
|
if (raw->sent_console_eof && raw->sent_socket_eof) {
|
|
if (raw->s) {
|
|
sk_close(raw->s);
|
|
raw->s = NULL;
|
|
seat_notify_remote_exit(raw->seat);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void raw_closing(Plug *plug, const char *error_msg, int error_code,
|
|
bool calling_back)
|
|
{
|
|
Raw *raw = container_of(plug, Raw, plug);
|
|
|
|
if (error_msg) {
|
|
/* A socket error has occurred. */
|
|
if (raw->s) {
|
|
sk_close(raw->s);
|
|
raw->s = NULL;
|
|
raw->closed_on_socket_error = true;
|
|
seat_notify_remote_exit(raw->seat);
|
|
}
|
|
logevent(raw->logctx, error_msg);
|
|
seat_connection_fatal(raw->seat, "%s", error_msg);
|
|
} else {
|
|
/* Otherwise, the remote side closed the connection normally. */
|
|
if (!raw->sent_console_eof && seat_eof(raw->seat)) {
|
|
/*
|
|
* The front end wants us to close the outgoing side of the
|
|
* connection as soon as we see EOF from the far end.
|
|
*/
|
|
if (!raw->sent_socket_eof) {
|
|
if (raw->s)
|
|
sk_write_eof(raw->s);
|
|
raw->sent_socket_eof= true;
|
|
}
|
|
}
|
|
raw->sent_console_eof = true;
|
|
raw_check_close(raw);
|
|
}
|
|
}
|
|
|
|
static void raw_receive(Plug *plug, int urgent, char *data, int len)
|
|
{
|
|
Raw *raw = container_of(plug, Raw, plug);
|
|
c_write(raw, data, len);
|
|
/* We count 'session start', for proxy logging purposes, as being
|
|
* when data is received from the network and printed. */
|
|
raw->session_started = true;
|
|
}
|
|
|
|
static void raw_sent(Plug *plug, int bufsize)
|
|
{
|
|
Raw *raw = container_of(plug, Raw, plug);
|
|
raw->bufsize = bufsize;
|
|
}
|
|
|
|
static const PlugVtable Raw_plugvt = {
|
|
raw_log,
|
|
raw_closing,
|
|
raw_receive,
|
|
raw_sent
|
|
};
|
|
|
|
/*
|
|
* Called to set up the raw connection.
|
|
*
|
|
* Returns an error message, or NULL on success.
|
|
*
|
|
* Also places the canonical host name into `realhost'. It must be
|
|
* freed by the caller.
|
|
*/
|
|
static const char *raw_init(Seat *seat, Backend **backend_handle,
|
|
LogContext *logctx, Conf *conf,
|
|
const char *host, int port, char **realhost,
|
|
bool nodelay, bool keepalive)
|
|
{
|
|
SockAddr *addr;
|
|
const char *err;
|
|
Raw *raw;
|
|
int addressfamily;
|
|
char *loghost;
|
|
|
|
raw = snew(Raw);
|
|
raw->plug.vt = &Raw_plugvt;
|
|
raw->backend.vt = &raw_backend;
|
|
raw->s = NULL;
|
|
raw->closed_on_socket_error = false;
|
|
*backend_handle = &raw->backend;
|
|
raw->sent_console_eof = raw->sent_socket_eof = false;
|
|
raw->bufsize = 0;
|
|
raw->session_started = false;
|
|
raw->conf = conf_copy(conf);
|
|
|
|
raw->seat = seat;
|
|
raw->logctx = logctx;
|
|
|
|
addressfamily = conf_get_int(conf, CONF_addressfamily);
|
|
/*
|
|
* Try to find host.
|
|
*/
|
|
addr = name_lookup(host, port, realhost, conf, addressfamily,
|
|
raw->logctx, "main connection");
|
|
if ((err = sk_addr_error(addr)) != NULL) {
|
|
sk_addr_free(addr);
|
|
return err;
|
|
}
|
|
|
|
if (port < 0)
|
|
port = 23; /* default telnet port */
|
|
|
|
/*
|
|
* Open socket.
|
|
*/
|
|
raw->s = new_connection(addr, *realhost, port, false, true, nodelay,
|
|
keepalive, &raw->plug, conf);
|
|
if ((err = sk_socket_error(raw->s)) != NULL)
|
|
return err;
|
|
|
|
loghost = conf_get_str(conf, CONF_loghost);
|
|
if (*loghost) {
|
|
char *colon;
|
|
|
|
sfree(*realhost);
|
|
*realhost = dupstr(loghost);
|
|
|
|
colon = host_strrchr(*realhost, ':');
|
|
if (colon)
|
|
*colon++ = '\0';
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static void raw_free(Backend *be)
|
|
{
|
|
Raw *raw = container_of(be, Raw, backend);
|
|
|
|
if (raw->s)
|
|
sk_close(raw->s);
|
|
conf_free(raw->conf);
|
|
sfree(raw);
|
|
}
|
|
|
|
/*
|
|
* Stub routine (we don't have any need to reconfigure this backend).
|
|
*/
|
|
static void raw_reconfig(Backend *be, Conf *conf)
|
|
{
|
|
}
|
|
|
|
/*
|
|
* Called to send data down the raw connection.
|
|
*/
|
|
static int raw_send(Backend *be, const char *buf, int len)
|
|
{
|
|
Raw *raw = container_of(be, Raw, backend);
|
|
|
|
if (raw->s == NULL)
|
|
return 0;
|
|
|
|
raw->bufsize = sk_write(raw->s, buf, len);
|
|
|
|
return raw->bufsize;
|
|
}
|
|
|
|
/*
|
|
* Called to query the current socket sendability status.
|
|
*/
|
|
static int raw_sendbuffer(Backend *be)
|
|
{
|
|
Raw *raw = container_of(be, Raw, backend);
|
|
return raw->bufsize;
|
|
}
|
|
|
|
/*
|
|
* Called to set the size of the window
|
|
*/
|
|
static void raw_size(Backend *be, int width, int height)
|
|
{
|
|
/* Do nothing! */
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Send raw special codes. We only handle outgoing EOF here.
|
|
*/
|
|
static void raw_special(Backend *be, SessionSpecialCode code, int arg)
|
|
{
|
|
Raw *raw = container_of(be, Raw, backend);
|
|
if (code == SS_EOF && raw->s) {
|
|
sk_write_eof(raw->s);
|
|
raw->sent_socket_eof= true;
|
|
raw_check_close(raw);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Return a list of the special codes that make sense in this
|
|
* protocol.
|
|
*/
|
|
static const SessionSpecial *raw_get_specials(Backend *be)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static bool raw_connected(Backend *be)
|
|
{
|
|
Raw *raw = container_of(be, Raw, backend);
|
|
return raw->s != NULL;
|
|
}
|
|
|
|
static bool raw_sendok(Backend *be)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static void raw_unthrottle(Backend *be, int backlog)
|
|
{
|
|
Raw *raw = container_of(be, Raw, backend);
|
|
sk_set_frozen(raw->s, backlog > RAW_MAX_BACKLOG);
|
|
}
|
|
|
|
static bool raw_ldisc(Backend *be, int option)
|
|
{
|
|
if (option == LD_EDIT || option == LD_ECHO)
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
static void raw_provide_ldisc(Backend *be, Ldisc *ldisc)
|
|
{
|
|
/* This is a stub. */
|
|
}
|
|
|
|
static int raw_exitcode(Backend *be)
|
|
{
|
|
Raw *raw = container_of(be, Raw, backend);
|
|
if (raw->s != NULL)
|
|
return -1; /* still connected */
|
|
else if (raw->closed_on_socket_error)
|
|
return INT_MAX; /* a socket error counts as an unclean exit */
|
|
else
|
|
/* Exit codes are a meaningless concept in the Raw protocol */
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* cfg_info for Raw does nothing at all.
|
|
*/
|
|
static int raw_cfg_info(Backend *be)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
const struct BackendVtable raw_backend = {
|
|
raw_init,
|
|
raw_free,
|
|
raw_reconfig,
|
|
raw_send,
|
|
raw_sendbuffer,
|
|
raw_size,
|
|
raw_special,
|
|
raw_get_specials,
|
|
raw_connected,
|
|
raw_exitcode,
|
|
raw_sendok,
|
|
raw_ldisc,
|
|
raw_provide_ldisc,
|
|
raw_unthrottle,
|
|
raw_cfg_info,
|
|
NULL /* test_for_upstream */,
|
|
"raw",
|
|
PROT_RAW,
|
|
0
|
|
};
|