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

Make engine startup a little less verbose.

Browse Source
remotes/origin/master-1.0.x
Victor Julien 16 years ago
parent 5076452707
commit bcd0682150
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File

14
src/detect.c
Unescape Escape View File

@ -224,6 +224,9 @@ char *DetectLoadCompleteSigPath(char *sig_file)
int DetectLoadSigFile(DetectEngineCtx *de_ctx, char *sig_file, int *sigs_tot) { int DetectLoadSigFile(DetectEngineCtx *de_ctx, char *sig_file, int *sigs_tot) {
Signature *sig = NULL; Signature *sig = NULL;
int good = 0, bad = 0; int good = 0, bad = 0;
char line[8192] = "";
size_t offset = 0;
int lineno = 0, multiline = 0;
if (sig_file == NULL) { if (sig_file == NULL) {
SCLogError(SC_INVALID_ARGUMENT, "ERROR opening rule file null."); SCLogError(SC_INVALID_ARGUMENT, "ERROR opening rule file null.");
@ -236,9 +239,7 @@ int DetectLoadSigFile(DetectEngineCtx *de_ctx, char *sig_file, int *sigs_tot) {
" %s.", sig_file, strerror(errno)); " %s.", sig_file, strerror(errno));
return -1; return -1;
} }
char line[8192] = "";
size_t offset = 0;
int lineno = 0, multiline = 0;
while(fgets(line + offset, (int)sizeof(line) - offset, fp) != NULL) { while(fgets(line + offset, (int)sizeof(line) - offset, fp) != NULL) {
lineno++; lineno++;
size_t len = strlen(line); size_t len = strlen(line);
@ -262,7 +263,7 @@ int DetectLoadSigFile(DetectEngineCtx *de_ctx, char *sig_file, int *sigs_tot) {
/* Check if we have a trailing newline, and remove it */ /* Check if we have a trailing newline, and remove it */
len = strlen(line); len = strlen(line);
if (line[len - 1] == '\n') { if (len > 0 && line[len - 1] == '\n') {
line[len - 1] = '\0'; line[len - 1] = '\0';
} }
@ -275,7 +276,8 @@ int DetectLoadSigFile(DetectEngineCtx *de_ctx, char *sig_file, int *sigs_tot) {
SCLogDebug("signature %"PRIu32" loaded", sig->id); SCLogDebug("signature %"PRIu32" loaded", sig->id);
good++; good++;
} else { } else {
SCLogError(SC_ERR_INVALID_SIGNATURE, "Error parsing signature \"%s\" from file %s at line %"PRId32"", line, sig_file, lineno - multiline); SCLogError(SC_ERR_INVALID_SIGNATURE, "Error parsing signature \"%s\" from "
"file %s at line %"PRId32"", line, sig_file, lineno - multiline);
if (de_ctx->failure_fatal == 1) { if (de_ctx->failure_fatal == 1) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -345,7 +347,7 @@ int SigLoadSignatures (DetectEngineCtx *de_ctx, char *sig_file)
if (rule_files != NULL) { if (rule_files != NULL) {
TAILQ_FOREACH(file, &rule_files->head, next) { TAILQ_FOREACH(file, &rule_files->head, next) {
sfile = DetectLoadCompleteSigPath(file->val); sfile = DetectLoadCompleteSigPath(file->val);
SCLogInfo("Loading rule file: %s", sfile); SCLogDebug("Loading rule file: %s", sfile);
r = DetectLoadSigFile(de_ctx, sfile, &sigtotal); r = DetectLoadSigFile(de_ctx, sfile, &sigtotal);
cntf++; cntf++;

Write Preview
Loading…
Cancel
Save