From 34abd818dd9bab9bfec335eef6e66a302e51ddcc Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Tue, 28 May 2013 11:23:55 +0200 Subject: [PATCH] Prefix util-conf function with Config --- src/alert-pcapinfo.c | 2 +- src/alert-unified2-alert.c | 2 +- src/counters.c | 2 +- src/detect-engine-analyzer.c | 4 ++-- src/log-filestore.c | 2 +- src/log-pcap.c | 4 ++-- src/log-tlslog.c | 2 +- src/suricata.c | 8 ++++---- src/util-conf.c | 6 +++--- src/util-conf.h | 6 +++--- src/util-debug.c | 2 +- src/util-logopenfile.c | 2 +- src/util-profiling-rules.c | 2 +- src/util-profiling.c | 6 +++--- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/alert-pcapinfo.c b/src/alert-pcapinfo.c index 3f7abc6512..8f2e79919f 100644 --- a/src/alert-pcapinfo.c +++ b/src/alert-pcapinfo.c @@ -214,7 +214,7 @@ static int AlertPcapInfoOpenFileCtx(LogFileCtx *file_ctx, const char *filename, char log_path[PATH_MAX]; char *log_dir; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); snprintf(log_path, PATH_MAX, "%s/%s", log_dir, filename); diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c index 3732661067..bb6ed925a5 100644 --- a/src/alert-unified2-alert.c +++ b/src/alert-unified2-alert.c @@ -1096,7 +1096,7 @@ int Unified2AlertOpenFileCtx(LogFileCtx *file_ctx, const char *prefix) /* create the filename to use */ char *log_dir; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); snprintf(filename, PATH_MAX, "%s/%s.%" PRIu32, log_dir, prefix, (uint32_t)ts.tv_sec); diff --git a/src/counters.c b/src/counters.c index 50296fa84c..a6d1b10072 100644 --- a/src/counters.c +++ b/src/counters.c @@ -277,7 +277,7 @@ static char *SCPerfGetLogFilename(ConfNode *stats) char *log_filename = NULL; const char* filename = NULL; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); if ( (log_filename = SCMalloc(PATH_MAX)) == NULL) { return NULL; diff --git a/src/detect-engine-analyzer.c b/src/detect-engine-analyzer.c index 431be57185..2c0d2ddf88 100644 --- a/src/detect-engine-analyzer.c +++ b/src/detect-engine-analyzer.c @@ -192,7 +192,7 @@ int SetupFPAnalyzer(void) return 0; char *log_dir; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); snprintf(log_path, sizeof(log_path), "%s/%s", log_dir, "rules_fast_pattern.txt"); @@ -242,7 +242,7 @@ int SetupRuleAnalyzer(void) } if (enabled) { char *log_dir; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); snprintf(log_path, sizeof(log_path), "%s/%s", log_dir, "rules_analysis.txt"); rule_engine_analysis_FD = fopen(log_path, "w"); if (rule_engine_analysis_FD == NULL) { diff --git a/src/log-filestore.c b/src/log-filestore.c index bba1c3820f..ba6e88932f 100644 --- a/src/log-filestore.c +++ b/src/log-filestore.c @@ -567,7 +567,7 @@ static OutputCtx *LogFilestoreLogInitCtx(ConfNode *conf) output_ctx->DeInit = LogFilestoreLogDeInitCtx; char *s_default_log_dir = NULL; - s_default_log_dir = GetLogDirectory(); + s_default_log_dir = ConfigGetLogDirectory(); const char *s_base_dir = NULL; s_base_dir = ConfNodeLookupChildValue(conf, "log-dir"); diff --git a/src/log-pcap.c b/src/log-pcap.c index f14af0dee8..9a35b02c55 100644 --- a/src/log-pcap.c +++ b/src/log-pcap.c @@ -463,7 +463,7 @@ OutputCtx *PcapLogInitCtx(ConfNode *conf) exit(EXIT_FAILURE); } else { char *log_dir = NULL; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); strlcpy(pl->dir, log_dir, sizeof(pl->dir)); @@ -475,7 +475,7 @@ OutputCtx *PcapLogInitCtx(ConfNode *conf) s_dir, sizeof(pl->dir)); } else { char *log_dir = NULL; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); snprintf(pl->dir, sizeof(pl->dir), "%s/%s", log_dir, s_dir); diff --git a/src/log-tlslog.c b/src/log-tlslog.c index 9059d18d9a..9b546df260 100644 --- a/src/log-tlslog.c +++ b/src/log-tlslog.c @@ -560,7 +560,7 @@ OutputCtx *LogTlsLogInitCtx(ConfNode *conf) } char *s_default_log_dir = NULL; - s_default_log_dir = GetLogDirectory(); + s_default_log_dir = ConfigGetLogDirectory(); const char *s_base_dir = NULL; s_base_dir = ConfNodeLookupChildValue(conf, "certs-log-dir"); diff --git a/src/suricata.c b/src/suricata.c index 225c88dee6..b0f7f83848 100644 --- a/src/suricata.c +++ b/src/suricata.c @@ -1356,11 +1356,11 @@ static TmEcode SuriParseCommandLine(int argc, char** argv, struct SuriInstance * } break; case 'l': - if (SetLogDirectory(optarg) != TM_ECODE_OK) { + if (ConfigSetLogDirectory(optarg) != TM_ECODE_OK) { SCLogError(SC_ERR_FATAL, "Failed to set log directory.\n"); return TM_ECODE_FAILED; } - if (CheckLogDirectory(optarg) != TM_ECODE_OK) { + if (ConfigCheckLogDirectory(optarg) != TM_ECODE_OK) { SCLogError(SC_ERR_LOGDIR_CMDLINE, "The logging directory \"%s\"" " supplied at the commandline (-l %s) doesn't " "exist. Shutting down the engine.", optarg, optarg); @@ -1818,9 +1818,9 @@ int main(int argc, char **argv) /* Check for the existance of the default logging directory which we pick * from suricata.yaml. If not found, shut the engine down */ - suri.log_dir = GetLogDirectory(); + suri.log_dir = ConfigGetLogDirectory(); - if (CheckLogDirectory(suri.log_dir) != TM_ECODE_OK) { + if (ConfigCheckLogDirectory(suri.log_dir) != TM_ECODE_OK) { SCLogError(SC_ERR_LOGDIR_CONFIG, "The logging directory \"%s\" " "supplied by %s (default-log-dir) doesn't exist. " "Shutting down the engine", suri.log_dir, conf_filename); diff --git a/src/util-conf.c b/src/util-conf.c index ba9dd3b2d9..e74b1ca18d 100644 --- a/src/util-conf.c +++ b/src/util-conf.c @@ -26,12 +26,12 @@ #include "config.h" #include "conf.h" -TmEcode SetLogDirectory(char *name) +TmEcode ConfigSetLogDirectory(char *name) { return ConfSet("default-log-dir", name, 0) ? TM_ECODE_OK : TM_ECODE_FAILED; } -char *GetLogDirectory() +char *ConfigGetLogDirectory() { char *log_dir = NULL; @@ -49,7 +49,7 @@ char *GetLogDirectory() return log_dir; } -TmEcode CheckLogDirectory(char *log_dir) +TmEcode ConfigCheckLogDirectory(char *log_dir) { SCEnter(); #ifdef OS_WIN32 diff --git a/src/util-conf.h b/src/util-conf.h index 0eb7954024..74d87e305a 100644 --- a/src/util-conf.h +++ b/src/util-conf.h @@ -25,8 +25,8 @@ #ifndef __UTIL_UTIL_CONF_H__ #define __UTIL_UTIL_CONF_H__ -TmEcode SetLogDirectory(char *name); -char *GetLogDirectory(); -TmEcode CheckLogDirectory(char *log_dir); +TmEcode ConfigSetLogDirectory(char *name); +char *ConfigGetLogDirectory(); +TmEcode ConfigCheckLogDirectory(char *log_dir); #endif /* __UTIL_UTIL_CONF_H__ */ diff --git a/src/util-debug.c b/src/util-debug.c index 6931b01e76..829647aa4f 100644 --- a/src/util-debug.c +++ b/src/util-debug.c @@ -1368,7 +1368,7 @@ static char *SCLogGetLogFilename(char *filearg) char *log_dir; char *log_filename; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); log_filename = SCMalloc(PATH_MAX); if (unlikely(log_filename == NULL)) diff --git a/src/util-logopenfile.c b/src/util-logopenfile.c index 3a94e2c7a3..e35f049421 100644 --- a/src/util-logopenfile.c +++ b/src/util-logopenfile.c @@ -130,7 +130,7 @@ SCConfLogOpenGeneric(ConfNode *conf, if (filename == NULL) filename = default_filename; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); if (PathIsAbsolute(filename)) { snprintf(log_path, PATH_MAX, "%s", filename); diff --git a/src/util-profiling-rules.c b/src/util-profiling-rules.c index 0480ac71b9..97cda892b2 100644 --- a/src/util-profiling-rules.c +++ b/src/util-profiling-rules.c @@ -163,7 +163,7 @@ void SCProfilingRulesGlobalInit(void) { if (filename != NULL) { char *log_dir; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); profiling_file_name = SCMalloc(PATH_MAX); if (unlikely(profiling_file_name == NULL)) { diff --git a/src/util-profiling.c b/src/util-profiling.c index acb28c0d51..ecfcb5b2f8 100644 --- a/src/util-profiling.c +++ b/src/util-profiling.c @@ -148,7 +148,7 @@ SCProfilingInit(void) if (filename != NULL) { char *log_dir; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); profiling_packets_file_name = SCMalloc(PATH_MAX); if (unlikely(profiling_packets_file_name == NULL)) { @@ -179,7 +179,7 @@ SCProfilingInit(void) } char *log_dir; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); profiling_csv_file_name = SCMalloc(PATH_MAX); if (unlikely(profiling_csv_file_name == NULL)) { @@ -225,7 +225,7 @@ SCProfilingInit(void) const char *filename = ConfNodeLookupChildValue(conf, "filename"); if (filename != NULL) { char *log_dir; - log_dir = GetLogDirectory(); + log_dir = ConfigGetLogDirectory(); profiling_locks_file_name = SCMalloc(PATH_MAX); if (unlikely(profiling_locks_file_name == NULL)) {