datasets/context: rename the datajson files

They are is renamed to datasets-context-json.* so we see that
it is about context and not about a new datasets type.

diff --git a/src/Makefile.am b/src/Makefile.am
index 8365f98451e2d54958076d39508483bd571446a8..b43a7ccdfc728debb1105270b3f4668430dd1dca 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,7 +54,7 @@ noinst_HEADERS = \
        conf-yaml-loader.h \
        conf.h \
        counters.h \
-       datajson.h \
+       datasets-context-json.h \
        datasets-ipv4.h \
        datasets-ipv6.h \
        datasets-md5.h \
@@ -654,7 +654,7 @@ libsuricata_c_a_SOURCES = \
        conf-yaml-loader.c \
        conf.c \
        counters.c \
-       datajson.c \
+       datasets-context-json.c \
        datasets-ipv4.c \
        datasets-ipv6.c \
        datasets-md5.c \

diff --git a/src/datajson.c b/src/datasets-context-json.c
similarity index 99%
rename from src/datajson.c
rename to src/datasets-context-json.c
index 14e39b18382fc3475911f4be4ea44640fd11010f..11b0035ab60d585b568884ba9ddae07a405c8d10 100644 (file)
--- a/src/datajson.c
+++ b/src/datasets-context-json.c
@@ -25,7 +25,7 @@
 #include "suricata.h"
 #include "rust.h"
 #include "datasets.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 #include "datasets-ipv4.h"
 #include "datasets-ipv6.h"
 #include "datasets-md5.h"

diff --git a/src/datajson.h b/src/datasets-context-json.h
similarity index 100%
rename from src/datajson.h
rename to src/datasets-context-json.h

