From 6b3f26f538f4f3d99733ca43cef1ecb942ca857c Mon Sep 17 00:00:00 2001 From: Guido Casati Date: Wed, 16 Oct 2024 16:31:03 +0200 Subject: [PATCH] Add define to printf and fflush in telnetsrv for real-time logs --- common/utils/telnetsrv/telnetsrv.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/common/utils/telnetsrv/telnetsrv.c b/common/utils/telnetsrv/telnetsrv.c index 43208748d0..9e708efc38 100644 --- a/common/utils/telnetsrv/telnetsrv.c +++ b/common/utils/telnetsrv/telnetsrv.c @@ -67,6 +67,12 @@ static telnetsrv_params_t telnetparams; #define TELNETSRV_OPTNAME_STATICMOD "staticmod" #define TELNETSRV_OPTNAME_SHRMOD "shrmod" +#define TELNET_LOG(fmt, ...) \ + do { \ + printf("[TELNETSRV] " fmt __VA_OPT__(, ) __VA_ARGS__); \ + fflush(stdout); \ + } while (0) + // clang-format off paramdef_t telnetoptions[] = { /*-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ @@ -653,10 +659,10 @@ void run_telnetsrv(void) { using_history(); int plen=sprintf(prompt,"%s_%s> ",TELNET_PROMPT_PREFIX,get_softmodem_function(NULL)); - printf("\nInitializing telnet server...\n"); + TELNET_LOG("\nInitializing telnet server...\n"); while( (telnetparams.new_socket = accept(sock, &cli_addr, &cli_len)) ) { - printf("[TELNETSRV] Telnet client connected....\n"); + TELNET_LOG("Telnet client connected....\n"); read_history(telnetparams.histfile); stifle_history(telnetparams.histsize); @@ -682,12 +688,12 @@ void run_telnetsrv(void) { } if(!readc) { - printf ("[TELNETSRV] Telnet Client disconnected.\n"); + TELNET_LOG("Telnet Client disconnected.\n"); break; } if (telnetparams.telnetdbg > 0) - printf("[TELNETSRV] Command received: readc %i filled %i \"%s\"\n", readc, filled,buf); + TELNET_LOG("Command received: readc %i filled %i \"%s\"\n", readc, filled, buf); if (buf[0] == '!') { if (buf[1] == '!') { @@ -720,7 +726,7 @@ void run_telnetsrv(void) { send(telnetparams.new_socket, prompt, strlen(prompt), MSG_NOSIGNAL); } else { - printf ("[TELNETSRV] Closing telnet connection...\n"); + TELNET_LOG("Closing telnet connection...\n"); break; } } @@ -728,7 +734,7 @@ void run_telnetsrv(void) { write_history(telnetparams.histfile); clear_history(); close(telnetparams.new_socket); - printf ("[TELNETSRV] Telnet server waitting for connection...\n"); + TELNET_LOG("Telnet server waiting for connection...\n"); } close(sock); @@ -927,7 +933,7 @@ int add_telnetcmd(char *modulename, telnetshell_vardef_t *var, telnetshell_cmdde cmd[j].qptr = afifo; } } - printf("[TELNETSRV] Telnet server: module %i = %s added to shell\n", i, telnetparams.CmdParsers[i].module); + TELNET_LOG("Telnet server: module %i = %s added to shell\n", i, telnetparams.CmdParsers[i].module); break; } }