From: sergey.kitov Date: Mon, 21 Oct 2024 09:40:47 +0000 (+0300) Subject: src: Rename dns_lookup_settings to dns_client_settings. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccd153b5b2afcc69251f55de84eac40e6f61470c;p=thirdparty%2Fdovecot%2Fcore.git src: Rename dns_lookup_settings to dns_client_settings. --- diff --git a/src/auth/auth.c b/src/auth/auth.c index d1c3a99d5a..7bfde36594 100644 --- a/src/auth/auth.c +++ b/src/auth/auth.c @@ -376,7 +376,7 @@ static void auth_init(struct auth *auth) { struct auth_passdb *passdb; struct auth_userdb *userdb; - struct dns_lookup_settings dns_set; + struct dns_client_settings dns_set; for (passdb = auth->masterdbs; passdb != NULL; passdb = passdb->next) auth_passdb_init(passdb); diff --git a/src/lib-dns-client/dns-lookup.c b/src/lib-dns-client/dns-lookup.c index cab27cc173..63c14935c5 100644 --- a/src/lib-dns-client/dns-lookup.c +++ b/src/lib-dns-client/dns-lookup.c @@ -271,7 +271,7 @@ static void dns_lookup_timeout(struct dns_lookup *lookup) duration_msecs / 1000, duration_msecs % 1000)); } -int dns_lookup(const char *host, const struct dns_lookup_settings *set, +int dns_lookup(const char *host, const struct dns_client_settings *set, dns_lookup_callback_t *callback, void *context, struct dns_lookup **lookup_r) { @@ -285,7 +285,7 @@ int dns_lookup(const char *host, const struct dns_lookup_settings *set, } int dns_lookup_ptr(const struct ip_addr *ip, - const struct dns_lookup_settings *set, + const struct dns_client_settings *set, dns_lookup_callback_t *callback, void *context, struct dns_lookup **lookup_r) { @@ -386,7 +386,7 @@ static const struct connection_settings dns_client_set = { .client = TRUE, }; -struct dns_client *dns_client_init(const struct dns_lookup_settings *set) +struct dns_client *dns_client_init(const struct dns_client_settings *set) { struct dns_client *client; diff --git a/src/lib-dns-client/dns-lookup.h b/src/lib-dns-client/dns-lookup.h index 5115cb6f7c..3a3b133fbc 100644 --- a/src/lib-dns-client/dns-lookup.h +++ b/src/lib-dns-client/dns-lookup.h @@ -11,7 +11,7 @@ struct dns_lookup; -struct dns_lookup_settings { +struct dns_client_settings { const char *dns_client_socket_path; unsigned int timeout_msecs; /* the idle_timeout_msecs works only with the dns_client_* API. @@ -49,7 +49,7 @@ typedef void dns_lookup_callback_t(const struct dns_lookup_result *result, started, -1 if there was an error communicating with the UNIX socket. When failing with -1, the callback is called before returning from the function. */ -int dns_lookup(const char *host, const struct dns_lookup_settings *set, +int dns_lookup(const char *host, const struct dns_client_settings *set, dns_lookup_callback_t *callback, void *context, struct dns_lookup **lookup_r) ATTR_NULL(4); #define dns_lookup(host, set, callback, context, lookup_r) \ @@ -58,7 +58,7 @@ int dns_lookup(const char *host, const struct dns_lookup_settings *set, const struct dns_lookup_result *, typeof(context))), \ set, (dns_lookup_callback_t *)callback, context, lookup_r) int dns_lookup_ptr(const struct ip_addr *ip, - const struct dns_lookup_settings *set, + const struct dns_client_settings *set, dns_lookup_callback_t *callback, void *context, struct dns_lookup **lookup_r) ATTR_NULL(4); #define dns_lookup_ptr(host, set, callback, context, lookup_r) \ @@ -72,7 +72,7 @@ void dns_lookup_abort(struct dns_lookup **lookup); void dns_lookup_switch_ioloop(struct dns_lookup *lookup); /* Alternative API for clients that need to do multiple DNS lookups. */ -struct dns_client *dns_client_init(const struct dns_lookup_settings *set); +struct dns_client *dns_client_init(const struct dns_client_settings *set); void dns_client_deinit(struct dns_client **client); /* Connect immediately to the dns-lookup socket. */ diff --git a/src/lib-dns-client/test-dns-lookup.c b/src/lib-dns-client/test-dns-lookup.c index 7825ca26ee..549b04add9 100644 --- a/src/lib-dns-client/test-dns-lookup.c +++ b/src/lib-dns-client/test-dns-lookup.c @@ -167,7 +167,7 @@ static void test_callback_ips(const struct dns_lookup_result *result, static void test_dns_expect_result_ips(const char *name, const char *result) { - const struct dns_lookup_settings set = { + const struct dns_client_settings set = { .dns_client_socket_path = TEST_SOCKET_NAME, .ioloop = test_server.loop, .timeout_msecs = 1000, @@ -183,7 +183,7 @@ static void test_dns_expect_result_ips(const char *name, const char *result) static void test_dns_expect_result_name(const char *name, const char *result) { - const struct dns_lookup_settings set = { + const struct dns_client_settings set = { .dns_client_socket_path = TEST_SOCKET_NAME, .ioloop = test_server.loop, .timeout_msecs = 1000, @@ -218,7 +218,7 @@ static void test_dns_lookup_timeout(void) test_begin("dns lookup (timeout)"); create_dns_server(&test_server); - const struct dns_lookup_settings set = { + const struct dns_client_settings set = { .dns_client_socket_path = TEST_SOCKET_NAME, .ioloop = test_server.loop, .timeout_msecs = 1000, @@ -241,7 +241,7 @@ static void test_dns_lookup_abort(void) test_begin("dns lookup (abort)"); create_dns_server(&test_server); - const struct dns_lookup_settings set = { + const struct dns_client_settings set = { .dns_client_socket_path = TEST_SOCKET_NAME, .ioloop = test_server.loop, .timeout_msecs = 1000, @@ -271,7 +271,7 @@ static void test_dns_lookup_cached(void) test_begin("dns lookup (cached)"); create_dns_server(&test_server); - const struct dns_lookup_settings set = { + const struct dns_client_settings set = { .dns_client_socket_path = TEST_SOCKET_NAME, .ioloop = test_server.loop, .timeout_msecs = 1000, diff --git a/src/lib-doveadm/doveadm-client.c b/src/lib-doveadm/doveadm-client.c index 47b09f677f..b2823e2e92 100644 --- a/src/lib-doveadm/doveadm-client.c +++ b/src/lib-doveadm/doveadm-client.c @@ -714,7 +714,7 @@ static int doveadm_client_dns_lookup(struct doveadm_client *conn, { struct doveadm_client_dns_lookup_context *ctx = p_new(conn->pool, struct doveadm_client_dns_lookup_context, 1); - struct dns_lookup_settings dns_set; + struct dns_client_settings dns_set; i_zero(&dns_set); dns_set.dns_client_socket_path = conn->set.dns_client_socket_path; diff --git a/src/lib-http/http-client-host.c b/src/lib-http/http-client-host.c index 09d73cc1bd..8541ef6301 100644 --- a/src/lib-http/http-client-host.c +++ b/src/lib-http/http-client-host.c @@ -143,7 +143,7 @@ static void http_client_host_shared_lookup(struct http_client_host_shared *hshared) { struct http_client_context *cctx = hshared->cctx; - struct dns_lookup_settings dns_set; + struct dns_client_settings dns_set; int ret; i_assert(!hshared->explicit_ip); diff --git a/src/lib-http/test-http-client.c b/src/lib-http/test-http-client.c index 0187d109c6..1f8fa4c3df 100644 --- a/src/lib-http/test-http-client.c +++ b/src/lib-http/test-http-client.c @@ -349,7 +349,7 @@ static void run_http_post(struct http_client *http_client, const char *url_str, int main(int argc, char *argv[]) { struct dns_client *dns_client; - struct dns_lookup_settings dns_set; + struct dns_client_settings dns_set; struct http_client_settings http_set; struct http_client_context *http_cctx; struct http_client *http_client1, *http_client2, *http_client3, *http_client4; diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c index 6467e01732..0073e5144c 100644 --- a/src/lib-imap-client/imapc-connection.c +++ b/src/lib-imap-client/imapc-connection.c @@ -1922,7 +1922,7 @@ imapc_connection_dns_callback(const struct dns_lookup_result *result, void imapc_connection_connect(struct imapc_connection *conn) { - struct dns_lookup_settings dns_set; + struct dns_client_settings dns_set; struct ip_addr ip, *ips; unsigned int ips_count; int ret; diff --git a/src/lib-lua/test-dns-lua.c b/src/lib-lua/test-dns-lua.c index 8015d24c64..e4f3c50e8c 100644 --- a/src/lib-lua/test-dns-lua.c +++ b/src/lib-lua/test-dns-lua.c @@ -38,7 +38,7 @@ static void test_dns_lua_deinit(void) static void test_dns_lua_common(const char *luascript) { - const struct dns_lookup_settings set = { + const struct dns_client_settings set = { .dns_client_socket_path = TEST_DNS_SERVER_SOCKET_PATH, .timeout_msecs = 1000, }; diff --git a/src/lib-program-client/program-client-remote.c b/src/lib-program-client/program-client-remote.c index 8b671f64fa..bf6926cbde 100644 --- a/src/lib-program-client/program-client-remote.c +++ b/src/lib-program-client/program-client-remote.c @@ -251,7 +251,7 @@ struct program_client_remote { struct program_client client; const char *address; - struct dns_lookup_settings dns_set; + struct dns_client_settings dns_set; struct dns_lookup *lookup; unsigned int ips_count; unsigned int ips_left; diff --git a/src/lib-smtp/smtp-client-connection.c b/src/lib-smtp/smtp-client-connection.c index f915896d51..2683da8d6b 100644 --- a/src/lib-smtp/smtp-client-connection.c +++ b/src/lib-smtp/smtp-client-connection.c @@ -1875,7 +1875,7 @@ smtp_client_connection_dns_callback(const struct dns_lookup_result *result, static void smtp_client_connection_lookup_ip(struct smtp_client_connection *conn) { - struct dns_lookup_settings dns_set; + struct dns_client_settings dns_set; struct ip_addr *ips; unsigned int ips_count; int ret; diff --git a/src/lib-storage/index/pop3c/pop3c-client.c b/src/lib-storage/index/pop3c/pop3c-client.c index 0e1a2f43a0..5ca6b13b4f 100644 --- a/src/lib-storage/index/pop3c/pop3c-client.c +++ b/src/lib-storage/index/pop3c/pop3c-client.c @@ -241,7 +241,7 @@ static void pop3c_client_timeout(struct pop3c_client *client) static int pop3c_client_dns_lookup(struct pop3c_client *client) { - struct dns_lookup_settings dns_set; + struct dns_client_settings dns_set; i_assert(client->state == POP3C_CLIENT_STATE_CONNECTING);