upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-29 02:00:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

CLEANUP: muxes: do not use a dynamic trash in list_mux_protos()

Browse source 
Let's not use a trash there anymore. The function is called at very
early boot (for "haproxy -vv"), and the need for a trash prevents the
arguments from being parsed earlier. Moreover, the function only uses
a FILE* on output with fprintf(), so there's not even any benefit in
using chunk_printf() on an intermediary variable, emitting the output
directly is both clearer and safer.
This commit is contained in:
Willy Tarreau 2022-02-18 11:07:40 +01:00
parent 5b4b6ca823
commit add4306231
1 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/connection.c
View file

@ -1603,13 +1603,16 @@ int conn_recv_socks4_proxy_response(struct connection *conn)
return 0;
}
/* Lists the known proto mux on <out> */
/* Lists the known proto mux on <out>. This function is used by "haproxy -vv"
* and is suitable for early boot just after the "REGISTER" stage because it
* doesn't depend on anything to be already allocated.
*/
void list_mux_proto(FILE *out)
{
struct mux_proto_list *item;
struct buffer *chk = get_trash_chunk();
struct ist proto;
char *mode, *side;
int done;
fprintf(out, "Available multiplexer protocols :\n"
"(protocols marked as <default> cannot be specified using 'proto' keyword)\n");
@ -1634,19 +1637,27 @@ void list_mux_proto(FILE *out)
else
side = "NONE";
chunk_reset(chk);
if (item->mux->flags & MX_FL_HTX)
chunk_strcpy(chk, "HTX");
if (item->mux->flags & MX_FL_CLEAN_ABRT)
chunk_appendf(chk, "%sCLEAN_ABRT", (b_data(chk) ? "|": ""));
if (item->mux->flags & MX_FL_HOL_RISK)
chunk_appendf(chk, "%sHOL_RISK", (b_data(chk) ? "|": ""));
if (item->mux->flags & MX_FL_NO_UPG)
chunk_appendf(chk, "%sNO_UPG", (b_data(chk) ? "|": ""));
fprintf(out, " %15s : mode=%-10s side=%-8s mux=%-8s flags=",
(proto.len ? proto.ptr : "<default>"), mode, side, item->mux->name);
fprintf(out, " %15s : mode=%-10s side=%-8s mux=%-8s flags=%.*s\n",
(proto.len ? proto.ptr : "<default>"), mode, side, item->mux->name,
(int)b_data(chk), b_orig(chk));
done = 0;
/* note: the block below could be simplied using macros but for only
* 4 flags it's not worth it.
*/
if (item->mux->flags & MX_FL_HTX)
done |= fprintf(out, "%sHTX", done ? "|" : "");
if (item->mux->flags & MX_FL_CLEAN_ABRT)
done |= fprintf(out, "%sCLEAN_ABRT", done ? "|" : "");
if (item->mux->flags & MX_FL_HOL_RISK)
done |= fprintf(out, "%sHOL_RISK", done ? "|" : "");
if (item->mux->flags & MX_FL_NO_UPG)
done |= fprintf(out, "%sNO_UPG", done ? "|" : "");
fprintf(out, "\n");
}
}