From aacb7066482ef7a2cb966bfe2f76c73df80b7466 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sun, 21 Oct 2018 09:42:22 +0100 Subject: [PATCH] [Fix] Use proper syntax for making DNS requests --- src/libserver/events.c | 7 ++++++- src/plugins/lua/asn.lua | 5 +++-- test/functional/lua/prepostfilters.lua | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/libserver/events.c b/src/libserver/events.c index c938945d2c..db17f87d66 100644 --- a/src/libserver/events.c +++ b/src/libserver/events.c @@ -172,7 +172,7 @@ rspamd_session_add_event (struct rspamd_async_session *session, new_event->user_data = user_data; new_event->subsystem = subsystem; - msg_debug_session ("added event: %p, pending %d events, " + msg_debug_session ("added event: %p, pending %d (+1) events, " "subsystem: %s", user_data, kh_size (session->events), @@ -222,6 +222,11 @@ rspamd_session_remove_event (struct rspamd_async_session *session, } found_ev = kh_key (session->events, k); + msg_debug_session ("removed event: %p, pending %d (-1) events, " + "subsystem: %s", + ud, + kh_size (session->events), + g_quark_to_string (found_ev->subsystem)); kh_del (rspamd_events_hash, session->events, k); /* Remove event */ diff --git a/src/plugins/lua/asn.lua b/src/plugins/lua/asn.lua index 86f1c42d22..2e5b8466ea 100644 --- a/src/plugins/lua/asn.lua +++ b/src/plugins/lua/asn.lua @@ -74,8 +74,9 @@ local function asn_check(task) asn_set(parts[1], parts[2], parts[3]) end - task:get_resolver():resolve_txt(task:get_session(), task:get_mempool(), - req_name, rspamd_dns_cb) + task:get_resolver():resolve_txt({task = task, + name = req_name, + callback = rspamd_dns_cb}) end local ip = task:get_from_ip() diff --git a/test/functional/lua/prepostfilters.lua b/test/functional/lua/prepostfilters.lua index 4f14d02223..c87c958490 100644 --- a/test/functional/lua/prepostfilters.lua +++ b/test/functional/lua/prepostfilters.lua @@ -16,7 +16,7 @@ for i = 1,10 do end if task:has_symbol('TEST_PRE') then local r = task:get_resolver() - r:resolve_a(task:get_session(), task:get_mempool(), 'example.com', dns_cb) + r:resolve_a({task = task, name = 'example.com', callback = dns_cb}) end end }) -- 2.47.3