commit 6a6536a: [Rework] Further conversion routines
Vsevolod Stakhov
vsevolod at rspamd.com
Thu Aug 17 11:49:09 UTC 2023
Author: Vsevolod Stakhov
Date: 2023-08-15 12:32:23 +0100
URL: https://github.com/rspamd/rspamd/commit/6a6536afd9c12b70c66bc9e53623eb6530b2ca73
[Rework] Further conversion routines
---
src/libmime/scan_result.c | 7 +-
src/libserver/cfg_file.h | 2 +-
src/libserver/cfg_rcl.cxx | 359 ++++++++++++++++++--------------------------
src/libserver/cfg_rcl.h | 7 +-
src/libserver/cfg_utils.cxx | 2 -
src/libutil/mem_pool.c | 8 +-
src/libutil/mem_pool.h | 4 +
src/lua/lua_task.c | 4 +-
8 files changed, 161 insertions(+), 232 deletions(-)
diff --git a/src/libmime/scan_result.c b/src/libmime/scan_result.c
index ca17ad24b..080fc0d51 100644
--- a/src/libmime/scan_result.c
+++ b/src/libmime/scan_result.c
@@ -75,7 +75,6 @@ rspamd_create_metric_result(struct rspamd_task *task,
const gchar *name, gint lua_sym_cbref)
{
struct rspamd_scan_result *metric_res;
- guint i;
metric_res = rspamd_mempool_alloc0(task->task_pool,
sizeof(struct rspamd_scan_result));
@@ -103,14 +102,10 @@ rspamd_create_metric_result(struct rspamd_task *task,
}
if (task->cfg) {
- struct rspamd_action *act, *tmp;
-
- int nact = rspamd_config_actions_size(task->cfg);
+ size_t nact = rspamd_config_actions_size(task->cfg);
metric_res->actions_config = rspamd_mempool_alloc0(task->task_pool,
sizeof(struct rspamd_action_config) * nact);
-
rspamd_config_actions_foreach_enumerate(task->cfg, rspamd_metric_actions_foreach_cb, metric_res);
-
metric_res->nactions = nact;
}
diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 8779f8edc..b20739806 100644
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -208,7 +208,7 @@ struct rspamd_worker_conf {
guint64 rlimit_maxcore; /**< maximum core file size */
GHashTable *params; /**< params for worker */
GQueue *active_workers; /**< linked list of spawned workers */
- gpointer *ctx; /**< worker's context */
+ gpointer ctx; /**< worker's context */
ucl_object_t *options; /**< other worker's options */
struct rspamd_worker_lua_script *scripts; /**< registered lua scripts */
gboolean enabled;
diff --git a/src/libserver/cfg_rcl.cxx b/src/libserver/cfg_rcl.cxx
index f2d77e544..2fa637889 100644
--- a/src/libserver/cfg_rcl.cxx
+++ b/src/libserver/cfg_rcl.cxx
@@ -29,6 +29,9 @@
#include "libmime/lang_detection.h"
#include <string>
+#include <filesystem>
+#include <memory>
+#include <algorithm>
#include "contrib/ankerl/unordered_dense.h"
#include "libutil/cxx/util.hxx"
@@ -44,11 +47,10 @@ struct rspamd_rcl_default_handler_data {
rspamd_rcl_default_handler_t handler;
};
-struct rspamd_rcl_sections_map {
- ankerl::unordered_dense::map<std::string, struct rspamd_rcl_section> sections;
-};
+struct rspamd_rcl_sections_map;
struct rspamd_rcl_section {
+ struct rspamd_rcl_sections_map *top;
const gchar *name; /**< name of section */
const gchar *key_attr;
const gchar *default_key;
@@ -63,26 +65,25 @@ struct rspamd_rcl_section {
ucl_object_t *doc_ref; /**< reference to the section's documentation */
};
-struct rspamd_worker_param_key {
- const gchar *name;
- gpointer ptr;
-};
-
struct rspamd_worker_param_parser {
rspamd_rcl_default_handler_t handler; /**< handler function */
struct rspamd_rcl_struct_parser parser; /**< parser attributes */
-
- struct rspamd_worker_param_key key;
};
struct rspamd_worker_cfg_parser {
- GHashTable *parsers; /**< parsers hash */
- gint type; /**< workers quark */
- gboolean (*def_obj_parser)(ucl_object_t *obj, gpointer ud); /**<
+ ankerl::unordered_dense::map<std::pair<std::string, gpointer>, rspamd_worker_param_parser> parsers; /**< parsers hash */
+ gint type; /**< workers quark */
+ gboolean (*def_obj_parser)(ucl_object_t *obj, gpointer ud); /**<
default object parser */
gpointer def_ud;
};
+struct rspamd_rcl_sections_map {
+ ankerl::unordered_dense::map<std::string, struct rspamd_rcl_section> sections;
+ ankerl::unordered_dense::map<int, struct rspamd_worker_cfg_parser> workers_parser;
+ ankerl::unordered_dense::set<std::string> lua_modules_seen;
+};
+
static bool rspamd_rcl_process_section(struct rspamd_config *cfg,
const struct rspamd_rcl_section &sec,
gpointer ptr, const ucl_object_t *obj, rspamd_mempool_t *pool,
@@ -446,8 +447,6 @@ rspamd_rcl_group_handler(rspamd_mempool_t *pool, const ucl_object_t *obj,
/* Handle symbols */
if (const auto *val = ucl_object_lookup(obj, "symbols"); val != nullptr && ucl_object_type(val) == UCL_OBJECT) {
- HASH_FIND_STR(section->subsections, "symbols", subsection);
-
auto subsection = rspamd::find_map(section->subsections, "symbols");
g_assert(subsection.has_value());
@@ -655,13 +654,12 @@ rspamd_rcl_actions_handler(rspamd_mempool_t *pool, const ucl_object_t *obj,
}
else if (type == UCL_OBJECT || type == UCL_FLOAT || type == UCL_INT) {
/* Exceptions */
- struct rspamd_rcl_default_handler_data *sec_cur, *sec_tmp;
- gboolean default_elt = FALSE;
+ auto default_elt = false;
- HASH_ITER(hh, section->default_parser, sec_cur, sec_tmp)
- {
- if (strcmp(ucl_object_key(cur), sec_cur->key) == 0) {
- default_elt = TRUE;
+ for (const auto &[name, def_elt]: section->default_parser) {
+ if (def_elt.key == ucl_object_key(cur)) {
+ default_elt = true;
+ break;
}
}
@@ -695,50 +693,42 @@ rspamd_rcl_worker_handler(rspamd_mempool_t *pool, const ucl_object_t *obj,
const gchar *key, gpointer ud,
struct rspamd_rcl_section *section, GError **err)
{
- const ucl_object_t *val, *cur, *cur_obj;
- ucl_object_t *robj;
- ucl_object_iter_t it = nullptr;
- const gchar *worker_type, *worker_bind;
- struct rspamd_config *cfg = ud;
- GQuark qtype;
- struct rspamd_worker_conf *wrk;
- struct rspamd_worker_cfg_parser *wparser;
- struct rspamd_worker_param_parser *whandler;
- struct rspamd_worker_param_key srch;
+ auto *cfg = static_cast<rspamd_config *>(ud);
g_assert(key != nullptr);
- worker_type = key;
+ const auto *worker_type = key;
- qtype = g_quark_try_string(worker_type);
- if (qtype != 0) {
- wrk = rspamd_config_new_worker(cfg, nullptr);
- wrk->options = ucl_object_copy(obj);
- wrk->worker = rspamd_get_worker_by_type(cfg, qtype);
-
- if (wrk->worker == nullptr) {
- g_set_error(err,
- CFG_RCL_ERROR,
- EINVAL,
- "unknown worker type: %s",
- worker_type);
- return FALSE;
- }
+ auto qtype = g_quark_try_string(worker_type);
+ if (qtype == 0) {
+ msg_err_config("unknown worker type: %s", worker_type);
+ return FALSE;
+ }
- wrk->type = qtype;
+ auto *wrk = rspamd_config_new_worker(cfg, nullptr);
+ wrk->options = ucl_object_copy(obj);
+ wrk->worker = rspamd_get_worker_by_type(cfg, qtype);
- if (wrk->worker->worker_init_func) {
- wrk->ctx = wrk->worker->worker_init_func(cfg);
- }
+ if (wrk->worker == nullptr) {
+ g_set_error(err,
+ CFG_RCL_ERROR,
+ EINVAL,
+ "unknown worker type: %s",
+ worker_type);
+ return FALSE;
}
- else {
- msg_err_config("unknown worker type: %s", worker_type);
- return TRUE;
+
+ wrk->type = qtype;
+
+ if (wrk->worker->worker_init_func) {
+ wrk->ctx = wrk->worker->worker_init_func(cfg);
}
- val = ucl_object_lookup_any(obj, "bind_socket", "listen", "bind", nullptr);
+ const auto *val = ucl_object_lookup_any(obj, "bind_socket", "listen", "bind", nullptr);
/* This name is more logical */
if (val != nullptr) {
- it = ucl_object_iterate_new(val);
+ auto it = ucl_object_iterate_new(val);
+ const ucl_object_t *cur;
+ const char *worker_bind = nullptr;
while ((cur = ucl_object_iterate_safe(it, true)) != nullptr) {
if (!ucl_object_tostring_safe(cur, &worker_bind)) {
@@ -758,49 +748,55 @@ rspamd_rcl_worker_handler(rspamd_mempool_t *pool, const ucl_object_t *obj,
ucl_object_iterate_free(it);
}
- if (!rspamd_rcl_section_parse_defaults(cfg, section, cfg->cfg_pool, obj,
+ if (!rspamd_rcl_section_parse_defaults(cfg, *section, cfg->cfg_pool, obj,
wrk, err)) {
return FALSE;
}
/* Parse other attributes */
- wparser = g_hash_table_lookup(cfg->wrk_parsers, &qtype);
+ auto maybe_wparser = rspamd::find_map(section->top->workers_parser, wrk->type);
- if (wparser != nullptr && obj->type == UCL_OBJECT) {
- it = ucl_object_iterate_new(obj);
+ if (maybe_wparser && obj->type == UCL_OBJECT) {
+ auto &wparser = maybe_wparser.value().get();
+ auto it = ucl_object_iterate_new(obj);
+ const ucl_object_t *cur;
while ((cur = ucl_object_iterate_full(it, UCL_ITERATE_EXPLICIT)) != nullptr) {
- srch.name = ucl_object_key(cur);
- srch.ptr = wrk->ctx; /* XXX: is it valid? Update! no, it is not valid, omfg... */
- whandler = g_hash_table_lookup(wparser->parsers, &srch);
+ auto srch = std::make_pair(ucl_object_key(cur), (gpointer) wrk->ctx);
+ auto maybe_specific = rspamd::find_map(wparser.parsers, srch);
- if (whandler != nullptr) {
+ if (maybe_specific) {
+ auto &whandler = maybe_specific.value().get();
+ const ucl_object_t *cur_obj;
LL_FOREACH(cur, cur_obj)
{
- if (!whandler->handler(cfg->cfg_pool,
- cur_obj,
- &whandler->parser,
- section,
- err)) {
+ if (!whandler.handler(cfg->cfg_pool,
+ cur_obj,
+ (void *) &whandler.parser,
+ section,
+ err)) {
ucl_object_iterate_free(it);
return FALSE;
}
- if (!(whandler->parser.flags & RSPAMD_CL_FLAG_MULTIPLE)) {
+ if (!(whandler.parser.flags & RSPAMD_CL_FLAG_MULTIPLE)) {
break;
}
}
}
+ else {
+ msg_warn_config("unknown worker attribute: %s; worker type: %s", ucl_object_key(cur), worker_type);
+ }
}
ucl_object_iterate_free(it);
- if (wparser->def_obj_parser != nullptr) {
- robj = ucl_object_ref(obj);
+ if (wparser.def_obj_parser != nullptr) {
+ auto *robj = ucl_object_ref(obj);
- if (!wparser->def_obj_parser(robj, wparser->def_ud)) {
+ if (!wparser.def_obj_parser(robj, wparser.def_ud)) {
ucl_object_unref(robj);
return FALSE;
@@ -820,38 +816,35 @@ rspamd_rcl_lua_handler(rspamd_mempool_t *pool, const ucl_object_t *obj,
const gchar *key, gpointer ud,
struct rspamd_rcl_section *section, GError **err)
{
- struct rspamd_config *cfg = ud;
- const gchar *lua_src = rspamd_mempool_strdup(pool,
- ucl_object_tostring(obj));
- gchar *cur_dir, *lua_dir, *lua_file;
- lua_State *L = cfg->lua_state;
- gint err_idx;
+ namespace fs = std::filesystem;
+ auto *cfg = static_cast<rspamd_config *>(ud);
+ auto lua_src = fs::path{ucl_object_tostring(obj)};
+ auto *L = RSPAMD_LUA_CFG_STATE(cfg);
+ std::error_code ec1, ec2;
- lua_dir = g_path_get_dirname(lua_src);
- lua_file = g_path_get_basename(lua_src);
+ auto lua_dir = fs::weakly_canonical(lua_src.parent_path(), ec1);
+ auto lua_file = fs::weakly_canonical(lua_src.filename(), ec2);
- if (lua_dir && lua_file) {
- cur_dir = g_malloc(PATH_MAX);
- if (getcwd(cur_dir, PATH_MAX) != nullptr && chdir(lua_dir) != -1) {
+ if (ec1 && ec2 && !lua_dir.empty() && !lua_file.empty()) {
+ auto cur_dir = fs::current_path(ec1);
+ if (ec1 && !cur_dir.empty() && ::chdir(lua_dir.c_str()) != -1) {
/* Push traceback function */
lua_pushcfunction(L, &rspamd_lua_traceback);
- err_idx = lua_gettop(L);
+ auto err_idx = lua_gettop(L);
/* Load file */
- if (luaL_loadfile(L, lua_file) != 0) {
+ if (luaL_loadfile(L, lua_file.c_str()) != 0) {
g_set_error(err,
CFG_RCL_ERROR,
EINVAL,
"cannot load lua file %s: %s",
- lua_src,
+ lua_src.c_str(),
lua_tostring(L, -1));
- if (chdir(cur_dir) == -1) {
- msg_err_config("cannot chdir to %s: %s", cur_dir,
+ if (::chdir(cur_dir.c_str()) == -1) {
+ msg_err_config("cannot chdir to %s: %s", cur_dir.c_str(),
strerror(errno));
}
- g_free(cur_dir);
- g_free(lua_dir);
- g_free(lua_file);
+
return FALSE;
}
@@ -861,19 +854,15 @@ rspamd_rcl_lua_handler(rspamd_mempool_t *pool, const ucl_object_t *obj,
CFG_RCL_ERROR,
EINVAL,
"cannot init lua file %s: %s",
- lua_src,
+ lua_src.c_str(),
lua_tostring(L, -1));
lua_settop(L, 0);
- if (chdir(cur_dir) == -1) {
- msg_err_config("cannot chdir to %s: %s", cur_dir,
+ if (::chdir(cur_dir.c_str()) == -1) {
+ msg_err_config("cannot chdir to %s: %s", cur_dir.c_str(),
strerror(errno));
}
- g_free(cur_dir);
- g_free(lua_file);
- g_free(lua_dir);
-
return FALSE;
}
@@ -881,27 +870,21 @@ rspamd_rcl_lua_handler(rspamd_mempool_t *pool, const ucl_object_t *obj,
}
else {
g_set_error(err, CFG_RCL_ERROR, ENOENT, "cannot chdir to %s: %s",
- lua_dir, strerror(errno));
- if (chdir(cur_dir) == -1) {
- msg_err_config("cannot chdir to %s: %s", cur_dir, strerror(errno));
+ lua_dir.c_str(), strerror(errno));
+ if (::chdir(cur_dir.c_str()) == -1) {
+ msg_err_config("cannot chdir to %s: %s", cur_dir.c_str(), strerror(errno));
}
- g_free(cur_dir);
- g_free(lua_dir);
- g_free(lua_file);
+
return FALSE;
}
- if (chdir(cur_dir) == -1) {
- msg_err_config("cannot chdir to %s: %s", cur_dir, strerror(errno));
+ if (::chdir(cur_dir.c_str()) == -1) {
+ msg_err_config("cannot chdir to %s: %s", cur_dir.c_str(), strerror(errno));
}
- g_free(cur_dir);
- g_free(lua_dir);
- g_free(lua_file);
}
else {
- g_free(lua_dir);
- g_free(lua_file);
+
g_set_error(err, CFG_RCL_ERROR, ENOENT, "cannot find to %s: %s",
- lua_src, strerror(errno));
+ lua_src.c_str(), strerror(errno));
return FALSE;
}
@@ -909,111 +892,27 @@ rspamd_rcl_lua_handler(rspamd_mempool_t *pool, const ucl_object_t *obj,
}
gboolean
-rspamd_rcl_add_lua_plugins_path(struct rspamd_config *cfg,
+rspamd_rcl_add_lua_plugins_path(struct rspamd_rcl_sections_map *sections,
+ struct rspamd_config *cfg,
const gchar *path,
gboolean main_path,
- GHashTable *modules_seen,
GError **err)
{
- struct stat st;
- struct script_module *cur_mod, *seen_mod;
- GPtrArray *paths;
- gchar *fname, *ext_pos;
- guint i;
-
- if (stat(path, &st) == -1) {
-
- if (errno != ENOENT || main_path) {
- g_set_error(err,
- CFG_RCL_ERROR,
- errno,
- "cannot stat path %s, %s",
- path,
- strerror(errno));
- return FALSE;
- }
- else {
- msg_debug_config("optional plugins path %s is absent, skip it", path);
-
- return TRUE;
- }
- }
-
- /* Handle directory */
- if (S_ISDIR(st.st_mode)) {
- paths = rspamd_glob_path(path, "*.lua", TRUE, err);
-
- if (!paths) {
- return FALSE;
- }
-
- PTR_ARRAY_FOREACH(paths, i, fname)
- {
- cur_mod =
- rspamd_mempool_alloc(cfg->cfg_pool,
- sizeof(struct script_module));
- cur_mod->path = rspamd_mempool_strdup(cfg->cfg_pool, fname);
- cur_mod->name = g_path_get_basename(cur_mod->path);
- rspamd_mempool_add_destructor(cfg->cfg_pool, g_free,
- cur_mod->name);
- ext_pos = strstr(cur_mod->name, ".lua");
-
- if (ext_pos != nullptr) {
- *ext_pos = '\0';
- }
-
- if (modules_seen) {
- seen_mod = g_hash_table_lookup(modules_seen, cur_mod->name);
-
- if (seen_mod != nullptr) {
- msg_info_config("already seen module %s at %s, skip %s",
- cur_mod->name, seen_mod->path, cur_mod->path);
- continue;
- }
- }
-
- if (cfg->script_modules == nullptr) {
- cfg->script_modules = g_list_append(cfg->script_modules,
- cur_mod);
- rspamd_mempool_add_destructor(cfg->cfg_pool,
- (rspamd_mempool_destruct_t) g_list_free,
- cfg->script_modules);
- }
- else {
- cfg->script_modules = g_list_append(cfg->script_modules,
- cur_mod);
- }
-
- if (modules_seen) {
- g_hash_table_insert(modules_seen, cur_mod->name, cur_mod);
- }
- }
-
- g_ptr_array_free(paths, TRUE);
- }
- else {
- /* Handle single file */
- cur_mod =
- rspamd_mempool_alloc(cfg->cfg_pool, sizeof(struct script_module));
- cur_mod->path = rspamd_mempool_strdup(cfg->cfg_pool, path);
- cur_mod->name = g_path_get_basename(cur_mod->path);
- rspamd_mempool_add_destructor(cfg->cfg_pool, g_free,
- cur_mod->name);
- ext_pos = strstr(cur_mod->name, ".lua");
-
- if (ext_pos != nullptr) {
- *ext_pos = '\0';
- }
-
- if (modules_seen) {
- seen_mod = g_hash_table_lookup(modules_seen, cur_mod->name);
-
- if (seen_mod != nullptr) {
- msg_info_config("already seen module %s at %s, skip %s",
- cur_mod->name, seen_mod->path, cur_mod->path);
-
- return TRUE;
- }
+ namespace fs = std::filesystem;
+ auto dir = fs::path{path};
+ std::error_code ec;
+
+ auto add_single_file = [&](const fs::path &fpath) -> bool {
+ auto fname = fpath.filename();
+ auto *cur_mod = rspamd_mempool_alloc_type(cfg->cfg_pool,
+ struct script_module);
+ cur_mod->path = rspamd_mempool_strdup(cfg->cfg_pool, fpath.c_str());
+ cur_mod->name = rspamd_mempool_strdup(cfg->cfg_pool, fname.c_str());
+
+ if (sections->lua_modules_seen.contains(fname.string())) {
+ msg_info_config("already seen module %s, skip %s",
+ cur_mod->name, cur_mod->path);
+ return false;
}
if (cfg->script_modules == nullptr) {
@@ -1028,8 +927,36 @@ rspamd_rcl_add_lua_plugins_path(struct rspamd_config *cfg,
cur_mod);
}
- if (modules_seen) {
- g_hash_table_insert(modules_seen, cur_mod->name, cur_mod);
+ sections->lua_modules_seen.insert(fname.string());
+
+ return true;
+ };
+
+ if (fs::is_regular_file(dir, ec) && dir.has_extension() && dir.extension() == ".lua") {
+ add_single_file(dir);
+ }
+ else if (!fs::is_directory(dir, ec)) {
+ if (!fs::exists(dir) && !main_path) {
+ msg_debug_config("optional plugins path %s is absent, skip it", path);
+
+ return TRUE;
+ }
+
+ g_set_error(err,
+ CFG_RCL_ERROR,
+ errno,
+ "invalid lua path spec %s, %s",
+ path,
+ ec.message().c_str());
+ return FALSE;
+ }
+ else {
+ /* Handle directory */
+ for (const auto &p: fs::recursive_directory_iterator(dir, ec)) {
+ auto fpath = std::string_view{p.path().string()};
+ if (p.is_regular_file() && fpath.ends_with(".lua")) {
+ add_single_file(p.path());
+ }
}
}
@@ -3443,7 +3370,7 @@ void rspamd_rcl_register_worker_option(struct rspamd_config *cfg,
}
-void rspamd_rcl_register_worker_parser(struct rspamd_config *cfg, gint type,
+void rspamd_rcl_register_worker_parser(struct rspamd_rcl_sections_map *sections, gint type,
gboolean (*func)(ucl_object_t *, gpointer), gpointer ud)
{
struct rspamd_worker_cfg_parser *nparser;
diff --git a/src/libserver/cfg_rcl.h b/src/libserver/cfg_rcl.h
index 67b516a19..264309376 100644
--- a/src/libserver/cfg_rcl.h
+++ b/src/libserver/cfg_rcl.h
@@ -359,7 +359,8 @@ void rspamd_rcl_register_worker_option(struct rspamd_config *cfg,
* @param func handler function
* @param ud userdata for handler function
*/
-void rspamd_rcl_register_worker_parser(struct rspamd_config *cfg, gint type,
+void rspamd_rcl_register_worker_parser(struct rspamd_rcl_sections_map *sections,
+ gint type,
gboolean (*func)(ucl_object_t *, gpointer), gpointer ud);
/**
@@ -425,10 +426,10 @@ ucl_object_t *rspamd_rcl_add_doc_by_example(struct rspamd_config *cfg,
* @param err
* @return
*/
-gboolean rspamd_rcl_add_lua_plugins_path(struct rspamd_config *cfg,
+gboolean rspamd_rcl_add_lua_plugins_path(struct rspamd_rcl_sections_map *sections,
+ struct rspamd_config *cfg,
const gchar *path,
gboolean main_path,
- GHashTable *modules_seen,
GError **err);
diff --git a/src/libserver/cfg_utils.cxx b/src/libserver/cfg_utils.cxx
index 5a9bd37ad..80a4c85fe 100644
--- a/src/libserver/cfg_utils.cxx
+++ b/src/libserver/cfg_utils.cxx
@@ -270,7 +270,6 @@ rspamd_config_new(enum rspamd_config_init_flags flags)
cfg->cfg_params = g_hash_table_new(rspamd_str_hash, rspamd_str_equal);
cfg->debug_modules = g_hash_table_new(rspamd_str_hash, rspamd_str_equal);
cfg->explicit_modules = g_hash_table_new(rspamd_str_hash, rspamd_str_equal);
- cfg->wrk_parsers = g_hash_table_new(g_int_hash, g_int_equal);
cfg->trusted_keys = g_hash_table_new(rspamd_str_hash,
rspamd_str_equal);
@@ -400,7 +399,6 @@ void rspamd_config_free(struct rspamd_config *cfg)
g_hash_table_unref(cfg->classifiers_symbols);
g_hash_table_unref(cfg->debug_modules);
g_hash_table_unref(cfg->explicit_modules);
- g_hash_table_unref(cfg->wrk_parsers);
g_hash_table_unref(cfg->trusted_keys);
rspamd_re_cache_unref(cfg->re_cache);
diff --git a/src/libutil/mem_pool.c b/src/libutil/mem_pool.c
index 12fb761b1..edfb3c016 100644
--- a/src/libutil/mem_pool.c
+++ b/src/libutil/mem_pool.c
@@ -605,14 +605,18 @@ rspamd_mempool_alloc_shared_(rspamd_mempool_t *pool, gsize size, gsize alignment
gchar *
rspamd_mempool_strdup_(rspamd_mempool_t *pool, const gchar *src, const gchar *loc)
{
- gsize len;
+ return rspamd_mempool_strdup_len_(pool, src, strlen(src), loc);
+}
+
+gchar *
+rspamd_mempool_strdup_len_(rspamd_mempool_t *pool, const gchar *src, gsize len, const gchar *loc)
+{
gchar *newstr;
if (src == NULL) {
return NULL;
}
- len = strlen(src);
newstr = rspamd_mempool_alloc_(pool, len + 1, MIN_MEM_ALIGNMENT, loc);
memcpy(newstr, src, len);
newstr[len] = '\0';
diff --git a/src/libutil/mem_pool.h b/src/libutil/mem_pool.h
index e3bb2b5cd..425a6b297 100644
--- a/src/libutil/mem_pool.h
+++ b/src/libutil/mem_pool.h
@@ -216,6 +216,10 @@ gchar *rspamd_mempool_strdup_(rspamd_mempool_t *pool, const gchar *src, const gc
RSPAMD_ATTR_ALLOC_ALIGN(MIN_MEM_ALIGNMENT);
#define rspamd_mempool_strdup(pool, src) \
rspamd_mempool_strdup_((pool), (src), (G_STRLOC))
+gchar *rspamd_mempool_strdup_len_(rspamd_mempool_t *pool, const gchar *src, gsize len, const gchar *loc)
+ RSPAMD_ATTR_ALLOC_ALIGN(MIN_MEM_ALIGNMENT);
+#define rspamd_mempool_strdup_len(pool, src, len) \
+ rspamd_mempool_strdup_len_((pool), (src), (len), (G_STRLOC))
struct f_str_tok;
diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index 8b909f6de..351dd9208 100644
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -2299,7 +2299,7 @@ lua_task_set_pre_result(lua_State *L)
}
}
- gint internal_type;
+ enum rspamd_action_type internal_type;
if (strcmp(act_str, "accept") == 0) {
/* Compatibility! */
@@ -5692,7 +5692,7 @@ lua_task_set_settings(lua_State *L)
const gchar *act_name = ucl_object_key(cur);
struct rspamd_action_config *action_config = NULL;
double act_score;
- int act_type;
+ enum rspamd_action_type act_type;
if (!rspamd_action_from_str(act_name, &act_type)) {
act_type = -1;
More information about the Commits
mailing list