JSON output cleanup

diff --git a/src/alert-json.c b/src/alert-json.c
index 96875c9ba662725c6ac344105b8b6c7e07a49809..6ae68a56561c4ab77c2d70922a406ba2a0ca55f7 100644 (file)
--- a/src/alert-json.c
+++ b/src/alert-json.c
@@ -712,32 +712,16 @@ OutputCtx *AlertJsonInitCtx(ConfNode *conf)
                 }
                 if (strcmp(output->val, "http") == 0) {
                     SCLogDebug("Enabling HTTP output");
-                    /* Yuck.  there has to be a better way */
                     ConfNode *child = ConfNodeLookupChild(output, "http");
-                    if (child) {
-                        json_ctx->http_ctx = OutputHttpLogInit(child);
-                        if (json_ctx->http_ctx != NULL)
-                            outputFlags |= OUTPUT_HTTP;
-                    } else {
-                        outputFlags |= OUTPUT_HTTP;
-                    }
+                    json_ctx->http_ctx = OutputHttpLogInit(child);
+                    outputFlags |= OUTPUT_HTTP;
                     continue;
                 }
                 if (strcmp(output->val, "tls") == 0) {
                     SCLogDebug("Enabling TLS output");
                     ConfNode *child = ConfNodeLookupChild(output, "tls");
-#if 1
                     json_ctx->tls_ctx = OutputTlsLogInit(child);
                     outputFlags |= OUTPUT_TLS;
-#else
-                    if (child) {
-                        json_ctx->tls_ctx = OutputTlsLogInit(child);
-                        if (json_ctx->tls_ctx != NULL)
-                            outputFlags |= OUTPUT_TLS;
-                    } else {
-                        outputFlags |= OUTPUT_TLS;
-                    }
-#endif
                     continue;
                 }
             }
@@ -759,128 +743,6 @@ static void AlertJsonDeInitCtx(OutputCtx *output_ctx)
 
 #ifdef UNITTESTS
 
