diff options
| author | Arturo Borrero Gonzalez <arturo@debian.org> | 2016-11-04 11:37:12 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-11-09 00:26:04 +0100 |
| commit | bee121ee9b749b47da5ad3f876772c8eae7c03d3 (patch) | |
| tree | 9e9b6671404e86b81d7eaf860a71eff118c23e79 /src/read_config_lex.l | |
| parent | ccb1c8b58f91b32dbb5dc8b9493d1a157946b7e7 (diff) | |
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 <arturo@debian.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/read_config_lex.l')
| -rw-r--r-- | src/read_config_lex.l | 13 |
1 files changed, 7 insertions, 6 deletions
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 <string.h> +#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; } |