From: Victor Julien Date: Thu, 18 Jun 2015 13:27:04 +0000 (+0200) Subject: fast log: clean up tests X-Git-Tag: suricata-3.0RC1~299 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0807c3df5b3655e80c741df7f23ff5784f2803d;p=thirdparty%2Fsuricata.git fast log: clean up tests --- diff --git a/src/alert-fastlog.c b/src/alert-fastlog.c index ce198658e6..9e47c73dd4 100644 --- a/src/alert-fastlog.c +++ b/src/alert-fastlog.c @@ -304,16 +304,14 @@ static int AlertFastLogTest01() de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any " "(msg:\"FastLog test\"; content:\"GET\"; " "Classtype:unknown; sid:1;)"); - result = (de_ctx->sig_list != NULL); SigGroupBuild(de_ctx); DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx); SigMatchSignatures(&th_v, de_ctx, det_ctx, p); - if (p->alerts.cnt == 1) + if (p->alerts.cnt == 1) { result = (strcmp(p->alerts.alerts[0].s->class_msg, "Unknown are we") == 0); - else - result = 0; + } SigGroupCleanup(de_ctx); SigCleanSignatures(de_ctx); @@ -351,25 +349,16 @@ static int AlertFastLogTest02() de_ctx->sig_list = SigInit(de_ctx, "alert tcp any any -> any any " "(msg:\"FastLog test\"; content:\"GET\"; " "Classtype:unknown; sid:1;)"); - result = (de_ctx->sig_list != NULL); - if (result == 0) - printf("sig parse failed: "); SigGroupBuild(de_ctx); DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx); SigMatchSignatures(&th_v, de_ctx, det_ctx, p); if (p->alerts.cnt == 1) { - result = (strcmp(p->alerts.alerts[0].s->class_msg, "Unknown Traffic") != 0); - if (result == 0) - printf("p->alerts.alerts[0].class_msg %s: ", p->alerts.alerts[0].s->class_msg); - result = (strcmp(p->alerts.alerts[0].s->class_msg, "Unknown are we") == 0); if (result == 0) printf("p->alerts.alerts[0].class_msg %s: ", p->alerts.alerts[0].s->class_msg); - } else { - result = 0; } SigGroupCleanup(de_ctx);