summaryrefslogtreecommitdiffstats
path: root/src/libserver
diff options
context:
space:
mode:
Diffstat (limited to 'src/libserver')
-rw-r--r--src/libserver/binlog.c42
-rw-r--r--src/libserver/buffer.c12
-rw-r--r--src/libserver/buffer.h4
-rw-r--r--src/libserver/cfg_utils.c4
-rw-r--r--src/libserver/dynamic_cfg.c2
-rw-r--r--src/libserver/statfile.c10
-rw-r--r--src/libserver/statfile_sync.c8
-rw-r--r--src/libserver/task.c4
-rw-r--r--src/libserver/url.c4
-rw-r--r--src/libserver/worker_util.c2
10 files changed, 46 insertions, 46 deletions
diff --git a/src/libserver/binlog.c b/src/libserver/binlog.c
index 6565d41e1..5eeae7ac2 100644
--- a/src/libserver/binlog.c
+++ b/src/libserver/binlog.c
@@ -45,7 +45,7 @@ binlog_write_header (struct rspamd_binlog *log)
};
header.create_time = time (NULL);
- lock_file (log->fd, FALSE);
+ rspamd_file_lock (log->fd, FALSE);
if (write (log->fd, &header, sizeof (struct rspamd_binlog_header)) == -1) {
msg_warn ("cannot write file %s, error %d, %s",
@@ -72,7 +72,7 @@ binlog_write_header (struct rspamd_binlog *log)
log->filename,
errno,
strerror (errno));
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
return FALSE;
}
@@ -86,11 +86,11 @@ binlog_write_header (struct rspamd_binlog *log)
log->filename,
errno,
strerror (errno));
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
return FALSE;
}
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
return TRUE;
}
@@ -278,12 +278,12 @@ write_binlog_tree (struct rspamd_binlog *log, GTree *nodes)
off_t seek;
struct rspamd_binlog_index *idx;
- lock_file (log->fd, FALSE);
+ rspamd_file_lock (log->fd, FALSE);
log->cur_seq++;
/* Seek to end of file */
if ((seek = lseek (log->fd, 0, SEEK_END)) == -1) {
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
msg_info ("cannot seek in file: %s, error: %s",
log->filename,
strerror (errno));
@@ -301,7 +301,7 @@ write_binlog_tree (struct rspamd_binlog *log, GTree *nodes)
idx->len = g_tree_nnodes (nodes) * sizeof (struct rspamd_binlog_element);
if (lseek (log->fd, log->metaindex->indexes[log->metaindex->last_index],
SEEK_SET) == -1) {
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
msg_info (
"cannot seek in file: %s, error: %s, seek: %L, op: insert index",
log->filename,
@@ -312,14 +312,14 @@ write_binlog_tree (struct rspamd_binlog *log, GTree *nodes)
log->cur_idx->last_index++;
if (write (log->fd, log->cur_idx,
sizeof (struct rspamd_index_block)) == -1) {
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
msg_info ("cannot write index to file: %s, error: %s",
log->filename,
strerror (errno));
return FALSE;
}
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
return TRUE;
}
@@ -329,12 +329,12 @@ create_new_metaindex_block (struct rspamd_binlog *log)
{
off_t seek;
- lock_file (log->fd, FALSE);
+ rspamd_file_lock (log->fd, FALSE);
log->metaindex->last_index++;
/* Seek to end of file */
if ((seek = lseek (log->fd, 0, SEEK_END)) == -1) {
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
msg_info ("cannot seek in file: %s, error: %s",
log->filename,
strerror (errno));
@@ -342,7 +342,7 @@ create_new_metaindex_block (struct rspamd_binlog *log)
}
if (write (log->fd, log->cur_idx,
sizeof (struct rspamd_index_block)) == -1) {
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
g_free (log->cur_idx);
msg_warn ("cannot write file %s, error %d, %s",
log->filename,
@@ -354,7 +354,7 @@ create_new_metaindex_block (struct rspamd_binlog *log)
log->metaindex->indexes[log->metaindex->last_index] = seek;
/* Overwrite all metaindexes */
if (lseek (log->fd, sizeof (struct rspamd_binlog_header), SEEK_SET) == -1) {
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
msg_info ("cannot seek in file: %s, error: %s",
log->filename,
strerror (errno));
@@ -362,14 +362,14 @@ create_new_metaindex_block (struct rspamd_binlog *log)
}
if (write (log->fd, log->metaindex,
sizeof (struct rspamd_binlog_metaindex)) == -1) {
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
msg_info ("cannot write metaindex in file: %s, error: %s",
log->filename,
strerror (errno));
return FALSE;
}
bzero (log->cur_idx, sizeof (struct rspamd_index_block));
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
return TRUE;
}
@@ -393,7 +393,7 @@ rotate_binlog (struct rspamd_binlog *log)
gchar *backup_name;
struct stat st;
- lock_file (log->fd, FALSE);
+ rspamd_file_lock (log->fd, FALSE);
/* Unmap mapped fragments */
if (log->metaindex) {
@@ -416,7 +416,7 @@ rotate_binlog (struct rspamd_binlog *log)
g_free (backup_name);
/* XXX: maybe race condition here */
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
close (log->fd);
return binlog_create (log);
@@ -519,12 +519,12 @@ binlog_sync (struct rspamd_binlog *log,
}
else if (metaindex_num != log->metaindex->last_index) {
/* Need to remap index block */
- lock_file (log->fd, FALSE);
+ rspamd_file_lock (log->fd, FALSE);
idxb = g_malloc (sizeof (struct rspamd_index_block));
idx_mapped = TRUE;
if (lseek (log->fd, log->metaindex->indexes[metaindex_num],
SEEK_SET) == -1) {
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
msg_warn ("cannot seek file %s, error %d, %s",
log->filename,
errno,
@@ -535,7 +535,7 @@ binlog_sync (struct rspamd_binlog *log,
if ((read (log->fd, idxb,
sizeof (struct rspamd_index_block))) !=
sizeof (struct rspamd_index_block)) {
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
msg_warn ("cannot read index from file %s, error %d, %s",
log->filename,
errno,
@@ -543,7 +543,7 @@ binlog_sync (struct rspamd_binlog *log,
res = FALSE;
goto end;
}
- unlock_file (log->fd, FALSE);
+ rspamd_file_unlock (log->fd, FALSE);
}
else {
idxb = log->cur_idx;
diff --git a/src/libserver/buffer.c b/src/libserver/buffer.c
index 5fbf91578..1cb09df46 100644
--- a/src/libserver/buffer.c
+++ b/src/libserver/buffer.c
@@ -314,7 +314,7 @@ read_buffers (gint fd, rspamd_io_dispatcher_t * d, gboolean skip_read)
{
ssize_t r;
GError *err = NULL;
- f_str_t res;
+ rspamd_fstring_t res;
gchar *c, *b;
gchar *end;
size_t len;
@@ -329,10 +329,10 @@ read_buffers (gint fd, rspamd_io_dispatcher_t * d, gboolean skip_read)
d->in_buf =
rspamd_mempool_alloc_tmp (d->pool, sizeof (rspamd_buffer_t));
if (d->policy == BUFFER_LINE || d->policy == BUFFER_ANY) {
- d->in_buf->data = fstralloc_tmp (d->pool, d->default_buf_size);
+ d->in_buf->data = rspamd_fstralloc_tmp (d->pool, d->default_buf_size);
}
else {
- d->in_buf->data = fstralloc_tmp (d->pool, d->nchars + 1);
+ d->in_buf->data = rspamd_fstralloc_tmp (d->pool, d->nchars + 1);
}
d->in_buf->pos = d->in_buf->data->begin;
}
@@ -656,7 +656,7 @@ rspamd_set_dispatcher_policy (rspamd_io_dispatcher_t * d,
enum io_policy policy,
size_t nchars)
{
- f_str_t *tmp;
+ rspamd_fstring_t *tmp;
gint t;
if (d->policy != policy || nchars != d->nchars) {
@@ -665,7 +665,7 @@ rspamd_set_dispatcher_policy (rspamd_io_dispatcher_t * d,
/* Resize input buffer if needed */
if (policy == BUFFER_CHARACTER && nchars != 0) {
if (d->in_buf && d->in_buf->data->size < nchars) {
- tmp = fstralloc_tmp (d->pool, d->nchars + 1);
+ tmp = rspamd_fstralloc_tmp (d->pool, d->nchars + 1);
memcpy (tmp->begin, d->in_buf->data->begin,
d->in_buf->data->len);
t = d->in_buf->pos - d->in_buf->data->begin;
@@ -676,7 +676,7 @@ rspamd_set_dispatcher_policy (rspamd_io_dispatcher_t * d,
}
else if (policy == BUFFER_LINE || policy == BUFFER_ANY) {
if (d->in_buf && d->nchars < d->default_buf_size) {
- tmp = fstralloc_tmp (d->pool, d->default_buf_size);
+ tmp = rspamd_fstralloc_tmp (d->pool, d->default_buf_size);
memcpy (tmp->begin, d->in_buf->data->begin,
d->in_buf->data->len);
t = d->in_buf->pos - d->in_buf->data->begin;
diff --git a/src/libserver/buffer.h b/src/libserver/buffer.h
index 6795ff41d..7fa799573 100644
--- a/src/libserver/buffer.h
+++ b/src/libserver/buffer.h
@@ -10,7 +10,7 @@
#include "mem_pool.h"
#include "fstring.h"
-typedef gboolean (*dispatcher_read_callback_t)(f_str_t *in, void *user_data);
+typedef gboolean (*dispatcher_read_callback_t)(rspamd_fstring_t *in, void *user_data);
typedef gboolean (*dispatcher_write_callback_t)(void *user_data);
typedef void (*dispatcher_err_callback_t)(GError *err, void *user_data);
@@ -27,7 +27,7 @@ enum io_policy {
* Buffer structure
*/
typedef struct rspamd_buffer_s {
- f_str_t *data; /**< buffer logic */
+ rspamd_fstring_t *data; /**< buffer logic */
gchar *pos; /**< current position */
} rspamd_buffer_t;
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index cd1aa0f0f..ded0e0eb9 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -145,7 +145,7 @@ rspamd_config_free (struct rspamd_config *cfg)
GList *cur;
struct rspamd_symbols_group *gr;
- remove_all_maps (cfg);
+ rspamd_map_remove_all (cfg);
ucl_obj_unref (cfg->rcl_obj);
g_hash_table_remove_all (cfg->metrics);
g_hash_table_unref (cfg->metrics);
@@ -568,7 +568,7 @@ rspamd_include_map_handler (const guchar *data, gsize len,
cbdata->cfg = cfg;
*pcbdata = cbdata;
- return add_map (cfg,
+ return rspamd_map_add (cfg,
map_line,
"ucl include",
rspamd_ucl_read_cb,
diff --git a/src/libserver/dynamic_cfg.c b/src/libserver/dynamic_cfg.c
index 01bfb83b5..c9e93a583 100644
--- a/src/libserver/dynamic_cfg.c
+++ b/src/libserver/dynamic_cfg.c
@@ -264,7 +264,7 @@ init_dynamic_config (struct rspamd_config *cfg)
jb->buf = NULL;
jb->cfg = cfg;
*pjb = jb;
- if (!add_map (cfg, cfg->dynamic_conf, "Dynamic configuration map",
+ if (!rspamd_map_add (cfg, cfg->dynamic_conf, "Dynamic configuration map",
json_config_read_cb, json_config_fin_cb, (void **)pjb)) {
msg_err ("cannot add map for configuration %s", cfg->dynamic_conf);
}
diff --git a/src/libserver/statfile.c b/src/libserver/statfile.c
index 031c45cf5..066671a95 100644
--- a/src/libserver/statfile.c
+++ b/src/libserver/statfile.c
@@ -86,7 +86,7 @@ convert_statfile_10 (stat_file_t * file)
g_free (backup_name);
/* XXX: maybe race condition here */
- unlock_file (file->fd, FALSE);
+ rspamd_file_unlock (file->fd, FALSE);
close (file->fd);
if ((file->fd =
open (file->filename, O_RDWR | O_TRUNC | O_CREAT,
@@ -97,7 +97,7 @@ convert_statfile_10 (stat_file_t * file)
strerror (errno));
return FALSE;
}
- lock_file (file->fd, FALSE);
+ rspamd_file_lock (file->fd, FALSE);
/* Now make new header and copy it to new file */
if (write (file->fd, &header, sizeof (header)) == -1) {
msg_info ("cannot write to file %s, error %d, %s",
@@ -411,15 +411,15 @@ statfile_pool_open (statfile_pool_t * pool,
}
}
/* Acquire lock for this operation */
- lock_file (new_file->fd, FALSE);
+ rspamd_file_lock (new_file->fd, FALSE);
if (statfile_pool_check (new_file) == -1) {
pool->opened--;
rspamd_mempool_unlock_mutex (pool->lock);
- unlock_file (new_file->fd, FALSE);
+ rspamd_file_unlock (new_file->fd, FALSE);
munmap (new_file->map, st.st_size);
return NULL;
}
- unlock_file (new_file->fd, FALSE);
+ rspamd_file_unlock (new_file->fd, FALSE);
new_file->open_time = time (NULL);
new_file->access_time = new_file->open_time;
diff --git a/src/libserver/statfile_sync.c b/src/libserver/statfile_sync.c
index 262176880..23ed96e12 100644
--- a/src/libserver/statfile_sync.c
+++ b/src/libserver/statfile_sync.c
@@ -85,7 +85,7 @@ log_next_sync (const gchar *symbol, time_t delay)
}
static gboolean
-parse_revision_line (struct rspamd_sync_ctx *ctx, f_str_t *in)
+parse_revision_line (struct rspamd_sync_ctx *ctx, rspamd_fstring_t *in)
{
guint i, state = 0;
gchar *p, *c, numbuf[sizeof("18446744073709551615")];
@@ -151,7 +151,7 @@ parse_revision_line (struct rspamd_sync_ctx *ctx, f_str_t *in)
}
static gboolean
-read_blocks (struct rspamd_sync_ctx *ctx, f_str_t *in)
+read_blocks (struct rspamd_sync_ctx *ctx, rspamd_fstring_t *in)
{
struct rspamd_binlog_element *elt;
guint i;
@@ -173,7 +173,7 @@ read_blocks (struct rspamd_sync_ctx *ctx, f_str_t *in)
}
static gboolean
-sync_read (f_str_t * in, void *arg)
+sync_read (rspamd_fstring_t * in, void *arg)
{
struct rspamd_sync_ctx *ctx = arg;
gchar buf[256];
@@ -290,7 +290,7 @@ sync_timer_callback (gint fd, short what, void *ud)
}
if ((ctx->sock =
- make_universal_socket (ctx->st->binlog->master_addr,
+ rspamd_socket (ctx->st->binlog->master_addr,
ctx->st->binlog->master_port,
SOCK_STREAM, TRUE, FALSE, TRUE)) == -1) {
msg_info ("cannot connect to %s", ctx->st->binlog->master_addr);
diff --git a/src/libserver/task.c b/src/libserver/task.c
index 2cec9cb3a..b6a910a91 100644
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -90,11 +90,11 @@ rspamd_task_new (struct rspamd_worker *worker)
rspamd_mempool_add_destructor (new_task->task_pool,
(rspamd_mempool_destruct_t) g_hash_table_unref,
new_task->raw_headers);
- new_task->emails = g_tree_new (compare_email_func);
+ new_task->emails = g_tree_new (rspamd_emails_cmp);
rspamd_mempool_add_destructor (new_task->task_pool,
(rspamd_mempool_destruct_t) g_tree_destroy,
new_task->emails);
- new_task->urls = g_tree_new (compare_url_func);
+ new_task->urls = g_tree_new (rspamd_urls_cmp);
rspamd_mempool_add_destructor (new_task->task_pool,
(rspamd_mempool_destruct_t) g_tree_destroy,
new_task->urls);
diff --git a/src/libserver/url.c b/src/libserver/url.c
index 389fae938..3e4ccc827 100644
--- a/src/libserver/url.c
+++ b/src/libserver/url.c
@@ -1413,8 +1413,8 @@ parse_uri (struct uri *uri, gchar *uristring, rspamd_mempool_t * pool)
uri->post = prefix_end + 1;
}
- convert_to_lowercase (uri->string, uri->protocollen);
- convert_to_lowercase (uri->host, uri->hostlen);
+ rspamd_str_lc (uri->string, uri->protocollen);
+ rspamd_str_lc (uri->host, uri->hostlen);
/* Decode %HH sequences in host name. This is important not so much
to support %HH sequences in host names (which other browser
don't), but to support binary characters (which will have been
diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index 17c5ba872..94ad5bd6c 100644
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -82,7 +82,7 @@ rspamd_worker_usr1_handler (gint fd, short what, void *arg)
struct rspamd_worker_signal_handler *sigh =
(struct rspamd_worker_signal_handler *)arg;
- reopen_log (sigh->worker->srv->logger);
+ rspamd_log_reopen (sigh->worker->srv->logger);
if (sigh->post_handler) {
sigh->post_handler (sigh->handler_data);
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-23 06:54:57 +0000