]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
datasets: bugfix to load ip types from yaml 8852/head
authorScott Jordan <scottfgjordan@gmail.com>
Tue, 9 May 2023 20:38:55 +0000 (16:38 -0400)
committerScott Jordan <scottfgjordan@gmail.com>
Tue, 9 May 2023 21:05:47 +0000 (17:05 -0400)
src/datasets.c

index 5fc9797a35106346aeba377b23cc26926fea12a2..c4a1fcefdf27b6202990652d9a5c80df8c4014e3 100644 (file)
@@ -949,6 +949,28 @@ int DatasetsInit(void)
                 }
                 SCLogDebug("dataset %s: id %u type %s", set_name, dset->id, set_type->val);
                 dset->from_yaml = true;
+
+            } else if (strcmp(set_type->val, "ipv4") == 0) {
+                Dataset *dset = DatasetGet(set_name, DATASET_TYPE_IPV4, save, load,
+                        memcap > 0 ? memcap : default_memcap,
+                        hashsize > 0 ? hashsize : default_hashsize);
+                if (dset == NULL) {
+                    FatalErrorOnInit("failed to setup dataset for %s", set_name);
+                    continue;
+                }
+                SCLogDebug("dataset %s: id %u type %s", set_name, dset->id, set_type->val);
+                dset->from_yaml = true;
+
+            } else if (strcmp(set_type->val, "ip") == 0) {
+                Dataset *dset = DatasetGet(set_name, DATASET_TYPE_IPV6, save, load,
+                        memcap > 0 ? memcap : default_memcap,
+                        hashsize > 0 ? hashsize : default_hashsize);
+                if (dset == NULL) {
+                    FatalErrorOnInit("failed to setup dataset for %s", set_name);
+                    continue;
+                }
+                SCLogDebug("dataset %s: id %u type %s", set_name, dset->id, set_type->val);
+                dset->from_yaml = true;
             }
 
             list_pos++;