diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-05-17 22:25:16 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-05-17 22:25:16 +0100 |
| commit | aa6b2535ee5ea500626e34771a5842dcc935533f (patch) | |
| tree | b8213e936a6ea5f1643c37783a27e5ff35bf066e | |
| parent | a8829f343f1a2b2f3432be5b2e92ab46dcfec995 (diff) | |
| download | rspamd-aa6b2535ee5ea500626e34771a5842dcc935533f.tar.gz rspamd-aa6b2535ee5ea500626e34771a5842dcc935533f.zip | |
[Minor] Use mempool tag instead of local one for milter
| -rw-r--r-- | src/libserver/milter.c | 13 | ||||
| -rw-r--r-- | src/libserver/milter_internal.h | 1 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/libserver/milter.c b/src/libserver/milter.c index 392d7198e..d739a9d5e 100644 --- a/src/libserver/milter.c +++ b/src/libserver/milter.c @@ -29,19 +29,19 @@ #include "utlist.h" #define msg_err_milter(...) rspamd_default_log_function(G_LOG_LEVEL_CRITICAL, \ - "milter", priv->uid, \ + "milter", priv->pool->tag.uid, \ G_STRFUNC, \ __VA_ARGS__) #define msg_warn_milter(...) rspamd_default_log_function (G_LOG_LEVEL_WARNING, \ - "milter", priv->uid, \ + "milter", priv->pool->tag.uid, \ G_STRFUNC, \ __VA_ARGS__) #define msg_info_milter(...) rspamd_default_log_function (G_LOG_LEVEL_INFO, \ - "milter", priv->uid, \ + "milter", priv->pool->tag.uid, \ G_STRFUNC, \ __VA_ARGS__) #define msg_debug_milter(...) rspamd_default_log_function (G_LOG_LEVEL_DEBUG, \ - "milter", priv->uid, \ + "milter", priv->pool->tag.uid, \ G_STRFUNC, \ __VA_ARGS__) @@ -953,7 +953,6 @@ rspamd_milter_handle_socket (gint fd, const struct timeval *tv, { struct rspamd_milter_session *session; struct rspamd_milter_private *priv; - guchar uidbuf[7]; g_assert (finish_cb != NULL); g_assert (error_cb != NULL); @@ -969,10 +968,6 @@ rspamd_milter_handle_socket (gint fd, const struct timeval *tv, priv->ev_base = ev_base; priv->state = RSPAMD_MILTER_READ_MORE; priv->pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), "milter"); - ottery_rand_bytes (uidbuf, sizeof (uidbuf)); - rspamd_encode_hex_buf (uidbuf, sizeof (uidbuf), priv->uid, - sizeof (priv->uid) - 1); - priv->uid[sizeof (priv->uid) - 1] = '\0'; if (tv) { memcpy (&priv->tv, tv, sizeof (*tv)); diff --git a/src/libserver/milter_internal.h b/src/libserver/milter_internal.h index 52dee2d7a..214add98c 100644 --- a/src/libserver/milter_internal.h +++ b/src/libserver/milter_internal.h @@ -62,7 +62,6 @@ struct rspamd_milter_private { rspamd_milter_finish fin_cb; rspamd_milter_error err_cb; void *ud; - guchar uid[15]; enum rspamd_milter_io_state state; int fd; }; |