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

Clean up output.

Browse Source
remotes/origin/master-1.1.x
Victor Julien 15 years ago
parent 3fcfaef9f7
commit 3d60e9bfeb
5 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File

56
src/detect.c
Unescape Escape View File

@ -609,7 +609,7 @@ int SigLoadSignatures(DetectEngineCtx *de_ctx, char *sig_file)
if (r > 0) { if (r > 0) {
cnt += r; cnt += r;
} else if (r == 0){ } else if (r == 0){
SCLogError(SC_ERR_NO_RULES, "No rules loaded from %s", sfile); SCLogWarning(SC_ERR_NO_RULES, "No rules loaded from %s", sfile);
if (de_ctx->failure_fatal == 1) { if (de_ctx->failure_fatal == 1) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -643,11 +643,16 @@ int SigLoadSignatures(DetectEngineCtx *de_ctx, char *sig_file)
/* now we should have signatures to work with */ /* now we should have signatures to work with */
if (cnt <= 0) { if (cnt <= 0) {
SCLogError(SC_ERR_NO_RULES_LOADED, "%d rule files specified, but no rule was loaded at all!", cntf); if (cntf > 0) {
if (de_ctx->failure_fatal == 1) { SCLogError(SC_ERR_NO_RULES_LOADED, "%d rule files specified, but no rule was loaded at all!", cntf);
exit(EXIT_FAILURE); if (de_ctx->failure_fatal == 1) {
exit(EXIT_FAILURE);
}
ret = -1;
} else {
SCLogInfo("No signatures supplied.");
goto end;
} }
ret = -1;
} else { } else {
/* we report the total of files and rules successfully loaded and failed */ /* we report the total of files and rules successfully loaded and failed */
SCLogInfo("%" PRId32 " rule files processed. %" PRId32 " rules succesfully loaded, %" PRId32 " rules failed", cntf, cnt, sigtotal-cnt); SCLogInfo("%" PRId32 " rule files processed. %" PRId32 " rules succesfully loaded, %" PRId32 " rules failed", cntf, cnt, sigtotal-cnt);
@ -2096,7 +2101,7 @@ int SigAddressPrepareStage1(DetectEngineCtx *de_ctx) {
cnt_deonly); cnt_deonly);
SCLogInfo("building signature grouping structure, stage 1: " SCLogInfo("building signature grouping structure, stage 1: "
"adding signatures to signature source addresses... done"); "adding signatures to signature source addresses... complete");
} }
return 0; return 0;
@ -2576,11 +2581,10 @@ static void DetectEngineAddDecoderEventSig(DetectEngineCtx *de_ctx, Signature *s
*/ */
int SigAddressPrepareStage2(DetectEngineCtx *de_ctx) { int SigAddressPrepareStage2(DetectEngineCtx *de_ctx) {
Signature *tmp_s = NULL; Signature *tmp_s = NULL;
DetectAddress *gr = NULL;
uint32_t sigs = 0; uint32_t sigs = 0;
if (!(de_ctx->flags & DE_QUIET)) { if (!(de_ctx->flags & DE_QUIET)) {
SCLogInfo("building signature grouping structure, stage 2: " SCLogDebug("building signature grouping structure, stage 2: "
"building source address lists..."); "building source address lists...");
} }
@ -2648,9 +2652,10 @@ int SigAddressPrepareStage2(DetectEngineCtx *de_ctx) {
IPOnlyPrepare(de_ctx); IPOnlyPrepare(de_ctx);
IPOnlyPrint(de_ctx, &de_ctx->io_ctx); IPOnlyPrint(de_ctx, &de_ctx->io_ctx);
#ifdef DEBUG
DetectAddress *gr = NULL;
if (!(de_ctx->flags & DE_QUIET)) { if (!(de_ctx->flags & DE_QUIET)) {
SCLogInfo("%" PRIu32 " total signatures:", sigs); SCLogDebug("%" PRIu32 " total signatures:", sigs);
} }
/* TCP */ /* TCP */
@ -2671,7 +2676,7 @@ int SigAddressPrepareStage2(DetectEngineCtx *de_ctx) {
} }
} }
if (!(de_ctx->flags & DE_QUIET)) { if (!(de_ctx->flags & DE_QUIET)) {
SCLogInfo("TCP Source address blocks: any: %4u, ipv4: %4u, ipv6: %4u.", cnt_any, cnt_ipv4, cnt_ipv6); SCLogDebug("TCP Source address blocks: any: %4u, ipv4: %4u, ipv6: %4u.", cnt_any, cnt_ipv4, cnt_ipv6);
} }
cnt_any = 0, cnt_ipv4 = 0, cnt_ipv6 = 0; cnt_any = 0, cnt_ipv4 = 0, cnt_ipv6 = 0;
@ -2691,7 +2696,7 @@ int SigAddressPrepareStage2(DetectEngineCtx *de_ctx) {
} }
} }
if (!(de_ctx->flags & DE_QUIET)) { if (!(de_ctx->flags & DE_QUIET)) {
SCLogInfo("UDP Source address blocks: any: %4u, ipv4: %4u, ipv6: %4u.", cnt_any, cnt_ipv4, cnt_ipv6); SCLogDebug("UDP Source address blocks: any: %4u, ipv4: %4u, ipv6: %4u.", cnt_any, cnt_ipv4, cnt_ipv6);
} }
cnt_any = 0, cnt_ipv4 = 0, cnt_ipv6 = 0; cnt_any = 0, cnt_ipv4 = 0, cnt_ipv6 = 0;
@ -2711,11 +2716,11 @@ int SigAddressPrepareStage2(DetectEngineCtx *de_ctx) {
} }
} }
if (!(de_ctx->flags & DE_QUIET)) { if (!(de_ctx->flags & DE_QUIET)) {
SCLogInfo("ICMP Source address blocks: any: %4u, ipv4: %4u, ipv6: %4u.", cnt_any, cnt_ipv4, cnt_ipv6); SCLogDebug("ICMP Source address blocks: any: %4u, ipv4: %4u, ipv6: %4u.", cnt_any, cnt_ipv4, cnt_ipv6);
} }
#endif /* DEBUG */
if (!(de_ctx->flags & DE_QUIET)) { if (!(de_ctx->flags & DE_QUIET)) {
SCLogInfo("building signature grouping structure, stage 2: building source address list... done"); SCLogInfo("building signature grouping structure, stage 2: building source address list... complete");
} }
return 0; return 0;
@ -3293,7 +3298,7 @@ int SigAddressPrepareStage3(DetectEngineCtx *de_ctx) {
int r; int r;
if (!(de_ctx->flags & DE_QUIET)) { if (!(de_ctx->flags & DE_QUIET)) {
SCLogInfo("building signature grouping structure, stage 3: " SCLogDebug("building signature grouping structure, stage 3: "
"building destination address lists..."); "building destination address lists...");
} }
//DetectAddressPrintMemory(); //DetectAddressPrintMemory();
@ -3380,16 +3385,17 @@ int SigAddressPrepareStage3(DetectEngineCtx *de_ctx) {
de_ctx->mpm_unique ? de_ctx->mpm_memory_size / de_ctx->mpm_unique: 0); de_ctx->mpm_unique ? de_ctx->mpm_memory_size / de_ctx->mpm_unique: 0);
SCLogInfo("max sig id %" PRIu32 ", array size %" PRIu32 "", DetectEngineGetMaxSigId(de_ctx), DetectEngineGetMaxSigId(de_ctx) / 8 + 1); SCLogInfo("max sig id %" PRIu32 ", array size %" PRIu32 "", DetectEngineGetMaxSigId(de_ctx), DetectEngineGetMaxSigId(de_ctx) / 8 + 1);
SCLogInfo("signature group heads: unique %" PRIu32 ", copies %" PRIu32 ".", de_ctx->gh_unique, de_ctx->gh_reuse); SCLogDebug("signature group heads: unique %" PRIu32 ", copies %" PRIu32 ".", de_ctx->gh_unique, de_ctx->gh_reuse);
SCLogInfo("MPM instances: %" PRIu32 " unique, copies %" PRIu32 " (none %" PRIu32 ").", SCLogDebug("MPM instances: %" PRIu32 " unique, copies %" PRIu32 " (none %" PRIu32 ").",
de_ctx->mpm_unique, de_ctx->mpm_reuse, de_ctx->mpm_none); de_ctx->mpm_unique, de_ctx->mpm_reuse, de_ctx->mpm_none);
SCLogInfo("MPM (URI) instances: %" PRIu32 " unique, copies %" PRIu32 " (none %" PRIu32 ").", SCLogDebug("MPM (URI) instances: %" PRIu32 " unique, copies %" PRIu32 " (none %" PRIu32 ").",
de_ctx->mpm_uri_unique, de_ctx->mpm_uri_reuse, de_ctx->mpm_uri_none); de_ctx->mpm_uri_unique, de_ctx->mpm_uri_reuse, de_ctx->mpm_uri_none);
SCLogInfo("MPM max patcnt %" PRIu32 ", avg %" PRIu32 "", de_ctx->mpm_max_patcnt, de_ctx->mpm_unique?de_ctx->mpm_tot_patcnt/de_ctx->mpm_unique:0); SCLogDebug("MPM max patcnt %" PRIu32 ", avg %" PRIu32 "", de_ctx->mpm_max_patcnt, de_ctx->mpm_unique?de_ctx->mpm_tot_patcnt/de_ctx->mpm_unique:0);
if (de_ctx->mpm_uri_tot_patcnt && de_ctx->mpm_uri_unique) if (de_ctx->mpm_uri_tot_patcnt && de_ctx->mpm_uri_unique)
SCLogInfo("MPM (URI) max patcnt %" PRIu32 ", avg %" PRIu32 " (%" PRIu32 "/%" PRIu32 ")", de_ctx->mpm_uri_max_patcnt, de_ctx->mpm_uri_tot_patcnt/de_ctx->mpm_uri_unique, de_ctx->mpm_uri_tot_patcnt, de_ctx->mpm_uri_unique); SCLogDebug("MPM (URI) max patcnt %" PRIu32 ", avg %" PRIu32 " (%" PRIu32 "/%" PRIu32 ")", de_ctx->mpm_uri_max_patcnt, de_ctx->mpm_uri_tot_patcnt/de_ctx->mpm_uri_unique, de_ctx->mpm_uri_tot_patcnt, de_ctx->mpm_uri_unique);
SCLogInfo("port maxgroups: %" PRIu32 ", avg %" PRIu32 ", tot %" PRIu32 "", g_groupportlist_maxgroups, g_groupportlist_groupscnt ? g_groupportlist_totgroups/g_groupportlist_groupscnt : 0, g_groupportlist_totgroups); SCLogDebug("port maxgroups: %" PRIu32 ", avg %" PRIu32 ", tot %" PRIu32 "", g_groupportlist_maxgroups, g_groupportlist_groupscnt ? g_groupportlist_totgroups/g_groupportlist_groupscnt : 0, g_groupportlist_totgroups);
SCLogInfo("building signature grouping structure, stage 3: building destination address lists... done");
SCLogInfo("building signature grouping structure, stage 3: building destination address lists... complete");
} }
return 0; return 0;
error: error:
@ -3401,7 +3407,7 @@ int SigAddressCleanupStage1(DetectEngineCtx *de_ctx) {
BUG_ON(de_ctx == NULL); BUG_ON(de_ctx == NULL);
if (!(de_ctx->flags & DE_QUIET)) { if (!(de_ctx->flags & DE_QUIET)) {
SCLogInfo("cleaning up signature grouping structure..."); SCLogDebug("cleaning up signature grouping structure...");
} }
int f, proto; int f, proto;
@ -3416,7 +3422,7 @@ int SigAddressCleanupStage1(DetectEngineCtx *de_ctx) {
IPOnlyDeinit(de_ctx, &de_ctx->io_ctx); IPOnlyDeinit(de_ctx, &de_ctx->io_ctx);
if (!(de_ctx->flags & DE_QUIET)) { if (!(de_ctx->flags & DE_QUIET)) {
SCLogInfo("cleaning up signature grouping structure... done"); SCLogInfo("cleaning up signature grouping structure... complete");
} }
return 0; return 0;
} }

