json output: don't set 'unknown' for missing data

Instead of setting 'unknown' or '<unknown>' just pass NULL to json_*
function, which results in omitting the data.

diff --git a/src/output-json-file.c b/src/output-json-file.c
index 822f8ce398cc4d8fb108df7598191544d8c085ce..9aa417122d56c84c20b57173e7c6bd4dbaaad242 100644 (file)
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -93,7 +93,7 @@ static json_t *LogFileMetaGetUri(const Packet *p, const File *ff) {
         }
     }
 
-    return json_string("<unknown>");
+    return NULL;
 }
 
 static json_t *LogFileMetaGetHost(const Packet *p, const File *ff) {
@@ -112,7 +112,7 @@ static json_t *LogFileMetaGetHost(const Packet *p, const File *ff) {
         }
     }
 
-    return json_string("<unknown>");
+    return NULL;
 }
 
 static json_t *LogFileMetaGetReferer(const Packet *p, const File *ff) {
@@ -136,7 +136,7 @@ static json_t *LogFileMetaGetReferer(const Packet *p, const File *ff) {
         }
     }
 
-    return json_string("<unknown>");
+    return NULL;
 }
 
 static json_t *LogFileMetaGetUserAgent(const Packet *p, const File *ff) {
@@ -160,7 +160,7 @@ static json_t *LogFileMetaGetUserAgent(const Packet *p, const File *ff) {
         }
     }
 
-    return json_string("<unknown>");
+    return NULL;
 }
 
 /**
@@ -201,8 +201,6 @@ static void FileWriteJsonRecord(JsonFileLogThread *aft, const Packet *p, const F
         SCFree(s);
     if (ff->magic)
         json_object_set_new(fjs, "magic", json_string((char *)ff->magic));
-    else
-        json_object_set_new(fjs, "magic", json_string("unknown"));
     switch (ff->state) {
         case FILE_STATE_CLOSED:
             json_object_set_new(fjs, "state", json_string("CLOSED"));

diff --git a/src/output-json-http.c b/src/output-json-http.c
index a9519b0e6e798206fc40e4aaa11bea498139fdd1..9ed0df1f0089d6dd2bc649c81d7de11bb81bfa7b 100644 (file)
--- a/src/output-json-http.c
+++ b/src/output-json-http.c
@@ -197,8 +197,6 @@ static void JsonHttpLogJSON(JsonHttpLogThread *aft, json_t *js, htp_tx_t *tx)
             json_object_set_new(hjs, "hostname", json_string(c));
             SCFree(c);
         }
-    } else {
-        json_object_set_new(hjs, "hostname", json_string("<unknown>"));
     }
 
     /* uri */
@@ -222,8 +220,6 @@ static void JsonHttpLogJSON(JsonHttpLogThread *aft, json_t *js, htp_tx_t *tx)
             json_object_set_new(hjs, "http_user_agent", json_string(c));
             SCFree(c);
         }
-    } else {
-        json_object_set_new(hjs, "http_user_agent", json_string("unknown>"));
     }
 
     /* x-forwarded-for */