datajson: rename jsonline to ndjson

diff --git a/src/datajson.c b/src/datajson.c
index ba2be9f20b6e953f34085dd49337f44ef9a51dfd..14e39b18382fc3475911f4be4ea44640fd11010f 100644 (file)
--- a/src/datajson.c
+++ b/src/datajson.c
@@ -387,7 +387,7 @@ static int DatajsonLoadString(Dataset *set, char *json_key, char *array_key, Dat
     uint32_t cnt = 0;
     if (format == DATASET_FORMAT_JSON) {
         cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddStringElement);
-    } else if (format == DATASET_FORMAT_JSONLINE) {
+    } else if (format == DATASET_FORMAT_NDJSON) {
         cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddStringElement);
     }
     THashConsolidateMemcap(set->hash);
@@ -449,7 +449,7 @@ static int DatajsonLoadMd5(Dataset *set, char *json_key, char *array_key, Datase
     uint32_t cnt = 0;
     if (format == DATASET_FORMAT_JSON) {
         cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddMd5Element);
-    } else if (format == DATASET_FORMAT_JSONLINE) {
+    } else if (format == DATASET_FORMAT_NDJSON) {
         cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddMd5Element);
     }
     THashConsolidateMemcap(set->hash);
@@ -511,7 +511,7 @@ static int DatajsonLoadSha256(Dataset *set, char *json_key, char *array_key, Dat
     uint32_t cnt = 0;
     if (format == DATASET_FORMAT_JSON) {
         cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddSha256Element);
-    } else if (format == DATASET_FORMAT_JSONLINE) {
+    } else if (format == DATASET_FORMAT_NDJSON) {
         cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddSha256Element);
     }
     THashConsolidateMemcap(set->hash);
@@ -569,7 +569,7 @@ static int DatajsonLoadIPv4(Dataset *set, char *json_key, char *array_key, Datas
 
     if (format == DATASET_FORMAT_JSON) {
         cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddIpv4Element);
-    } else if (format == DATASET_FORMAT_JSONLINE) {
+    } else if (format == DATASET_FORMAT_NDJSON) {
         cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddIpv4Element);
     }
     THashConsolidateMemcap(set->hash);
@@ -628,7 +628,7 @@ static int DatajsonLoadIPv6(Dataset *set, char *json_key, char *array_key, Datas
 
     if (format == DATASET_FORMAT_JSON) {
         cnt = DatajsonLoadTypeFromJSON(set, json_key, array_key, DatajsonAddIPv6Element);
-    } else if (format == DATASET_FORMAT_JSONLINE) {
+    } else if (format == DATASET_FORMAT_NDJSON) {
         cnt = DatajsonLoadTypeFromJsonline(set, json_key, DatajsonAddIPv6Element);
     }
 

diff --git a/src/datasets.h b/src/datasets.h
index 66d3026f5b6b8d080e7f250e56451bdd27fe5380..e2a7a4725a142e27aeff850ae502133c37824e93 100644 (file)
--- a/src/datasets.h
+++ b/src/datasets.h
@@ -31,7 +31,7 @@ void DatasetPostReloadCleanup(void);
 typedef enum {
     DATASET_FORMAT_CSV = 0,
     DATASET_FORMAT_JSON,
-    DATASET_FORMAT_JSONLINE,
+    DATASET_FORMAT_NDJSON,
 } DatasetFormats;
 
 enum DatasetTypes {

diff --git a/src/detect-dataset.c b/src/detect-dataset.c
index 623b8c119de25e816805608166baec75ffd05e53..6f83d3732daad95bdcf76db0985353d5fc732f12 100644 (file)
--- a/src/detect-dataset.c
+++ b/src/detect-dataset.c
@@ -119,7 +119,7 @@ int DetectDatasetBufferMatch(DetectEngineThreadCtx *det_ctx,
     if (data == NULL || data_len == 0)
         return 0;
 
-    if ((sd->format == DATASET_FORMAT_JSON) || (sd->format == DATASET_FORMAT_JSONLINE)) {
+    if ((sd->format == DATASET_FORMAT_JSON) || (sd->format == DATASET_FORMAT_NDJSON)) {
         return DetectDatajsonBufferMatch(det_ctx, sd, data, data_len);
     }
 
@@ -268,8 +268,8 @@ static int DetectDatasetParse(const char *str, char *cmd, int cmd_len, char *nam
                 SCLogDebug("format %s", val);
                 if (strcmp(val, "csv") == 0) {
                     *format = DATASET_FORMAT_CSV;
-                } else if (strcmp(val, "jsonline") == 0) {
-                    *format = DATASET_FORMAT_JSONLINE;
+                } else if (strcmp(val, "ndjson") == 0) {
+                    *format = DATASET_FORMAT_NDJSON;
                 } else if (strcmp(val, "json") == 0) {
                     *format = DATASET_FORMAT_JSON;
                 } else {
@@ -483,13 +483,13 @@ int DetectDatasetSetup (DetectEngineCtx *de_ctx, Signature *s, const char *rawst
     } else if (strcmp(cmd_str,"isnotset") == 0) {
         cmd = DETECT_DATASET_CMD_ISNOTSET;
     } else if (strcmp(cmd_str,"set") == 0) {
-        if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_JSONLINE)) {
+        if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_NDJSON)) {
             SCLogError("json format is not supported for 'set' command");
             return -1;
         }
         cmd = DETECT_DATASET_CMD_SET;
     } else if (strcmp(cmd_str,"unset") == 0) {
-        if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_JSONLINE)) {
+        if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_NDJSON)) {
             SCLogError("json format is not supported for 'unset' command");
             return -1;
         }
@@ -499,7 +499,7 @@ int DetectDatasetSetup (DetectEngineCtx *de_ctx, Signature *s, const char *rawst
         return -1;
     }
 
-    if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_JSONLINE)) {
+    if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_NDJSON)) {
         if (strlen(save) != 0) {
             SCLogError("json format is not supported with 'save' or 'state' option");
             return -1;
@@ -535,9 +535,9 @@ int DetectDatasetSetup (DetectEngineCtx *de_ctx, Signature *s, const char *rawst
     if (format == DATASET_FORMAT_JSON) {
         set = DatajsonGet(name, type, load, memcap, hashsize, value_key, array_key,
                 DATASET_FORMAT_JSON, remove_key);
-    } else if (format == DATASET_FORMAT_JSONLINE) {
+    } else if (format == DATASET_FORMAT_NDJSON) {
         set = DatajsonGet(name, type, load, memcap, hashsize, value_key, NULL,
-                DATASET_FORMAT_JSONLINE, remove_key);
+                DATASET_FORMAT_NDJSON, remove_key);
     } else {
         set = DatasetGet(name, type, save, load, memcap, hashsize);
     }
@@ -553,7 +553,7 @@ int DetectDatasetSetup (DetectEngineCtx *de_ctx, Signature *s, const char *rawst
     cd->set = set;
     cd->cmd = cmd;
     cd->format = format;
-    if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_JSONLINE)) {
+    if ((format == DATASET_FORMAT_JSON) || (format == DATASET_FORMAT_NDJSON)) {
         strlcpy(cd->json_key, enrichment_key, sizeof(cd->json_key));
     }
     cd->id = s;