Provide a u64 wrapper for ndpi_set_config() (#2292)

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni
2024-01-30 17:13:35 +01:00
committed by GitHub
parent d2f22d1308
commit 44c2e59661
4 changed files with 20 additions and 3 deletions
+1 -1
View File
@@ -41,7 +41,7 @@ void fuzz_init_detection_module(struct ndpi_detection_module_struct **ndpi_info_
if(*ndpi_info_mod == NULL) {
*ndpi_info_mod = ndpi_init_detection_module();
ndpi_set_config(*ndpi_info_mod, NULL, "log.level", "3");
ndpi_set_config_u64(*ndpi_info_mod, NULL, "log.level", 3);
ndpi_set_config(*ndpi_info_mod, "all", "log", "enable");
ndpi_load_domain_suffixes(*ndpi_info_mod, "public_suffix_list.dat");
+2 -2
View File
@@ -14,8 +14,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
NDPI_BITMASK_SET_ALL(all);
ndpi_set_protocol_detection_bitmask2(ndpi_struct, &all);
ndpi_set_config(ndpi_struct, NULL, "log.level", "3");
ndpi_set_config(ndpi_struct, "all", "log", "1");
ndpi_set_config_u64(ndpi_struct, NULL, "log.level", 3);
ndpi_set_config_u64(ndpi_struct, "all", "log", 1);
fd = buffer_to_file(data, size);
load_categories_file_fd(ndpi_struct, fd, NULL);
+2
View File
@@ -2190,6 +2190,8 @@ extern "C" {
ndpi_cfg_error ndpi_set_config(struct ndpi_detection_module_struct *ndpi_str,
const char *proto, const char *param, const char *value);
ndpi_cfg_error ndpi_set_config_u64(struct ndpi_detection_module_struct *ndpi_str,
const char *proto, const char *param, uint64_t value);
char *ndpi_get_config(struct ndpi_detection_module_struct *ndpi_str,
const char *proto, const char *param, char *buf, int buf_len);
char *ndpi_dump_config(struct ndpi_detection_module_struct *ndpi_str,
+15
View File
@@ -10825,6 +10825,21 @@ ndpi_cfg_error ndpi_set_config(struct ndpi_detection_module_struct *ndpi_str,
return NDPI_CFG_NOT_FOUND;
}
ndpi_cfg_error ndpi_set_config_u64(struct ndpi_detection_module_struct *ndpi_str,
const char *proto, const char *param, uint64_t value)
{
char value_str[21];
int value_len;
value_len = ndpi_snprintf(value_str, sizeof(value_str), "%llu", (unsigned long long int)value);
if (value_len <= 0 || value_len >= (int)sizeof(value_str))
{
return NDPI_CFG_INVALID_PARAM;
}
return ndpi_set_config(ndpi_str, proto, param, value_str);
}
char *ndpi_get_config(struct ndpi_detection_module_struct *ndpi_str,
const char *proto, const char *param, char *buf, int buf_len)
{