mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: ssl/cli: make "show tlskeys" not use appctx->st2 anymore

Browse Source 
A new "state" enum was added to "show_keys_ctx" for this, and only 3
states are needed.
This commit is contained in:
Willy Tarreau 2022-05-05 09:03:44 +02:00
parent bd33864373
commit 9c5a38c1b8
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ssl_sock.c
View File

@ -192,6 +192,11 @@ struct show_keys_ctx {
int names_only; /* non-zero = only show file names */ int names_only; /* non-zero = only show file names */
int next_index; /* next index to be dumped */ int next_index; /* next index to be dumped */
int dump_entries; /* dump entries also */ int dump_entries; /* dump entries also */
enum {
SHOW_KEYS_INIT = 0,
SHOW_KEYS_LIST,
SHOW_KEYS_DONE,
} state; /* phase of the current dump */
}; };
/* ssl_sock_io_cb is exported to see it resolved in "show fd" */ /* ssl_sock_io_cb is exported to see it resolved in "show fd" */
@ -7221,11 +7226,11 @@ static int cli_io_handler_tlskeys_files(struct appctx *appctx)
struct show_keys_ctx *ctx = appctx->svcctx; struct show_keys_ctx *ctx = appctx->svcctx;
struct conn_stream *cs = appctx->owner; struct conn_stream *cs = appctx->owner;
switch (appctx->st2) { switch (ctx->state) {
case STAT_ST_INIT: case SHOW_KEYS_INIT:
/* Display the column headers. If the message cannot be sent, /* Display the column headers. If the message cannot be sent,
* quit the function with returning 0. The function is called * quit the function with returning 0. The function is called
* later and restart at the state "STAT_ST_INIT". * later and restart at the state "SHOW_KEYS_INIT".
*/ */
chunk_reset(&trash); chunk_reset(&trash);
@ -7247,10 +7252,10 @@ static int cli_io_handler_tlskeys_files(struct appctx *appctx)
if (ctx->next_ref == NULL) if (ctx->next_ref == NULL)
ctx->next_ref = tlskeys_list_get_next(&tlskeys_reference, &tlskeys_reference); ctx->next_ref = tlskeys_list_get_next(&tlskeys_reference, &tlskeys_reference);
appctx->st2 = STAT_ST_LIST; ctx->state = SHOW_KEYS_LIST;
/* fall through */ /* fall through */
case STAT_ST_LIST: case SHOW_KEYS_LIST:
while (ctx->next_ref) { while (ctx->next_ref) {
struct tls_keys_ref *ref = ctx->next_ref; struct tls_keys_ref *ref = ctx->next_ref;
@ -7317,12 +7322,10 @@ static int cli_io_handler_tlskeys_files(struct appctx *appctx)
/* get next list entry and check the end of the list */ /* get next list entry and check the end of the list */
ctx->next_ref = tlskeys_list_get_next(&ref->list, &tlskeys_reference); ctx->next_ref = tlskeys_list_get_next(&ref->list, &tlskeys_reference);
} }
ctx->state = SHOW_KEYS_DONE;
appctx->st2 = STAT_ST_FIN;
/* fall through */ /* fall through */
default: default:
appctx->st2 = STAT_ST_FIN;
return 1; return 1;
} }
return 0; return 0;