From: Eric Leblond Date: Fri, 2 May 2025 09:36:18 +0000 (+0200) Subject: datasets/context: rename the datajson files X-Git-Tag: suricata-8.0.0-rc1~51 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b766bd943864c2f4ad4781e975d9fdd6b8f9e21a;p=thirdparty%2Fsuricata.git 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 8365f98451..b43a7ccdfc 100755 --- 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 14e39b1838..11b0035ab6 100644 --- 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 9bb0c16641..d72380544f 100644 --- 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 2888b34826..896dde5dad 100644 --- 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 4251c77a28..05469355c3 100644 --- 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 92bcae3442..7beeeb2f9f 100644 --- 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 5fdbd795c7..223edabd56 100644 --- 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 b7fd48aed1..0f9dd8202d 100644 --- 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 16c5932b18..f23abfb5ac 100644 --- 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 c3952d8ccf..ca66a99440 100644 --- 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 90ba78ee4c..d147538113 100644 --- 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 6f83d3732d..5c30db3c08 100644 --- 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 a4db07b219..7c4abaf1c1 100644 --- 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 8c28e4de10..acdaf85775 100644 --- 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;