From bee121ee9b749b47da5ad3f876772c8eae7c03d3 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Gonzalez Date: Fri, 4 Nov 2016 11:37:12 +0100 Subject: conntrackd: replace fprintf calls with dlog() Review fprintf() and perror() calls and replace them with proper logs, since it now supports being called anytime during runtime. While at it, several messages are fixed, deleting \n, adjusting coding style and some typos. Also, the 'conntrackd cannot start, please review your configuration' is printed before closing the log engine. Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/read_config_lex.l | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/read_config_lex.l') diff --git a/src/read_config_lex.l b/src/read_config_lex.l index 2404058..5f2de7d 100644 --- a/src/read_config_lex.l +++ b/src/read_config_lex.l @@ -21,6 +21,7 @@ #include +#include "conntrackd.h" #include "read_config_yy.h" %} @@ -158,14 +159,14 @@ notrack [N|n][O|o][T|t][R|r][A|a][C|c][K|k] {ip6} { yylval.string = strdup(yytext); return T_IP; } {path} { yylval.string = strdup(yytext); return T_PATH_VAL; } {alarm} { return T_ALARM; } -{persistent} { fprintf(stderr, "\nWARNING: Now `persistent' mode " - "is called `alarm'. Please, update " - "your conntrackd.conf file.\n"); +{persistent} { dlog(LOG_WARNING, "Now `persistent' mode " + "is called `alarm'. Please, update " + "your conntrackd.conf file."); return T_ALARM; } {ftfw} { return T_FTFW; } -{nack} { fprintf(stderr, "\nWARNING: Now `nack' mode " - "is called `ftfw'. Please, update " - "your conntrackd.conf file.\n"); +{nack} { dlog(LOG_WARNING, "Now `nack' mode " + "is called `ftfw'. Please, update " + "your conntrackd.conf file.\n"); return T_FTFW; } {notrack} { return T_NOTRACK; } {string} { yylval.string = strdup(yytext); return T_STRING; } -- cgit v1.2.3