2018-10-07 13:55:32 +00:00
|
|
|
/*
|
2020-03-10 21:11:14 +00:00
|
|
|
* uxfdsock.c: implementation of Socket that just talks to two
|
2018-10-07 13:55:32 +00:00
|
|
|
* existing input and output file descriptors.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
|
|
|
#include "tree234.h"
|
|
|
|
#include "putty.h"
|
|
|
|
#include "network.h"
|
|
|
|
|
|
|
|
typedef struct FdSocket {
|
|
|
|
int outfd, infd, inerrfd;
|
|
|
|
|
|
|
|
bufchain pending_output_data;
|
|
|
|
bufchain pending_input_data;
|
2019-03-01 19:18:31 +00:00
|
|
|
ProxyStderrBuf psb;
|
2018-10-07 13:55:32 +00:00
|
|
|
enum { EOF_NO, EOF_PENDING, EOF_SENT } outgoingeof;
|
|
|
|
|
|
|
|
int pending_error;
|
|
|
|
|
|
|
|
Plug *plug;
|
|
|
|
|
|
|
|
Socket sock;
|
|
|
|
} FdSocket;
|
|
|
|
|
|
|
|
static void fdsocket_select_result_input(int fd, int event);
|
|
|
|
static void fdsocket_select_result_output(int fd, int event);
|
|
|
|
static void fdsocket_select_result_input_error(int fd, int event);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Trees to look up the fds in.
|
|
|
|
*/
|
|
|
|
static tree234 *fdsocket_by_outfd;
|
|
|
|
static tree234 *fdsocket_by_infd;
|
|
|
|
static tree234 *fdsocket_by_inerrfd;
|
|
|
|
|
|
|
|
static int fdsocket_infd_cmp(void *av, void *bv)
|
|
|
|
{
|
|
|
|
FdSocket *a = (FdSocket *)av;
|
|
|
|
FdSocket *b = (FdSocket *)bv;
|
|
|
|
if (a->infd < b->infd)
|
2019-09-08 19:29:00 +00:00
|
|
|
return -1;
|
2018-10-07 13:55:32 +00:00
|
|
|
if (a->infd > b->infd)
|
2019-09-08 19:29:00 +00:00
|
|
|
return +1;
|
2018-10-07 13:55:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static int fdsocket_infd_find(void *av, void *bv)
|
|
|
|
{
|
|
|
|
int a = *(int *)av;
|
|
|
|
FdSocket *b = (FdSocket *)bv;
|
|
|
|
if (a < b->infd)
|
2019-09-08 19:29:00 +00:00
|
|
|
return -1;
|
2018-10-07 13:55:32 +00:00
|
|
|
if (a > b->infd)
|
2019-09-08 19:29:00 +00:00
|
|
|
return +1;
|
2018-10-07 13:55:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static int fdsocket_inerrfd_cmp(void *av, void *bv)
|
|
|
|
{
|
|
|
|
FdSocket *a = (FdSocket *)av;
|
|
|
|
FdSocket *b = (FdSocket *)bv;
|
|
|
|
if (a->inerrfd < b->inerrfd)
|
2019-09-08 19:29:00 +00:00
|
|
|
return -1;
|
2018-10-07 13:55:32 +00:00
|
|
|
if (a->inerrfd > b->inerrfd)
|
2019-09-08 19:29:00 +00:00
|
|
|
return +1;
|
2018-10-07 13:55:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static int fdsocket_inerrfd_find(void *av, void *bv)
|
|
|
|
{
|
|
|
|
int a = *(int *)av;
|
|
|
|
FdSocket *b = (FdSocket *)bv;
|
|
|
|
if (a < b->inerrfd)
|
2019-09-08 19:29:00 +00:00
|
|
|
return -1;
|
2018-10-07 13:55:32 +00:00
|
|
|
if (a > b->inerrfd)
|
2019-09-08 19:29:00 +00:00
|
|
|
return +1;
|
2018-10-07 13:55:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static int fdsocket_outfd_cmp(void *av, void *bv)
|
|
|
|
{
|
|
|
|
FdSocket *a = (FdSocket *)av;
|
|
|
|
FdSocket *b = (FdSocket *)bv;
|
|
|
|
if (a->outfd < b->outfd)
|
2019-09-08 19:29:00 +00:00
|
|
|
return -1;
|
2018-10-07 13:55:32 +00:00
|
|
|
if (a->outfd > b->outfd)
|
2019-09-08 19:29:00 +00:00
|
|
|
return +1;
|
2018-10-07 13:55:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static int fdsocket_outfd_find(void *av, void *bv)
|
|
|
|
{
|
|
|
|
int a = *(int *)av;
|
|
|
|
FdSocket *b = (FdSocket *)bv;
|
|
|
|
if (a < b->outfd)
|
2019-09-08 19:29:00 +00:00
|
|
|
return -1;
|
2018-10-07 13:55:32 +00:00
|
|
|
if (a > b->outfd)
|
2019-09-08 19:29:00 +00:00
|
|
|
return +1;
|
2018-10-07 13:55:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static Plug *fdsocket_plug(Socket *s, Plug *p)
|
|
|
|
{
|
|
|
|
FdSocket *fds = container_of(s, FdSocket, sock);
|
|
|
|
Plug *ret = fds->plug;
|
|
|
|
if (p)
|
2019-09-08 19:29:00 +00:00
|
|
|
fds->plug = p;
|
2018-10-07 13:55:32 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void fdsocket_close(Socket *s)
|
|
|
|
{
|
|
|
|
FdSocket *fds = container_of(s, FdSocket, sock);
|
|
|
|
|
|
|
|
if (fds->outfd >= 0) {
|
|
|
|
del234(fdsocket_by_outfd, fds);
|
|
|
|
uxsel_del(fds->outfd);
|
|
|
|
close(fds->outfd);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fds->infd >= 0) {
|
|
|
|
del234(fdsocket_by_infd, fds);
|
|
|
|
uxsel_del(fds->infd);
|
|
|
|
close(fds->infd);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fds->inerrfd >= 0) {
|
|
|
|
del234(fdsocket_by_inerrfd, fds);
|
|
|
|
uxsel_del(fds->inerrfd);
|
|
|
|
close(fds->inerrfd);
|
|
|
|
}
|
|
|
|
|
|
|
|
bufchain_clear(&fds->pending_input_data);
|
|
|
|
bufchain_clear(&fds->pending_output_data);
|
|
|
|
|
|
|
|
delete_callbacks_for_context(fds);
|
|
|
|
|
|
|
|
sfree(fds);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void fdsocket_error_callback(void *vs)
|
|
|
|
{
|
|
|
|
FdSocket *fds = (FdSocket *)vs;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Just in case other socket work has caused this socket to vanish
|
|
|
|
* or become somehow non-erroneous before this callback arrived...
|
|
|
|
*/
|
|
|
|
if (!fds->pending_error)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* An error has occurred on this socket. Pass it to the plug.
|
|
|
|
*/
|
|
|
|
plug_closing(fds->plug, strerror(fds->pending_error),
|
|
|
|
fds->pending_error, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int fdsocket_try_send(FdSocket *fds)
|
|
|
|
{
|
|
|
|
int sent = 0;
|
|
|
|
|
|
|
|
while (bufchain_size(&fds->pending_output_data) > 0) {
|
2019-02-06 20:42:44 +00:00
|
|
|
ssize_t ret;
|
2018-10-07 13:55:32 +00:00
|
|
|
|
2019-09-08 19:29:00 +00:00
|
|
|
ptrlen data = bufchain_prefix(&fds->pending_output_data);
|
|
|
|
ret = write(fds->outfd, data.ptr, data.len);
|
2019-01-22 18:25:54 +00:00
|
|
|
noise_ultralight(NOISE_SOURCE_IOID, ret);
|
2019-09-08 19:29:00 +00:00
|
|
|
if (ret < 0 && errno != EWOULDBLOCK) {
|
2018-10-07 13:55:32 +00:00
|
|
|
if (!fds->pending_error) {
|
|
|
|
fds->pending_error = errno;
|
|
|
|
queue_toplevel_callback(fdsocket_error_callback, fds);
|
|
|
|
}
|
|
|
|
return 0;
|
2019-09-08 19:29:00 +00:00
|
|
|
} else if (ret <= 0) {
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
bufchain_consume(&fds->pending_output_data, ret);
|
|
|
|
sent += ret;
|
|
|
|
}
|
2018-10-07 13:55:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (fds->outgoingeof == EOF_PENDING) {
|
|
|
|
del234(fdsocket_by_outfd, fds);
|
|
|
|
close(fds->outfd);
|
|
|
|
uxsel_del(fds->outfd);
|
|
|
|
fds->outfd = -1;
|
|
|
|
fds->outgoingeof = EOF_SENT;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bufchain_size(&fds->pending_output_data) == 0)
|
2019-09-08 19:29:00 +00:00
|
|
|
uxsel_del(fds->outfd);
|
2018-10-07 13:55:32 +00:00
|
|
|
else
|
2019-09-08 19:29:00 +00:00
|
|
|
uxsel_set(fds->outfd, SELECT_W, fdsocket_select_result_output);
|
2018-10-07 13:55:32 +00:00
|
|
|
|
|
|
|
return sent;
|
|
|
|
}
|
|
|
|
|
2019-02-06 20:42:44 +00:00
|
|
|
static size_t fdsocket_write(Socket *s, const void *data, size_t len)
|
2018-10-07 13:55:32 +00:00
|
|
|
{
|
|
|
|
FdSocket *fds = container_of(s, FdSocket, sock);
|
|
|
|
|
|
|
|
assert(fds->outgoingeof == EOF_NO);
|
|
|
|
|
|
|
|
bufchain_add(&fds->pending_output_data, data, len);
|
|
|
|
|
|
|
|
fdsocket_try_send(fds);
|
|
|
|
|
|
|
|
return bufchain_size(&fds->pending_output_data);
|
|
|
|
}
|
|
|
|
|
2019-02-06 20:42:44 +00:00
|
|
|
static size_t fdsocket_write_oob(Socket *s, const void *data, size_t len)
|
2018-10-07 13:55:32 +00:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* oob data is treated as inband; nasty, but nothing really
|
|
|
|
* better we can do
|
|
|
|
*/
|
|
|
|
return fdsocket_write(s, data, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void fdsocket_write_eof(Socket *s)
|
|
|
|
{
|
|
|
|
FdSocket *fds = container_of(s, FdSocket, sock);
|
|
|
|
|
|
|
|
assert(fds->outgoingeof == EOF_NO);
|
|
|
|
fds->outgoingeof = EOF_PENDING;
|
|
|
|
|
|
|
|
fdsocket_try_send(fds);
|
|
|
|
}
|
|
|
|
|
Convert a lot of 'int' variables to 'bool'.
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'!
2018-11-02 19:23:19 +00:00
|
|
|
static void fdsocket_set_frozen(Socket *s, bool is_frozen)
|
2018-10-07 13:55:32 +00:00
|
|
|
{
|
|
|
|
FdSocket *fds = container_of(s, FdSocket, sock);
|
|
|
|
|
|
|
|
if (fds->infd < 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (is_frozen)
|
2019-09-08 19:29:00 +00:00
|
|
|
uxsel_del(fds->infd);
|
2018-10-07 13:55:32 +00:00
|
|
|
else
|
2019-09-08 19:29:00 +00:00
|
|
|
uxsel_set(fds->infd, SELECT_R, fdsocket_select_result_input);
|
2018-10-07 13:55:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static const char *fdsocket_socket_error(Socket *s)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void fdsocket_select_result_input(int fd, int event)
|
|
|
|
{
|
|
|
|
FdSocket *fds;
|
|
|
|
char buf[20480];
|
|
|
|
int retd;
|
|
|
|
|
|
|
|
if (!(fds = find234(fdsocket_by_infd, &fd, fdsocket_infd_find)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
retd = read(fds->infd, buf, sizeof(buf));
|
|
|
|
if (retd > 0) {
|
|
|
|
plug_receive(fds->plug, 0, buf, retd);
|
|
|
|
} else {
|
|
|
|
if (retd < 0) {
|
|
|
|
plug_closing(fds->plug, strerror(errno), errno, 0);
|
|
|
|
} else {
|
|
|
|
plug_closing(fds->plug, NULL, 0, 0);
|
|
|
|
}
|
|
|
|
del234(fdsocket_by_infd, fds);
|
|
|
|
uxsel_del(fds->infd);
|
|
|
|
close(fds->infd);
|
|
|
|
fds->infd = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void fdsocket_select_result_output(int fd, int event)
|
|
|
|
{
|
|
|
|
FdSocket *fds;
|
|
|
|
|
|
|
|
if (!(fds = find234(fdsocket_by_outfd, &fd, fdsocket_outfd_find)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (fdsocket_try_send(fds))
|
|
|
|
plug_sent(fds->plug, bufchain_size(&fds->pending_output_data));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void fdsocket_select_result_input_error(int fd, int event)
|
|
|
|
{
|
|
|
|
FdSocket *fds;
|
|
|
|
char buf[20480];
|
|
|
|
int retd;
|
|
|
|
|
|
|
|
if (!(fds = find234(fdsocket_by_inerrfd, &fd, fdsocket_inerrfd_find)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
retd = read(fd, buf, sizeof(buf));
|
|
|
|
if (retd > 0) {
|
2019-03-01 19:18:31 +00:00
|
|
|
log_proxy_stderr(fds->plug, &fds->psb, buf, retd);
|
2018-10-07 13:55:32 +00:00
|
|
|
} else {
|
|
|
|
del234(fdsocket_by_inerrfd, fds);
|
|
|
|
uxsel_del(fds->inerrfd);
|
|
|
|
close(fds->inerrfd);
|
|
|
|
fds->inerrfd = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static const SocketVtable FdSocket_sockvt = {
|
Change vtable defs to use C99 designated initialisers.
This is a sweeping change applied across the whole code base by a spot
of Emacs Lisp. Now, everywhere I declare a vtable filled with function
pointers (and the occasional const data member), all the members of
the vtable structure are initialised by name using the '.fieldname =
value' syntax introduced in C99.
We were already using this syntax for a handful of things in the new
key-generation progress report system, so it's not new to the code
base as a whole.
The advantage is that now, when a vtable only declares a subset of the
available fields, I can initialise the rest to NULL or zero just by
leaving them out. This is most dramatic in a couple of the outlying
vtables in things like psocks (which has a ConnectionLayerVtable
containing only one non-NULL method), but less dramatically, it means
that the new 'flags' field in BackendVtable can be completely left out
of every backend definition except for the SUPDUP one which defines it
to a nonzero value. Similarly, the test_for_upstream method only used
by SSH doesn't have to be mentioned in the rest of the backends;
network Plugs for listening sockets don't have to explicitly null out
'receive' and 'sent', and vice versa for 'accepting', and so on.
While I'm at it, I've normalised the declarations so they don't use
the unnecessarily verbose 'struct' keyword. Also a handful of them
weren't const; now they are.
2020-03-10 21:06:29 +00:00
|
|
|
.plug = fdsocket_plug,
|
|
|
|
.close = fdsocket_close,
|
|
|
|
.write = fdsocket_write,
|
|
|
|
.write_oob = fdsocket_write_oob,
|
|
|
|
.write_eof = fdsocket_write_eof,
|
|
|
|
.set_frozen = fdsocket_set_frozen,
|
|
|
|
.socket_error = fdsocket_socket_error,
|
|
|
|
.peer_info = NULL,
|
2018-10-07 13:55:32 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
Socket *make_fd_socket(int infd, int outfd, int inerrfd, Plug *plug)
|
|
|
|
{
|
|
|
|
FdSocket *fds;
|
|
|
|
|
|
|
|
fds = snew(FdSocket);
|
|
|
|
fds->sock.vt = &FdSocket_sockvt;
|
|
|
|
fds->plug = plug;
|
|
|
|
fds->outgoingeof = EOF_NO;
|
|
|
|
fds->pending_error = 0;
|
|
|
|
|
|
|
|
fds->infd = infd;
|
|
|
|
fds->outfd = outfd;
|
|
|
|
fds->inerrfd = inerrfd;
|
|
|
|
|
|
|
|
bufchain_init(&fds->pending_input_data);
|
|
|
|
bufchain_init(&fds->pending_output_data);
|
2019-03-01 19:18:31 +00:00
|
|
|
psb_init(&fds->psb);
|
2018-10-07 13:55:32 +00:00
|
|
|
|
|
|
|
if (fds->outfd >= 0) {
|
|
|
|
if (!fdsocket_by_outfd)
|
|
|
|
fdsocket_by_outfd = newtree234(fdsocket_outfd_cmp);
|
|
|
|
add234(fdsocket_by_outfd, fds);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fds->infd >= 0) {
|
|
|
|
if (!fdsocket_by_infd)
|
|
|
|
fdsocket_by_infd = newtree234(fdsocket_infd_cmp);
|
|
|
|
add234(fdsocket_by_infd, fds);
|
2019-02-07 18:13:56 +00:00
|
|
|
uxsel_set(fds->infd, SELECT_R, fdsocket_select_result_input);
|
2018-10-07 13:55:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (fds->inerrfd >= 0) {
|
|
|
|
assert(fds->inerrfd != fds->infd);
|
|
|
|
if (!fdsocket_by_inerrfd)
|
|
|
|
fdsocket_by_inerrfd = newtree234(fdsocket_inerrfd_cmp);
|
|
|
|
add234(fdsocket_by_inerrfd, fds);
|
2019-02-07 18:13:56 +00:00
|
|
|
uxsel_set(fds->inerrfd, SELECT_R, fdsocket_select_result_input_error);
|
2018-10-07 13:55:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return &fds->sock;
|
|
|
|
}
|