2015-11-22 11:49:14 +00:00
|
|
|
/*
|
|
|
|
* be_misc.c: helper functions shared between main network backends.
|
|
|
|
*/
|
|
|
|
|
2015-11-22 14:33:28 +00:00
|
|
|
#include <assert.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
2015-11-22 11:49:14 +00:00
|
|
|
#include "putty.h"
|
|
|
|
#include "network.h"
|
|
|
|
|
New abstraction 'Seat', to pass to backends.
This is a new vtable-based abstraction which is passed to a backend in
place of Frontend, and it implements only the subset of the Frontend
functions needed by a backend. (Many other Frontend functions still
exist, notably the wide range of things called by terminal.c providing
platform-independent operations on the GUI terminal window.)
The purpose of making it a vtable is that this opens up the
possibility of creating a backend as an internal implementation detail
of some other activity, by providing just that one backend with a
custom Seat that implements the methods differently.
For example, this refactoring should make it feasible to directly
implement an SSH proxy type, aka the 'jump host' feature supported by
OpenSSH, aka 'open a secondary SSH session in MAINCHAN_DIRECT_TCP
mode, and then expose the main channel of that as the Socket for the
primary connection'. (Which of course you can already do by spawning
'plink -nc' as a separate proxy process, but this would permit it in
the _same_ process without anything getting confused.)
I've centralised a full set of stub methods in misc.c for the new
abstraction, which allows me to get rid of several annoying stubs in
the previous code. Also, while I'm here, I've moved a lot of
duplicated modalfatalbox() type functions from application main
program files into wincons.c / uxcons.c, which I think saves
duplication overall. (A minor visible effect is that the prefixes on
those console-based fatal error messages will now be more consistent
between applications.)
2018-10-11 18:58:42 +00:00
|
|
|
void backend_socket_log(Seat *seat, LogContext *logctx,
|
2020-02-07 19:17:45 +00:00
|
|
|
PlugLogType type, SockAddr *addr, int port,
|
2015-11-22 14:33:28 +00:00
|
|
|
const char *error_msg, int error_code, Conf *conf,
|
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
|
|
|
bool session_started)
|
2015-11-22 11:49:14 +00:00
|
|
|
{
|
|
|
|
char addrbuf[256], *msg;
|
|
|
|
|
|
|
|
switch (type) {
|
2020-02-07 19:17:45 +00:00
|
|
|
case PLUGLOG_CONNECT_TRYING:
|
2015-11-22 11:49:14 +00:00
|
|
|
sk_getaddr(addr, addrbuf, lenof(addrbuf));
|
|
|
|
if (sk_addr_needs_port(addr)) {
|
|
|
|
msg = dupprintf("Connecting to %s port %d", addrbuf, port);
|
|
|
|
} else {
|
|
|
|
msg = dupprintf("Connecting to %s", addrbuf);
|
|
|
|
}
|
|
|
|
break;
|
2020-02-07 19:17:45 +00:00
|
|
|
case PLUGLOG_CONNECT_FAILED:
|
2015-11-22 11:49:14 +00:00
|
|
|
sk_getaddr(addr, addrbuf, lenof(addrbuf));
|
|
|
|
msg = dupprintf("Failed to connect to %s: %s", addrbuf, error_msg);
|
|
|
|
break;
|
2020-02-07 19:18:50 +00:00
|
|
|
case PLUGLOG_CONNECT_SUCCESS:
|
2021-09-13 13:28:47 +00:00
|
|
|
if (addr)
|
|
|
|
sk_getaddr(addr, addrbuf, lenof(addrbuf));
|
|
|
|
else /* fallback if address unavailable */
|
|
|
|
sprintf(addrbuf, "remote host");
|
2020-02-07 19:18:50 +00:00
|
|
|
msg = dupprintf("Connected to %s", addrbuf);
|
|
|
|
break;
|
Formatting change to braces around one case of a switch.
Sometimes, within a switch statement, you want to declare local
variables specific to the handler for one particular case. Until now
I've mostly been writing this in the form
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED:
{
declare variables;
do stuff;
}
break;
}
which is ugly because the two pieces of essentially similar code
appear at different indent levels, and also inconvenient because you
have less horizontal space available to write the complicated case
handler in - particuarly undesirable because _complicated_ case
handlers are the ones most likely to need all the space they can get!
After encountering a rather nicer idiom in the LLVM source code, and
after a bit of hackery this morning figuring out how to persuade
Emacs's auto-indent to do what I wanted with it, I've decided to move
to an idiom in which the open brace comes right after the case
statement, and the code within it is indented the same as it would
have been without the brace. Then the whole case handler (including
the break) lives inside those braces, and you get something that looks
more like this:
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED: {
declare variables;
do stuff;
break;
}
}
This commit is a big-bang change that reformats all the complicated
case handlers I could find into the new layout. This is particularly
nice in the Pageant main function, in which almost _every_ case
handler had a bundle of variables and was long and complicated. (In
fact that's what motivated me to get round to this.) Some of the
innermost parts of the terminal escape-sequence handling are also
breathing a bit easier now the horizontal pressure on them is
relieved.
(Also, in a few cases, I was able to remove the extra braces
completely, because the only variable local to the case handler was a
loop variable which our new C99 policy allows me to move into the
initialiser clause of its for statement.)
Viewed with whitespace ignored, this is not too disruptive a change.
Downstream patches that conflict with it may need to be reapplied
using --ignore-whitespace or similar.
2020-02-16 07:49:52 +00:00
|
|
|
case PLUGLOG_PROXY_MSG: {
|
2015-11-22 12:15:52 +00:00
|
|
|
/* Proxy-related log messages have their own identifying
|
|
|
|
* prefix already, put on by our caller. */
|
Formatting change to braces around one case of a switch.
Sometimes, within a switch statement, you want to declare local
variables specific to the handler for one particular case. Until now
I've mostly been writing this in the form
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED:
{
declare variables;
do stuff;
}
break;
}
which is ugly because the two pieces of essentially similar code
appear at different indent levels, and also inconvenient because you
have less horizontal space available to write the complicated case
handler in - particuarly undesirable because _complicated_ case
handlers are the ones most likely to need all the space they can get!
After encountering a rather nicer idiom in the LLVM source code, and
after a bit of hackery this morning figuring out how to persuade
Emacs's auto-indent to do what I wanted with it, I've decided to move
to an idiom in which the open brace comes right after the case
statement, and the code within it is indented the same as it would
have been without the brace. Then the whole case handler (including
the break) lives inside those braces, and you get something that looks
more like this:
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED: {
declare variables;
do stuff;
break;
}
}
This commit is a big-bang change that reformats all the complicated
case handlers I could find into the new layout. This is particularly
nice in the Pageant main function, in which almost _every_ case
handler had a bundle of variables and was long and complicated. (In
fact that's what motivated me to get round to this.) Some of the
innermost parts of the terminal escape-sequence handling are also
breathing a bit easier now the horizontal pressure on them is
relieved.
(Also, in a few cases, I was able to remove the extra braces
completely, because the only variable local to the case handler was a
loop variable which our new C99 policy allows me to move into the
initialiser clause of its for statement.)
Viewed with whitespace ignored, this is not too disruptive a change.
Downstream patches that conflict with it may need to be reapplied
using --ignore-whitespace or similar.
2020-02-16 07:49:52 +00:00
|
|
|
int len, log_to_term;
|
2015-11-22 14:33:28 +00:00
|
|
|
|
Formatting change to braces around one case of a switch.
Sometimes, within a switch statement, you want to declare local
variables specific to the handler for one particular case. Until now
I've mostly been writing this in the form
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED:
{
declare variables;
do stuff;
}
break;
}
which is ugly because the two pieces of essentially similar code
appear at different indent levels, and also inconvenient because you
have less horizontal space available to write the complicated case
handler in - particuarly undesirable because _complicated_ case
handlers are the ones most likely to need all the space they can get!
After encountering a rather nicer idiom in the LLVM source code, and
after a bit of hackery this morning figuring out how to persuade
Emacs's auto-indent to do what I wanted with it, I've decided to move
to an idiom in which the open brace comes right after the case
statement, and the code within it is indented the same as it would
have been without the brace. Then the whole case handler (including
the break) lives inside those braces, and you get something that looks
more like this:
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED: {
declare variables;
do stuff;
break;
}
}
This commit is a big-bang change that reformats all the complicated
case handlers I could find into the new layout. This is particularly
nice in the Pageant main function, in which almost _every_ case
handler had a bundle of variables and was long and complicated. (In
fact that's what motivated me to get round to this.) Some of the
innermost parts of the terminal escape-sequence handling are also
breathing a bit easier now the horizontal pressure on them is
relieved.
(Also, in a few cases, I was able to remove the extra braces
completely, because the only variable local to the case handler was a
loop variable which our new C99 policy allows me to move into the
initialiser clause of its for statement.)
Viewed with whitespace ignored, this is not too disruptive a change.
Downstream patches that conflict with it may need to be reapplied
using --ignore-whitespace or similar.
2020-02-16 07:49:52 +00:00
|
|
|
/* Suffix \r\n temporarily, so we can log to the terminal. */
|
|
|
|
msg = dupprintf("%s\r\n", error_msg);
|
|
|
|
len = strlen(msg);
|
|
|
|
assert(len >= 2);
|
2015-11-22 14:33:28 +00:00
|
|
|
|
Formatting change to braces around one case of a switch.
Sometimes, within a switch statement, you want to declare local
variables specific to the handler for one particular case. Until now
I've mostly been writing this in the form
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED:
{
declare variables;
do stuff;
}
break;
}
which is ugly because the two pieces of essentially similar code
appear at different indent levels, and also inconvenient because you
have less horizontal space available to write the complicated case
handler in - particuarly undesirable because _complicated_ case
handlers are the ones most likely to need all the space they can get!
After encountering a rather nicer idiom in the LLVM source code, and
after a bit of hackery this morning figuring out how to persuade
Emacs's auto-indent to do what I wanted with it, I've decided to move
to an idiom in which the open brace comes right after the case
statement, and the code within it is indented the same as it would
have been without the brace. Then the whole case handler (including
the break) lives inside those braces, and you get something that looks
more like this:
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED: {
declare variables;
do stuff;
break;
}
}
This commit is a big-bang change that reformats all the complicated
case handlers I could find into the new layout. This is particularly
nice in the Pageant main function, in which almost _every_ case
handler had a bundle of variables and was long and complicated. (In
fact that's what motivated me to get round to this.) Some of the
innermost parts of the terminal escape-sequence handling are also
breathing a bit easier now the horizontal pressure on them is
relieved.
(Also, in a few cases, I was able to remove the extra braces
completely, because the only variable local to the case handler was a
loop variable which our new C99 policy allows me to move into the
initialiser clause of its for statement.)
Viewed with whitespace ignored, this is not too disruptive a change.
Downstream patches that conflict with it may need to be reapplied
using --ignore-whitespace or similar.
2020-02-16 07:49:52 +00:00
|
|
|
log_to_term = conf_get_int(conf, CONF_proxy_log_to_term);
|
|
|
|
if (log_to_term == AUTO)
|
|
|
|
log_to_term = session_started ? FORCE_OFF : FORCE_ON;
|
|
|
|
if (log_to_term == FORCE_ON)
|
|
|
|
seat_stderr(seat, msg, len);
|
2015-11-22 14:33:28 +00:00
|
|
|
|
Formatting change to braces around one case of a switch.
Sometimes, within a switch statement, you want to declare local
variables specific to the handler for one particular case. Until now
I've mostly been writing this in the form
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED:
{
declare variables;
do stuff;
}
break;
}
which is ugly because the two pieces of essentially similar code
appear at different indent levels, and also inconvenient because you
have less horizontal space available to write the complicated case
handler in - particuarly undesirable because _complicated_ case
handlers are the ones most likely to need all the space they can get!
After encountering a rather nicer idiom in the LLVM source code, and
after a bit of hackery this morning figuring out how to persuade
Emacs's auto-indent to do what I wanted with it, I've decided to move
to an idiom in which the open brace comes right after the case
statement, and the code within it is indented the same as it would
have been without the brace. Then the whole case handler (including
the break) lives inside those braces, and you get something that looks
more like this:
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED: {
declare variables;
do stuff;
break;
}
}
This commit is a big-bang change that reformats all the complicated
case handlers I could find into the new layout. This is particularly
nice in the Pageant main function, in which almost _every_ case
handler had a bundle of variables and was long and complicated. (In
fact that's what motivated me to get round to this.) Some of the
innermost parts of the terminal escape-sequence handling are also
breathing a bit easier now the horizontal pressure on them is
relieved.
(Also, in a few cases, I was able to remove the extra braces
completely, because the only variable local to the case handler was a
loop variable which our new C99 policy allows me to move into the
initialiser clause of its for statement.)
Viewed with whitespace ignored, this is not too disruptive a change.
Downstream patches that conflict with it may need to be reapplied
using --ignore-whitespace or similar.
2020-02-16 07:49:52 +00:00
|
|
|
msg[len-2] = '\0'; /* remove the \r\n again */
|
2015-11-22 12:15:52 +00:00
|
|
|
break;
|
Formatting change to braces around one case of a switch.
Sometimes, within a switch statement, you want to declare local
variables specific to the handler for one particular case. Until now
I've mostly been writing this in the form
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED:
{
declare variables;
do stuff;
}
break;
}
which is ugly because the two pieces of essentially similar code
appear at different indent levels, and also inconvenient because you
have less horizontal space available to write the complicated case
handler in - particuarly undesirable because _complicated_ case
handlers are the ones most likely to need all the space they can get!
After encountering a rather nicer idiom in the LLVM source code, and
after a bit of hackery this morning figuring out how to persuade
Emacs's auto-indent to do what I wanted with it, I've decided to move
to an idiom in which the open brace comes right after the case
statement, and the code within it is indented the same as it would
have been without the brace. Then the whole case handler (including
the break) lives inside those braces, and you get something that looks
more like this:
switch (discriminant) {
case SIMPLE:
do stuff;
break;
case COMPLICATED: {
declare variables;
do stuff;
break;
}
}
This commit is a big-bang change that reformats all the complicated
case handlers I could find into the new layout. This is particularly
nice in the Pageant main function, in which almost _every_ case
handler had a bundle of variables and was long and complicated. (In
fact that's what motivated me to get round to this.) Some of the
innermost parts of the terminal escape-sequence handling are also
breathing a bit easier now the horizontal pressure on them is
relieved.
(Also, in a few cases, I was able to remove the extra braces
completely, because the only variable local to the case handler was a
loop variable which our new C99 policy allows me to move into the
initialiser clause of its for statement.)
Viewed with whitespace ignored, this is not too disruptive a change.
Downstream patches that conflict with it may need to be reapplied
using --ignore-whitespace or similar.
2020-02-16 07:49:52 +00:00
|
|
|
}
|
2015-11-22 11:49:14 +00:00
|
|
|
default:
|
|
|
|
msg = NULL; /* shouldn't happen, but placate optimiser */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (msg) {
|
Refactor the LogContext type.
LogContext is now the owner of the logevent() function that back ends
and so forth are constantly calling. Previously, logevent was owned by
the Frontend, which would store the message into its list for the GUI
Event Log dialog (or print it to standard error, or whatever) and then
pass it _back_ to LogContext to write to the currently open log file.
Now it's the other way round: LogContext gets the message from the
back end first, writes it to its log file if it feels so inclined, and
communicates it back to the front end.
This means that lots of parts of the back end system no longer need to
have a pointer to a full-on Frontend; the only thing they needed it
for was logging, so now they just have a LogContext (which many of
them had to have anyway, e.g. for logging SSH packets or session
traffic).
LogContext itself also doesn't get a full Frontend pointer any more:
it now talks back to the front end via a little vtable of its own
called LogPolicy, which contains the method that passes Event Log
entries through, the old askappend() function that decides whether to
truncate a pre-existing log file, and an emergency function for
printing an especially prominent message if the log file can't be
created. One minor nice effect of this is that console and GUI apps
can implement that last function subtly differently, so that Unix
console apps can write it with a plain \n instead of the \r\n
(harmless but inelegant) that the old centralised implementation
generated.
One other consequence of this is that the LogContext has to be
provided to backend_init() so that it's available to backends from the
instant of creation, rather than being provided via a separate API
call a couple of function calls later, because backends have typically
started doing things that need logging (like making network
connections) before the call to backend_provide_logctx. Fortunately,
there's no case in the whole code base where we don't already have
logctx by the time we make a backend (so I don't actually remember why
I ever delayed providing one). So that shortens the backend API by one
function, which is always nice.
While I'm tidying up, I've also moved the printf-style logeventf() and
the handy logevent_and_free() into logging.c, instead of having copies
of them scattered around other places. This has also let me remove
some stub functions from a couple of outlying applications like
Pageant. Finally, I've removed the pointless "_tag" at the end of
LogContext's official struct name.
2018-10-10 18:26:18 +00:00
|
|
|
logevent(logctx, msg);
|
2015-11-22 11:49:14 +00:00
|
|
|
sfree(msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-01 19:18:31 +00:00
|
|
|
void psb_init(ProxyStderrBuf *psb)
|
|
|
|
{
|
|
|
|
psb->size = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void log_proxy_stderr(Plug *plug, ProxyStderrBuf *psb,
|
|
|
|
const void *vdata, size_t len)
|
2015-11-22 11:50:37 +00:00
|
|
|
{
|
|
|
|
const char *data = (const char *)vdata;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This helper function allows us to collect the data written to a
|
|
|
|
* local proxy command's standard error in whatever size chunks we
|
|
|
|
* happen to get from its pipe, and whenever we have a complete
|
|
|
|
* line, we pass it to plug_log.
|
|
|
|
*
|
2019-03-01 19:18:31 +00:00
|
|
|
* (We also do this when the buffer in psb fills up, to avoid just
|
|
|
|
* allocating more and more memory forever, and also to keep Event
|
|
|
|
* Log lines reasonably bounded in size.)
|
|
|
|
*
|
|
|
|
* Prerequisites: a plug to log to, and a ProxyStderrBuf stored
|
|
|
|
* somewhere to collect any not-yet-output partial line.
|
2015-11-22 11:50:37 +00:00
|
|
|
*/
|
|
|
|
|
2019-03-01 19:18:31 +00:00
|
|
|
while (len > 0) {
|
2015-11-22 11:50:37 +00:00
|
|
|
/*
|
2019-03-01 19:18:31 +00:00
|
|
|
* Copy as much data into psb->buf as will fit.
|
2015-11-22 11:50:37 +00:00
|
|
|
*/
|
2019-03-01 19:18:31 +00:00
|
|
|
assert(psb->size < lenof(psb->buf));
|
|
|
|
size_t to_consume = lenof(psb->buf) - psb->size;
|
|
|
|
if (to_consume > len)
|
|
|
|
to_consume = len;
|
|
|
|
memcpy(psb->buf + psb->size, data, to_consume);
|
|
|
|
data += to_consume;
|
|
|
|
len -= to_consume;
|
|
|
|
psb->size += to_consume;
|
2015-11-22 11:50:37 +00:00
|
|
|
|
|
|
|
/*
|
2019-03-01 19:18:31 +00:00
|
|
|
* Output any full lines in psb->buf.
|
2015-11-22 11:50:37 +00:00
|
|
|
*/
|
2019-03-01 19:18:31 +00:00
|
|
|
size_t pos = 0;
|
|
|
|
while (pos < psb->size) {
|
|
|
|
char *nlpos = memchr(psb->buf + pos, '\n', psb->size - pos);
|
|
|
|
if (!nlpos)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Found a newline in the buffer, so we can output a line.
|
|
|
|
*/
|
|
|
|
size_t endpos = nlpos - psb->buf;
|
|
|
|
while (endpos > pos && (psb->buf[endpos-1] == '\n' ||
|
|
|
|
psb->buf[endpos-1] == '\r'))
|
|
|
|
endpos--;
|
|
|
|
char *msg = dupprintf(
|
|
|
|
"proxy: %.*s", (int)(endpos - pos), psb->buf + pos);
|
2020-02-07 19:17:45 +00:00
|
|
|
plug_log(plug, PLUGLOG_PROXY_MSG, NULL, 0, msg, 0);
|
2019-03-01 19:18:31 +00:00
|
|
|
sfree(msg);
|
|
|
|
|
|
|
|
pos = nlpos - psb->buf + 1;
|
|
|
|
assert(pos <= psb->size);
|
|
|
|
}
|
2015-11-22 11:50:37 +00:00
|
|
|
|
|
|
|
/*
|
2019-03-01 19:18:31 +00:00
|
|
|
* If the buffer is completely full and we didn't output
|
|
|
|
* anything, then output the whole thing, flagging it as a
|
|
|
|
* truncated line.
|
2015-11-22 11:50:37 +00:00
|
|
|
*/
|
2019-03-01 19:18:31 +00:00
|
|
|
if (pos == 0 && psb->size == lenof(psb->buf)) {
|
|
|
|
char *msg = dupprintf(
|
|
|
|
"proxy (partial line): %.*s", (int)psb->size, psb->buf);
|
2020-02-07 19:17:45 +00:00
|
|
|
plug_log(plug, PLUGLOG_PROXY_MSG, NULL, 0, msg, 0);
|
2019-03-01 19:18:31 +00:00
|
|
|
sfree(msg);
|
2015-11-22 11:50:37 +00:00
|
|
|
|
2019-03-01 19:18:31 +00:00
|
|
|
pos = psb->size = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now move any remaining data up to the front of the buffer.
|
|
|
|
*/
|
|
|
|
size_t newsize = psb->size - pos;
|
|
|
|
if (newsize)
|
|
|
|
memmove(psb->buf, psb->buf + pos, newsize);
|
|
|
|
psb->size = newsize;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* And loop round again if there's more data to be read from
|
|
|
|
* our input.
|
|
|
|
*/
|
|
|
|
}
|
2015-11-22 11:50:37 +00:00
|
|
|
}
|