aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prefix util-conf function with Config

Browse Source
pull/479/head
Eric Leblond 13 years ago
parent 7242cb30e7
commit 34abd818dd
14 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
src/alert-pcapinfo.c
Unescape Escape View File

@ -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);

2
src/alert-unified2-alert.c
Unescape Escape View File

@ -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);

2
src/counters.c
Unescape Escape View File

@ -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;

4
src/detect-engine-analyzer.c
Unescape Escape View File

@ -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) {

2
src/log-filestore.c
Unescape Escape View File

@ -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");

4
src/log-pcap.c
Unescape Escape View File

@ -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);

2
src/log-tlslog.c
Unescape Escape View File

@ -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");

8
src/suricata.c
Unescape Escape View File

@ -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);

6
src/util-conf.c
Unescape Escape View File

@ -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

6
src/util-conf.h
Unescape Escape View File

@ -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__ */

2
src/util-debug.c
Unescape Escape View File

@ -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))

2
src/util-logopenfile.c
Unescape Escape View File

@ -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);

2
src/util-profiling-rules.c
Unescape Escape View File

@ -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)) {

6
src/util-profiling.c
Unescape Escape View File

@ -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)) {

Write Preview
Loading…
Cancel
Save