Commit 6b3f26f5 authored by Guido Casati's avatar Guido Casati Committed by Robert Schmidt

Add define to printf and fflush in telnetsrv for real-time logs

parent 4f2fa739
...@@ -67,6 +67,12 @@ static telnetsrv_params_t telnetparams; ...@@ -67,6 +67,12 @@ static telnetsrv_params_t telnetparams;
#define TELNETSRV_OPTNAME_STATICMOD "staticmod" #define TELNETSRV_OPTNAME_STATICMOD "staticmod"
#define TELNETSRV_OPTNAME_SHRMOD "shrmod" #define TELNETSRV_OPTNAME_SHRMOD "shrmod"
#define TELNET_LOG(fmt, ...) \
do { \
printf("[TELNETSRV] " fmt __VA_OPT__(, ) __VA_ARGS__); \
fflush(stdout); \
} while (0)
// clang-format off // clang-format off
paramdef_t telnetoptions[] = { paramdef_t telnetoptions[] = {
/*-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
...@@ -653,10 +659,10 @@ void run_telnetsrv(void) { ...@@ -653,10 +659,10 @@ void run_telnetsrv(void) {
using_history(); using_history();
int plen=sprintf(prompt,"%s_%s> ",TELNET_PROMPT_PREFIX,get_softmodem_function(NULL)); 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)) ) { 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); read_history(telnetparams.histfile);
stifle_history(telnetparams.histsize); stifle_history(telnetparams.histsize);
...@@ -682,12 +688,12 @@ void run_telnetsrv(void) { ...@@ -682,12 +688,12 @@ void run_telnetsrv(void) {
} }
if(!readc) { if(!readc) {
printf ("[TELNETSRV] Telnet Client disconnected.\n"); TELNET_LOG("Telnet Client disconnected.\n");
break; break;
} }
if (telnetparams.telnetdbg > 0) 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[0] == '!') {
if (buf[1] == '!') { if (buf[1] == '!') {
...@@ -720,7 +726,7 @@ void run_telnetsrv(void) { ...@@ -720,7 +726,7 @@ void run_telnetsrv(void) {
send(telnetparams.new_socket, prompt, strlen(prompt), MSG_NOSIGNAL); send(telnetparams.new_socket, prompt, strlen(prompt), MSG_NOSIGNAL);
} else { } else {
printf ("[TELNETSRV] Closing telnet connection...\n"); TELNET_LOG("Closing telnet connection...\n");
break; break;
} }
} }
...@@ -728,7 +734,7 @@ void run_telnetsrv(void) { ...@@ -728,7 +734,7 @@ void run_telnetsrv(void) {
write_history(telnetparams.histfile); write_history(telnetparams.histfile);
clear_history(); clear_history();
close(telnetparams.new_socket); close(telnetparams.new_socket);
printf ("[TELNETSRV] Telnet server waitting for connection...\n"); TELNET_LOG("Telnet server waiting for connection...\n");
} }
close(sock); close(sock);
...@@ -927,7 +933,7 @@ int add_telnetcmd(char *modulename, telnetshell_vardef_t *var, telnetshell_cmdde ...@@ -927,7 +933,7 @@ int add_telnetcmd(char *modulename, telnetshell_vardef_t *var, telnetshell_cmdde
cmd[j].qptr = afifo; 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; break;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment