[Minor] Better naming: renamed old module - lua_dns -> lua_dns_resolver

diff --git a/src/lua/CMakeLists.txt b/src/lua/CMakeLists.txt
index cb2bd223213390b1dd0d891ea7af3751f168814f..98a8203c314467a30a73bc3b607cd8eda97fab19 100644 (file)
--- a/src/lua/CMakeLists.txt
+++ b/src/lua/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(LUASRC                      ${CMAKE_CURRENT_SOURCE_DIR}/lua_common.c
                                          ${CMAKE_CURRENT_SOURCE_DIR}/lua_redis.c
                                          ${CMAKE_CURRENT_SOURCE_DIR}/lua_upstream.c
                                          ${CMAKE_CURRENT_SOURCE_DIR}/lua_mempool.c
-                                         ${CMAKE_CURRENT_SOURCE_DIR}/lua_dns.c
+                                         ${CMAKE_CURRENT_SOURCE_DIR}/lua_dns_resolver.c
                                          ${CMAKE_CURRENT_SOURCE_DIR}/lua_rsa.c
                                          ${CMAKE_CURRENT_SOURCE_DIR}/lua_ip.c
                                          ${CMAKE_CURRENT_SOURCE_DIR}/lua_expression.c

diff --git a/src/lua/lua_dns.c b/src/lua/lua_dns_resolver.c
similarity index 96%
rename from src/lua/lua_dns.c
rename to src/lua/lua_dns_resolver.c
index 5c056b71f5aec19798765993de3307ee182b9528..dc475f2aeee2cc35c5c467cfc9fc31304072acf7 100644 (file)
--- a/src/lua/lua_dns.c
+++ b/src/lua/lua_dns_resolver.c
@@ -135,7 +135,7 @@ lua_dns_get_type (lua_State *L, int argno)
 }
 
 static void
-lua_dns_callback (struct rdns_reply *reply, gpointer arg)
+lua_dns_resolver_callback (struct rdns_reply *reply, gpointer arg)
 {
        struct lua_dns_cbdata *cd = arg;
        struct rspamd_dns_resolver **presolver;
@@ -379,13 +379,13 @@ lua_dns_resolver_resolve_common (lua_State *L,
                }
 
                if (task == NULL) {
-                       if (make_dns_request (resolver,
-                                       session,
-                                       pool,
-                                       lua_dns_callback,
-                                       cbdata,
-                                       type,
-                                       to_resolve)) {
+                       if ( make_dns_request (resolver,
+                                                                  session,
+                                                                  pool,
+                                                                  lua_dns_resolver_callback,
+                                                                  cbdata,
+                                                                  type,
+                                                                  to_resolve)) {
 
                                lua_pushboolean (L, TRUE);
 
@@ -404,17 +404,17 @@ lua_dns_resolver_resolve_common (lua_State *L,
 
                        if (forced) {
                                ret = make_dns_request_task_forced (task,
-                                               lua_dns_callback,
-                                               cbdata,
-                                               type,
-                                               to_resolve);
+                                                                                                       lua_dns_resolver_callback,
+                                                                                                       cbdata,
+                                                                                                       type,
+                                                                                                       to_resolve);
                        }
                        else {
                                ret = make_dns_request_task (task,
-                                               lua_dns_callback,
-                                               cbdata,
-                                               type,
-                                               to_resolve);
+                                                                                        lua_dns_resolver_callback,
+                                                                                        cbdata,
+                                                                                        type,
+                                                                                        to_resolve);
                        }
 
                        if (ret) {
@@ -592,7 +592,7 @@ lua_dns_resolver_resolve (lua_State *L)
 }
 
 static gint
-lua_load_dns (lua_State * L)
+lua_load_dns_resolver (lua_State *L)
 {
        lua_newtable (L);
        luaL_register (L, NULL, dns_resolverlib_f);
@@ -625,7 +625,7 @@ luaopen_dns_resolver (lua_State * L)
        }
 
        luaL_register (L, NULL, dns_resolverlib_m);
-       rspamd_lua_add_preload (L, "rspamd_resolver", lua_load_dns);
+       rspamd_lua_add_preload (L, "rspamd_resolver", lua_load_dns_resolver);
 
        lua_pop (L, 1);                      /* remove metatable from stack */
 }

diff --git a/src/lua/lua_dns.h b/src/lua/lua_dns_resolver.h
similarity index 100%
rename from src/lua/lua_dns.h
rename to src/lua/lua_dns_resolver.h

diff --git a/src/lua/lua_rspamd_dns.c b/src/lua/lua_rspamd_dns.c
index 9c3764c06290c36b618a1eb272ddb40115f318ec..3fee5bb7f84fe8d8dcdcca90fcb6aea6ad35a574 100644 (file)
--- a/src/lua/lua_rspamd_dns.c
+++ b/src/lua/lua_rspamd_dns.c
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 #include "lua_common.h"
-#include "lua_dns.h"
+#include "lua_dns_resolver.h"
 #include "lua_thread_pool.h"
 
 LUA_FUNCTION_DEF (dns, request);