diff --git a/src/datasets-ipv4.h b/src/datasets-ipv4.h
index 9bb0c16641c507a265cc7f8bb9a44b62b93db618..d72380544f84c0f0192b6bbd0c9754c41487b410 100644 (file)
--- a/src/datasets-ipv4.h
+++ b/src/datasets-ipv4.h
@@ -25,7 +25,7 @@
 #define SURICATA_DATASETS_IPV4_H
 
 #include "datasets-reputation.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 
 typedef struct IPv4Type {
     uint8_t ipv4[4];

diff --git a/src/datasets-ipv6.c b/src/datasets-ipv6.c
index 2888b3482633066f23c833d844c35beea449b2ba..896dde5dad0bc24fa9ac5a75d57122403ee423a2 100644 (file)
--- a/src/datasets-ipv6.c
+++ b/src/datasets-ipv6.c
@@ -24,7 +24,7 @@
 #include "suricata-common.h"
 #include "conf.h"
 #include "datasets.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 #include "datasets-ipv6.h"
 #include "util-hash-lookup3.h"
 #include "util-thash.h"

diff --git a/src/datasets-ipv6.h b/src/datasets-ipv6.h
index 4251c77a282edde731bd9fa8e602598e27ec5ed2..05469355c3c2651c6be9e6ef38559506ff2586c1 100644 (file)
--- a/src/datasets-ipv6.h
+++ b/src/datasets-ipv6.h
@@ -25,7 +25,7 @@
 #define SURICATA_DATASETS_IPV6_H
 
 #include "datasets-reputation.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 
 typedef struct IPv6Type {
     uint8_t ipv6[16];

diff --git a/src/datasets-md5.c b/src/datasets-md5.c
index 92bcae34426c36215c8dd65586b8cf472bce792c..7beeeb2f9fb483d44d6a349a9383584cc339df85 100644 (file)
--- a/src/datasets-md5.c
+++ b/src/datasets-md5.c
@@ -24,7 +24,7 @@
 #include "suricata-common.h"
 #include "conf.h"
 #include "datasets.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 #include "datasets-md5.h"
 #include "util-hash-lookup3.h"
 

diff --git a/src/datasets-md5.h b/src/datasets-md5.h
index 5fdbd795c7d008eba985724d208ede87bd9bc00f..223edabd5686e5e231926d2ac0596d615e89302d 100644 (file)
--- a/src/datasets-md5.h
+++ b/src/datasets-md5.h
@@ -25,7 +25,7 @@
 #define SURICATA_DATASETS_MD5_H
 
 #include "datasets-reputation.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 
 typedef struct Md5Type {
     uint8_t md5[16];

diff --git a/src/datasets-sha256.c b/src/datasets-sha256.c
index b7fd48aed19c8e2a2c979623bfddf19d25632e4a..0f9dd8202d1f66c3587f0f9188372f6c32e6e00c 100644 (file)
--- a/src/datasets-sha256.c
+++ b/src/datasets-sha256.c
@@ -24,7 +24,7 @@
 #include "suricata-common.h"
 #include "conf.h"
 #include "datasets.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 #include "datasets-sha256.h"
 #include "util-hash-lookup3.h"
 #include "util-thash.h"

diff --git a/src/datasets-sha256.h b/src/datasets-sha256.h
index 16c5932b1885c2369e033d1169360d20593cc191..f23abfb5ac0274c61728fb1aab6343504b6b7be0 100644 (file)
--- a/src/datasets-sha256.h
+++ b/src/datasets-sha256.h
@@ -25,7 +25,7 @@
 #define SURICATA_DATASETS_SHA256_H
 
 #include "datasets-reputation.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 
 typedef struct Sha256Type {
     uint8_t sha256[32];

diff --git a/src/datasets-string.h b/src/datasets-string.h
index c3952d8ccf55fd15f2fa83d7273cc088ea486847..ca66a9944077da5be8dcd7e5d8a11fe70778a70b 100644 (file)
--- a/src/datasets-string.h
+++ b/src/datasets-string.h
@@ -25,7 +25,7 @@
 #define SURICATA_DATASETS_STRING_H
 
 #include "datasets-reputation.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 
 typedef struct StringType {
     uint32_t len;

diff --git a/src/datasets.c b/src/datasets.c
index 90ba78ee4c30036ec02c0bf25a1f394b1f20b3be..d14753811387fc6de2f3d193f2466f268ad87d79 100644 (file)
--- a/src/datasets.c
+++ b/src/datasets.c
@@ -32,7 +32,7 @@
 #include "datasets-md5.h"
 #include "datasets-sha256.h"
 #include "datasets-reputation.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 #include "util-conf.h"
 #include "util-mem.h"
 #include "util-thash.h"

diff --git a/src/detect-dataset.c b/src/detect-dataset.c
index 6f83d3732daad95bdcf76db0985353d5fc732f12..5c30db3c08347097aeb35e52b7a0a5254980426e 100644 (file)
--- a/src/detect-dataset.c
+++ b/src/detect-dataset.c
@@ -28,7 +28,7 @@
 #include "detect.h"
 #include "threads.h"
 #include "datasets.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 #include "detect-dataset.h"
 
 #include "detect-parse.h"

diff --git a/src/detect-dataset.h b/src/detect-dataset.h
index a4db07b219a6b561b9f2d128515b8ac851bda709..7c4abaf1c1e73c19e391f1cb4ee039e8a937eecd 100644 (file)
--- a/src/detect-dataset.h
+++ b/src/detect-dataset.h
@@ -25,7 +25,7 @@
 #define SURICATA_DETECT_DATASET_H
 
 #include "datasets.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 
 typedef struct DetectDatasetData_ {
     Dataset *set;

diff --git a/src/runmode-unix-socket.c b/src/runmode-unix-socket.c
index 8c28e4de1016aa1f709341010a23146c97a5f5ba..acdaf8577547f9e1a295b0bef8afbf88a43e8399 100644 (file)
--- a/src/runmode-unix-socket.c
+++ b/src/runmode-unix-socket.c
@@ -55,7 +55,7 @@
 #include "conf-yaml-loader.h"
 
 #include "datasets.h"
-#include "datajson.h"
+#include "datasets-context-json.h"
 #include "runmode-unix-socket.h"
 
 int unix_socket_mode_is_running = 0;