-int AlertBroccoliTest01()
-{
-    int result = 0;
-    uint8_t *buf = (uint8_t *) "GET /one/ HTTP/1.1\r\n"
-        "Host: one.example.org\r\n";
-
-    uint16_t buflen = strlen((char *)buf);
-    Packet *p = NULL;
-    ThreadVars th_v;
-    DetectEngineThreadCtx *det_ctx;
-
-    memset(&th_v, 0, sizeof(th_v));
-    p = UTHBuildPacket(buf, buflen, IPPROTO_TCP);
-
-    DetectEngineCtx *de_ctx = DetectEngineCtxInit();
-    if (de_ctx == NULL) {
-        return result;
-    }
-
-    de_ctx->flags |= DE_QUIET;
-
-    SCClassConfGenerateValidDummyClassConfigFD01();
-    SCClassConfLoadClassficationConfigFile(de_ctx);
-    SCClassConfDeleteDummyClassificationConfigFD();
-
-    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)
-        result = (strcmp(p->alerts.alerts[0].s->class_msg, "Unknown are we") == 0);
-    else
-        result = 0;
-
-#ifdef __SC_CUDA_SUPPORT__
-    B2gCudaKillDispatcherThreadRC();
-    if (SCCudaHlPushCudaContextFromModule("SC_RULES_CONTENT_B2G_CUDA") == -1) {
-        printf("Call to SCCudaHlPushCudaContextForModule() failed\n");
-        return 0;
-    }
-#endif
-
-    SigGroupCleanup(de_ctx);
-    SigCleanSignatures(de_ctx);
-    DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
-    DetectEngineCtxFree(de_ctx);
-
-    UTHFreePackets(&p, 1);
-    return result;
-}
-
-int AlertBroccoliTest02()
-{
-    int result = 0;
-    uint8_t *buf = (uint8_t *) "GET /one/ HTTP/1.1\r\n"
-        "Host: one.example.org\r\n";
-    uint16_t buflen = strlen((char *)buf);
-    Packet *p = NULL;
-    ThreadVars th_v;
-    DetectEngineThreadCtx *det_ctx;
-
-    memset(&th_v, 0, sizeof(th_v));
-
-    p = UTHBuildPacket(buf, buflen, IPPROTO_TCP);
-
-    DetectEngineCtx *de_ctx = DetectEngineCtxInit();
-    if (de_ctx == NULL) {
-        return result;
-    }
-
-    de_ctx->flags |= DE_QUIET;
-
-    SCClassConfGenerateValidDummyClassConfigFD01();
-    SCClassConfLoadClassficationConfigFile(de_ctx);
-    SCClassConfDeleteDummyClassificationConfigFD();
-
-    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;
-    }
-
-#ifdef __SC_CUDA_SUPPORT__
-    B2gCudaKillDispatcherThreadRC();
-    if (SCCudaHlPushCudaContextFromModule("SC_RULES_CONTENT_B2G_CUDA") == -1) {
-        printf("Call to SCCudaHlPushCudaContextForModule() failed\n");
-        return 0;
-    }
-#endif
-
-    SigGroupCleanup(de_ctx);
-    SigCleanSignatures(de_ctx);
-    DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
-    DetectEngineCtxFree(de_ctx);
-
-    UTHFreePackets(&p, 1);
-    return result;
-}
-
 #endif /* UNITTESTS */
 
 /**
@@ -891,18 +753,6 @@ void AlertJsonRegisterTests(void)
 
 #ifdef UNITTESTS
 
-#ifdef __SC_CUDA_SUPPORT__
-    UtRegisterTest("AlertFastLogCudaContextInit",
-            SCCudaHlTestEnvCudaContextInit, 1);
-#endif
-
-    UtRegisterTest("AlertBroccoliLogTest01", AlertBroccoliLogTest01, 1);
-    UtRegisterTest("AlertBroccoliLogTest02", AlertBroccoliLogTest02, 1);
-
-#ifdef __SC_CUDA_SUPPORT__
-    UtRegisterTest("AlertFastLogCudaContextDeInit",
-            SCCudaHlTestEnvCudaContextDeInit, 1);
-#endif
 
 #endif /* UNITTESTS */
 

diff --git a/src/output-httplog.c b/src/output-httplog.c
index e3d2b1b9cdd562555e33f7e50916712ef3a6eedf..c80ae3ae8c75f79ca0140c577f5cfe5bd05a5ba4 100644 (file)
--- a/src/output-httplog.c
+++ b/src/output-httplog.c
@@ -626,13 +626,15 @@ OutputCtx *OutputHttpLogInit(ConfNode *conf)
     if (unlikely(output_ctx == NULL))
         return NULL;
 
-    const char *extended = ConfNodeLookupChildValue(conf, "extended");
-
     http_ctx->flags = LOG_HTTP_DEFAULT;
 
-    if (extended != NULL) {
-        if (ConfValIsTrue(extended)) {
-            http_ctx->flags = LOG_HTTP_EXTENDED;
+    if (conf) {
+        const char *extended = ConfNodeLookupChildValue(conf, "extended");
+
+        if (extended != NULL) {
+            if (ConfValIsTrue(extended)) {
+                http_ctx->flags = LOG_HTTP_EXTENDED;
+            }
         }
     }
     output_ctx->data = http_ctx;

diff --git a/src/output-tlslog.c b/src/output-tlslog.c
index ead31a72c5218f32aa4b85cc34181d1898d3408f..b3fd3767702bb3b5f23e5bc4e3a19bdc7a6b7252 100644 (file)
--- a/src/output-tlslog.c
+++ b/src/output-tlslog.c
@@ -200,6 +200,7 @@ OutputCtx *OutputTlsLogInit(ConfNode *conf)
         return NULL;
 
     tls_ctx->flags = LOG_TLS_DEFAULT;
+
     if (conf) {
         const char *extended = ConfNodeLookupChildValue(conf, "extended");