mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

libdns refactoring: get rid of two versions of dns_client_createx

Browse Source
This commit is contained in:
Witold Kręcicki
2018-04-03 13:15:16 +02:00
parent d39b3209fb
commit 76e17b54ea
8 changed files with 17 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/delv/delv.c
View File

@@ -1624,8 +1624,8 @@ main(int argc, char *argv[]) {
/* Create client */ /* Create client */
clopt = DNS_CLIENTCREATEOPT_USECACHE; clopt = DNS_CLIENTCREATEOPT_USECACHE;
result = dns_client_createx2(mctx, actx, taskmgr, socketmgr, timermgr, result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr,
clopt, &client, srcaddr4, srcaddr6); clopt, &client, srcaddr4, srcaddr6);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
delv_log(ISC_LOG_ERROR, "dns_client_create: %s", delv_log(ISC_LOG_ERROR, "dns_client_create: %s",
isc_result_totext(result)); isc_result_totext(result));

23
lib/dns/client.c
View File

@@ -399,7 +399,7 @@ dns_client_create(dns_client_t **clientp, unsigned int options) {
isc_log_setdebuglevel(lctx, logdebuglevel); isc_log_setdebuglevel(lctx, logdebuglevel);
#endif #endif
result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr, result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr,
options, clientp); options, clientp, NULL, NULL);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
@@ -425,22 +425,11 @@ dns_client_create(dns_client_t **clientp, unsigned int options) {
} }
isc_result_t isc_result_t
dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx, isc_taskmgr_t *taskmgr, dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx,
isc_socketmgr_t *socketmgr, isc_timermgr_t *timermgr, isc_taskmgr_t *taskmgr, isc_socketmgr_t *socketmgr,
unsigned int options, dns_client_t **clientp) isc_timermgr_t *timermgr, unsigned int options,
{ dns_client_t **clientp, const isc_sockaddr_t *localaddr4,
isc_result_t result; const isc_sockaddr_t *localaddr6)
result = dns_client_createx2(mctx, actx, taskmgr, socketmgr, timermgr,
options, clientp, NULL, NULL);
return (result);
}
isc_result_t
dns_client_createx2(isc_mem_t *mctx, isc_appctx_t *actx,
isc_taskmgr_t *taskmgr, isc_socketmgr_t *socketmgr,
isc_timermgr_t *timermgr, unsigned int options,
dns_client_t **clientp, const isc_sockaddr_t *localaddr4,
const isc_sockaddr_t *localaddr6)
{ {
dns_client_t *client; dns_client_t *client;
isc_result_t result; isc_result_t result;

15
lib/dns/include/dns/client.h
View File

@@ -162,16 +162,11 @@ isc_result_t
dns_client_create(dns_client_t **clientp, unsigned int options); dns_client_create(dns_client_t **clientp, unsigned int options);
isc_result_t isc_result_t
dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx, isc_taskmgr_t *taskmgr, dns_client_createx(isc_mem_t *mctx, isc_appctx_t *actx,
isc_socketmgr_t *socketmgr, isc_timermgr_t *timermgr, isc_taskmgr_t *taskmgr, isc_socketmgr_t *socketmgr,
unsigned int options, dns_client_t **clientp); isc_timermgr_t *timermgr, unsigned int options,
dns_client_t **clientp, const isc_sockaddr_t *localaddr4,
isc_result_t const isc_sockaddr_t *localaddr6);
dns_client_createx2(isc_mem_t *mctx, isc_appctx_t *actx,
isc_taskmgr_t *taskmgr, isc_socketmgr_t *socketmgr,
isc_timermgr_t *timermgr, unsigned int options,
dns_client_t **clientp, const isc_sockaddr_t *localaddr4,
const isc_sockaddr_t *localaddr6);
/*%< /*%<
* Create a DNS client. These functions create a new client object with * Create a DNS client. These functions create a new client object with
* minimal internal resources such as the default 'view' for the IN class and * minimal internal resources such as the default 'view' for the IN class and

1
lib/dns/win32/libdns.def.in
View File

@@ -138,7 +138,6 @@ dns_client_cancelupdate
dns_client_clearservers dns_client_clearservers
dns_client_create dns_client_create
dns_client_createx dns_client_createx
dns_client_createx2
dns_client_destroy dns_client_destroy
dns_client_destroyreqtrans dns_client_destroyreqtrans
dns_client_destroyrestrans dns_client_destroyrestrans

2
lib/irs/context.c
View File

@@ -254,7 +254,7 @@ irs_context_create(irs_context_t **contextp) {
/* Create a DNS client object */ /* Create a DNS client object */
result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr, result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr,
0, &client); 0, &client, NULL, NULL);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto fail; goto fail;
context->dnsclient = client; context->dnsclient = client;

2
lib/samples/nsprobe.c
View File

@@ -1077,7 +1077,7 @@ main(int argc, char *argv[]) {
isc_app_ctxstart(actx); isc_app_ctxstart(actx);
result = dns_client_createx(mctx, actx, taskmgr, socketmgr, result = dns_client_createx(mctx, actx, taskmgr, socketmgr,
timermgr, 0, &client); timermgr, 0, &client, NULL, NULL);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
fprintf(stderr, "dns_client_createx failed: %u\n", result); fprintf(stderr, "dns_client_createx failed: %u\n", result);
exit(1); exit(1);

2
lib/samples/resolve.c
View File

@@ -393,7 +393,7 @@ main(int argc, char *argv[]) {
goto cleanup; goto cleanup;
clientopt = 0; clientopt = 0;
result = dns_client_createx2(mctx, actx, taskmgr, socketmgr, timermgr, result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr,
clientopt, &client, addr4, addr6); clientopt, &client, addr4, addr6);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
fprintf(stderr, "dns_client_create failed: %u, %s\n", result, fprintf(stderr, "dns_client_create failed: %u, %s\n", result,

2
lib/samples/sample-async.c
View File

@@ -340,7 +340,7 @@ main(int argc, char *argv[]) {
isc_app_ctxstart(query_actx); isc_app_ctxstart(query_actx);
result = dns_client_createx(mctx, query_actx, taskmgr, socketmgr, result = dns_client_createx(mctx, query_actx, taskmgr, socketmgr,
timermgr, 0, &client); timermgr, 0, &client, NULL, NULL);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
fprintf(stderr, "dns_client_createx failed: %u\n", result); fprintf(stderr, "dns_client_createx failed: %u\n", result);
exit(1); exit(1);