2
src/output.c
Unescape Escape View File

@ -57,7 +57,7 @@ OutputRegisterModule(char *name, char *conf_name,
module->InitFunc = InitFunc; module->InitFunc = InitFunc;
TAILQ_INSERT_TAIL(&output_modules, module, entries); TAILQ_INSERT_TAIL(&output_modules, module, entries);
SCLogInfo("Output module \"%s\" registered.", name); SCLogDebug("Output module \"%s\" registered.", name);
} }
/** /**

3
src/runmodes.c
Unescape Escape View File

@ -91,6 +91,9 @@ void RunModeInitializeOutputs(void)
TAILQ_FOREACH(output, &outputs->head, next) { TAILQ_FOREACH(output, &outputs->head, next) {
if (strcmp(output->val, "stats") == 0)
continue;
OutputModule *module = OutputGetModuleByConfName(output->val); OutputModule *module = OutputGetModuleByConfName(output->val);
if (module == NULL) { if (module == NULL) {
SCLogWarning(SC_ERR_INVALID_ARGUMENT, SCLogWarning(SC_ERR_INVALID_ARGUMENT,

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

@ -164,11 +164,11 @@ void UtilCpuPrintSummary() {
uint16_t cpus_conf = UtilCpuGetNumProcessorsConfigured(); uint16_t cpus_conf = UtilCpuGetNumProcessorsConfigured();
uint16_t cpus_online = UtilCpuGetNumProcessorsOnline(); uint16_t cpus_online = UtilCpuGetNumProcessorsOnline();
SCLogInfo("CPUs Summary: "); SCLogDebug("CPUs Summary: ");
if (cpus_conf > 0) if (cpus_conf > 0)
SCLogInfo("CPUs online: %"PRIu16, cpus_conf); SCLogDebug("CPUs configured: %"PRIu16, cpus_conf);
if (cpus_online > 0) if (cpus_online > 0)
SCLogInfo("CPUs configured %"PRIu16, cpus_online); SCLogInfo("CPUs/cores online: %"PRIu16, cpus_online);
if (cpus_online == 0 && cpus_conf == 0) if (cpus_online == 0 && cpus_conf == 0)
SCLogInfo("Couldn't retireve any information of CPU's, please, send your operating " SCLogInfo("Couldn't retireve any information of CPU's, please, send your operating "
"system info and check util-cpu.{c,h}"); "system info and check util-cpu.{c,h}");

2
src/util-threshold-config.c
Unescape Escape View File

@ -101,7 +101,7 @@ int SCThresholdConfInitContext(DetectEngineCtx *de_ctx, FILE *utfd)
if (fd == NULL) { if (fd == NULL) {
filename = SCThresholdConfGetConfFilename(); filename = SCThresholdConfGetConfFilename();
if ( (fd = fopen(filename, "r")) == NULL) { if ( (fd = fopen(filename, "r")) == NULL) {
SCLogError(SC_ERR_FOPEN, "Error opening file: \"%s\": %s", filename, strerror(errno)); SCLogWarning(SC_ERR_FOPEN, "Error opening file: \"%s\": %s", filename, strerror(errno));
goto error; goto error;
} }
} }

Write Preview
Loading…
Cancel
Save