From 5f0efcbb3c5362cf44fdb863dabc13bbad217c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 23 Apr 2020 00:13:29 +0200 Subject: [PATCH 1/2] Cleanup libirs APIs and slim down the library to just irs_resconf The libirs contained own re-implementations of the getaddrinfo, getnameinfo and gai_strerror + irs_context and irs_dnsconf API that was unused anywhere in the BIND 9. Keep just the irs_resonf API that is being extensively used to parse /etc/resolv.conf by several of BIND 9 tools. --- bin/delv/delv.c | 1 - lib/irs/Makefile.am | 11 +- lib/irs/context.c | 325 ------ lib/irs/dnsconf.c | 289 ----- lib/irs/gai_strerror.c | 94 -- lib/irs/getaddrinfo.c | 1357 ----------------------- lib/irs/getnameinfo.c | 435 -------- lib/irs/include/irs/context.h | 153 --- lib/irs/include/irs/dnsconf.h | 90 -- lib/irs/include/irs/netdb.h | 190 ---- lib/irs/include/irs/resconf.h | 12 +- lib/irs/include/irs/types.h | 24 - lib/irs/resconf.c | 1 - lib/irs/tests/resconf_test.c | 1 - lib/irs/win32/include/irs/netdb.h | 205 ---- lib/irs/win32/libirs.def | 18 - lib/irs/win32/libirs.vcxproj.filters.in | 27 - lib/irs/win32/libirs.vcxproj.in | 10 - lib/samples/Makefile.am | 4 - lib/samples/resolve.c | 1 - lib/samples/sample-gai.c | 71 -- util/copyrights | 11 - 22 files changed, 8 insertions(+), 3322 deletions(-) delete mode 100644 lib/irs/context.c delete mode 100644 lib/irs/dnsconf.c delete mode 100644 lib/irs/gai_strerror.c delete mode 100644 lib/irs/getaddrinfo.c delete mode 100644 lib/irs/getnameinfo.c delete mode 100644 lib/irs/include/irs/context.h delete mode 100644 lib/irs/include/irs/dnsconf.h delete mode 100644 lib/irs/include/irs/netdb.h delete mode 100644 lib/irs/include/irs/types.h delete mode 100644 lib/irs/win32/include/irs/netdb.h delete mode 100644 lib/samples/sample-gai.c diff --git a/bin/delv/delv.c b/bin/delv/delv.c index 1736a63d8b..d0a5931e77 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -72,7 +72,6 @@ #include #include -#include #include #define CHECK(r) \ diff --git a/lib/irs/Makefile.am b/lib/irs/Makefile.am index cb7024381c..6330e4e986 100644 --- a/lib/irs/Makefile.am +++ b/lib/irs/Makefile.am @@ -4,19 +4,10 @@ lib_LTLIBRARIES = libirs.la libirs_ladir = $(includedir)/irs libirs_la_HEADERS = \ - include/irs/context.h \ - include/irs/dnsconf.h \ - include/irs/netdb.h \ - include/irs/resconf.h \ - include/irs/types.h + include/irs/resconf.h libirs_la_SOURCES = \ $(libirs_la_HEADERS) \ - context.c \ - dnsconf.c \ - gai_strerror.c \ - getaddrinfo.c \ - getnameinfo.c \ resconf.c libirs_la_CPPFLAGS = \ diff --git a/lib/irs/context.c b/lib/irs/context.c deleted file mode 100644 index 7ac891e635..0000000000 --- a/lib/irs/context.c +++ /dev/null @@ -1,325 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - -#define IRS_CONTEXT_MAGIC ISC_MAGIC('I', 'R', 'S', 'c') -#define IRS_CONTEXT_VALID(c) ISC_MAGIC_VALID(c, IRS_CONTEXT_MAGIC) - -#ifndef RESOLV_CONF -/*% location of resolve.conf */ -#define RESOLV_CONF "/etc/resolv.conf" -#endif /* ifndef RESOLV_CONF */ - -#ifndef DNS_CONF -/*% location of dns.conf */ -#define DNS_CONF "/etc/dns.conf" -#endif /* ifndef DNS_CONF */ - -static thread_local irs_context_t *irs_context = NULL; - -struct irs_context { - /* - * An IRS context is a thread-specific object, and does not need to - * be locked. - */ - unsigned int magic; - isc_mem_t *mctx; - isc_appctx_t *actx; - isc_taskmgr_t *taskmgr; - isc_task_t *task; - isc_socketmgr_t *socketmgr; - isc_timermgr_t *timermgr; - dns_client_t *dnsclient; - irs_resconf_t *resconf; - irs_dnsconf_t *dnsconf; -}; - -static void -ctxs_destroy(isc_mem_t **mctxp, isc_appctx_t **actxp, isc_taskmgr_t **taskmgrp, - isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) { - if (taskmgrp != NULL) { - isc_taskmgr_destroy(taskmgrp); - } - - if (timermgrp != NULL) { - isc_timermgr_destroy(timermgrp); - } - - if (socketmgrp != NULL) { - isc_socketmgr_destroy(socketmgrp); - } - - if (actxp != NULL) { - isc_appctx_destroy(actxp); - } - - if (mctxp != NULL) { - isc_mem_destroy(mctxp); - } -} - -static isc_result_t -ctxs_init(isc_mem_t **mctxp, isc_appctx_t **actxp, isc_taskmgr_t **taskmgrp, - isc_socketmgr_t **socketmgrp, isc_timermgr_t **timermgrp) { - isc_result_t result; - - isc_mem_create(mctxp); - - result = isc_appctx_create(*mctxp, actxp); - if (result != ISC_R_SUCCESS) { - goto fail; - } - - result = isc_taskmgr_createinctx(*mctxp, 1, 0, taskmgrp); - if (result != ISC_R_SUCCESS) { - goto fail; - } - - result = isc_socketmgr_createinctx(*mctxp, socketmgrp); - if (result != ISC_R_SUCCESS) { - goto fail; - } - - result = isc_timermgr_createinctx(*mctxp, timermgrp); - if (result != ISC_R_SUCCESS) { - goto fail; - } - - return (ISC_R_SUCCESS); - -fail: - ctxs_destroy(mctxp, actxp, taskmgrp, socketmgrp, timermgrp); - - return (result); -} - -isc_result_t -irs_context_get(irs_context_t **contextp) { - isc_result_t result; - - REQUIRE(contextp != NULL && *contextp == NULL); - - if (irs_context == NULL) { - result = irs_context_create(&irs_context); - if (result != ISC_R_SUCCESS) { - return (result); - } - } - - *contextp = irs_context; - - return (ISC_R_SUCCESS); -} - -isc_result_t -irs_context_create(irs_context_t **contextp) { - isc_result_t result; - irs_context_t *context; - isc_appctx_t *actx = NULL; - isc_mem_t *mctx = NULL; - isc_taskmgr_t *taskmgr = NULL; - isc_socketmgr_t *socketmgr = NULL; - isc_timermgr_t *timermgr = NULL; - dns_client_t *client = NULL; - isc_sockaddrlist_t *nameservers; - irs_dnsconf_dnskeylist_t *trustedkeys; - irs_dnsconf_dnskey_t *trustedkey; - - isc_lib_register(); - result = dns_lib_init(); - if (result != ISC_R_SUCCESS) { - return (result); - } - - result = ctxs_init(&mctx, &actx, &taskmgr, &socketmgr, &timermgr); - if (result != ISC_R_SUCCESS) { - return (result); - } - - result = isc_app_ctxstart(actx); - if (result != ISC_R_SUCCESS) { - ctxs_destroy(&mctx, &actx, &taskmgr, &socketmgr, &timermgr); - return (result); - } - - context = isc_mem_get(mctx, sizeof(*context)); - - context->mctx = mctx; - context->actx = actx; - context->taskmgr = taskmgr; - context->socketmgr = socketmgr; - context->timermgr = timermgr; - context->resconf = NULL; - context->dnsconf = NULL; - context->task = NULL; - result = isc_task_create(taskmgr, 0, &context->task); - if (result != ISC_R_SUCCESS) { - goto fail; - } - - /* Create a DNS client object */ - result = dns_client_createx(mctx, actx, taskmgr, socketmgr, timermgr, 0, - &client, NULL, NULL); - if (result != ISC_R_SUCCESS) { - goto fail; - } - context->dnsclient = client; - - /* Read resolver configuration file */ - result = irs_resconf_load(mctx, RESOLV_CONF, &context->resconf); - if (result != ISC_R_SUCCESS) { - goto fail; - } - /* Set nameservers */ - nameservers = irs_resconf_getnameservers(context->resconf); - result = dns_client_setservers(client, dns_rdataclass_in, NULL, - nameservers); - if (result != ISC_R_SUCCESS) { - goto fail; - } - - /* Read advanced DNS configuration (if any) */ - result = irs_dnsconf_load(mctx, DNS_CONF, &context->dnsconf); - if (result != ISC_R_SUCCESS) { - goto fail; - } - trustedkeys = irs_dnsconf_gettrustedkeys(context->dnsconf); - for (trustedkey = ISC_LIST_HEAD(*trustedkeys); trustedkey != NULL; - trustedkey = ISC_LIST_NEXT(trustedkey, link)) - { - result = dns_client_addtrustedkey( - client, dns_rdataclass_in, dns_rdatatype_dnskey, - trustedkey->keyname, trustedkey->keydatabuf); - if (result != ISC_R_SUCCESS) { - goto fail; - } - } - - context->magic = IRS_CONTEXT_MAGIC; - *contextp = context; - - return (ISC_R_SUCCESS); - -fail: - if (context->task != NULL) { - isc_task_detach(&context->task); - } - if (context->resconf != NULL) { - irs_resconf_destroy(&context->resconf); - } - if (context->dnsconf != NULL) { - irs_dnsconf_destroy(&context->dnsconf); - } - if (client != NULL) { - dns_client_destroy(&client); - } - ctxs_destroy(NULL, &actx, &taskmgr, &socketmgr, &timermgr); - isc_mem_putanddetach(&mctx, context, sizeof(*context)); - - return (result); -} - -void -irs_context_destroy(irs_context_t **contextp) { - irs_context_t *context; - - REQUIRE(contextp != NULL); - context = *contextp; - REQUIRE(IRS_CONTEXT_VALID(context)); - *contextp = irs_context = NULL; - - isc_task_detach(&context->task); - irs_dnsconf_destroy(&context->dnsconf); - irs_resconf_destroy(&context->resconf); - dns_client_destroy(&context->dnsclient); - - ctxs_destroy(NULL, &context->actx, &context->taskmgr, - &context->socketmgr, &context->timermgr); - - context->magic = 0; - - isc_mem_putanddetach(&context->mctx, context, sizeof(*context)); -} - -isc_mem_t * -irs_context_getmctx(irs_context_t *context) { - REQUIRE(IRS_CONTEXT_VALID(context)); - - return (context->mctx); -} - -isc_appctx_t * -irs_context_getappctx(irs_context_t *context) { - REQUIRE(IRS_CONTEXT_VALID(context)); - - return (context->actx); -} - -isc_taskmgr_t * -irs_context_gettaskmgr(irs_context_t *context) { - REQUIRE(IRS_CONTEXT_VALID(context)); - - return (context->taskmgr); -} - -isc_timermgr_t * -irs_context_gettimermgr(irs_context_t *context) { - REQUIRE(IRS_CONTEXT_VALID(context)); - - return (context->timermgr); -} - -isc_task_t * -irs_context_gettask(irs_context_t *context) { - REQUIRE(IRS_CONTEXT_VALID(context)); - - return (context->task); -} - -dns_client_t * -irs_context_getdnsclient(irs_context_t *context) { - REQUIRE(IRS_CONTEXT_VALID(context)); - - return (context->dnsclient); -} - -irs_resconf_t * -irs_context_getresconf(irs_context_t *context) { - REQUIRE(IRS_CONTEXT_VALID(context)); - - return (context->resconf); -} - -irs_dnsconf_t * -irs_context_getdnsconf(irs_context_t *context) { - REQUIRE(IRS_CONTEXT_VALID(context)); - - return (context->dnsconf); -} diff --git a/lib/irs/dnsconf.c b/lib/irs/dnsconf.c deleted file mode 100644 index 519739385e..0000000000 --- a/lib/irs/dnsconf.c +++ /dev/null @@ -1,289 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -/*! \file */ - -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include - -#include - -#define IRS_DNSCONF_MAGIC ISC_MAGIC('D', 'c', 'f', 'g') -#define IRS_DNSCONF_VALID(c) ISC_MAGIC_VALID(c, IRS_DNSCONF_MAGIC) - -/*! - * configuration data structure - */ - -struct irs_dnsconf { - unsigned int magic; - isc_mem_t *mctx; - irs_dnsconf_dnskeylist_t trusted_keylist; -}; - -static isc_result_t -configure_key(isc_mem_t *mctx, const cfg_obj_t *key, irs_dnsconf_t *conf, - dns_rdataclass_t rdclass) { - isc_result_t result; - uint32_t flags, proto, alg; - dns_fixedname_t fkeyname; - dns_name_t *keyname_base = NULL, *keyname = NULL; - const char *keystr = NULL, *keynamestr = NULL; - unsigned char keydata[4096]; - isc_buffer_t keydatabuf_base, *keydatabuf = NULL; - dns_rdata_dnskey_t keystruct; - unsigned char rrdata[4096]; - isc_buffer_t rrdatabuf; - isc_region_t r; - isc_buffer_t namebuf; - irs_dnsconf_dnskey_t *keyent = NULL; - - flags = cfg_obj_asuint32(cfg_tuple_get(key, "flags")); - proto = cfg_obj_asuint32(cfg_tuple_get(key, "protocol")); - alg = cfg_obj_asuint32(cfg_tuple_get(key, "algorithm")); - keynamestr = cfg_obj_asstring(cfg_tuple_get(key, "name")); - - keystruct.common.rdclass = rdclass; - keystruct.common.rdtype = dns_rdatatype_dnskey; - keystruct.mctx = NULL; - ISC_LINK_INIT(&keystruct.common, link); - - if (flags > 0xffff) { - return (ISC_R_RANGE); - } - if (proto > 0xff) { - return (ISC_R_RANGE); - } - if (alg > 0xff) { - return (ISC_R_RANGE); - } - keystruct.flags = (uint16_t)flags; - keystruct.protocol = (uint8_t)proto; - keystruct.algorithm = (uint8_t)alg; - - isc_buffer_init(&keydatabuf_base, keydata, sizeof(keydata)); - isc_buffer_init(&rrdatabuf, rrdata, sizeof(rrdata)); - - /* Configure key value */ - keystr = cfg_obj_asstring(cfg_tuple_get(key, "key")); - result = isc_base64_decodestring(keystr, &keydatabuf_base); - if (result != ISC_R_SUCCESS) { - return (result); - } - isc_buffer_usedregion(&keydatabuf_base, &r); - keystruct.datalen = r.length; - keystruct.data = r.base; - - result = dns_rdata_fromstruct(NULL, keystruct.common.rdclass, - keystruct.common.rdtype, &keystruct, - &rrdatabuf); - if (result != ISC_R_SUCCESS) { - return (result); - } - isc_buffer_usedregion(&rrdatabuf, &r); - isc_buffer_allocate(mctx, &keydatabuf, r.length); - result = isc_buffer_copyregion(keydatabuf, &r); - if (result != ISC_R_SUCCESS) { - goto cleanup; - } - - /* Configure key name */ - keyname_base = dns_fixedname_initname(&fkeyname); - isc_buffer_constinit(&namebuf, keynamestr, strlen(keynamestr)); - isc_buffer_add(&namebuf, strlen(keynamestr)); - result = dns_name_fromtext(keyname_base, &namebuf, dns_rootname, 0, - NULL); - if (result != ISC_R_SUCCESS) { - return (result); - } - keyname = isc_mem_get(mctx, sizeof(*keyname)); - dns_name_init(keyname, NULL); - dns_name_dup(keyname_base, mctx, keyname); - - /* Add the key data to the list */ - keyent = isc_mem_get(mctx, sizeof(*keyent)); - keyent->keyname = keyname; - keyent->keydatabuf = keydatabuf; - - ISC_LIST_APPEND(conf->trusted_keylist, keyent, link); - -cleanup: - if (keydatabuf != NULL) { - isc_buffer_free(&keydatabuf); - } - if (keyname != NULL) { - isc_mem_put(mctx, keyname, sizeof(*keyname)); - } - - return (result); -} - -static isc_result_t -configure_keygroup(irs_dnsconf_t *conf, const cfg_obj_t *keys, - dns_rdataclass_t rdclass) { - isc_result_t result; - const cfg_obj_t *key, *keylist; - const cfg_listelt_t *element, *element2; - isc_mem_t *mctx = conf->mctx; - - for (element = cfg_list_first(keys); element != NULL; - element = cfg_list_next(element)) - { - keylist = cfg_listelt_value(element); - for (element2 = cfg_list_first(keylist); element2 != NULL; - element2 = cfg_list_next(element2)) - { - key = cfg_listelt_value(element2); - result = configure_key(mctx, key, conf, rdclass); - if (result != ISC_R_SUCCESS) { - return (result); - } - } - } - - return (ISC_R_SUCCESS); -} - -static isc_result_t -configure_dnsseckeys(irs_dnsconf_t *conf, cfg_obj_t *cfgobj, - dns_rdataclass_t rdclass) { - isc_result_t result; - const cfg_obj_t *keys = NULL; - - cfg_map_get(cfgobj, "trusted-keys", &keys); - if (keys == NULL) { - return (ISC_R_SUCCESS); - } - - result = configure_keygroup(conf, keys, rdclass); - if (result != ISC_R_SUCCESS) { - return (result); - } - - keys = NULL; - cfg_map_get(cfgobj, "trust-anchors", &keys); - if (keys == NULL) { - return (ISC_R_SUCCESS); - } - - result = configure_keygroup(conf, keys, rdclass); - if (result != ISC_R_SUCCESS) { - return (result); - } - - keys = NULL; - cfg_map_get(cfgobj, "managed-keys", &keys); - if (keys == NULL) { - return (ISC_R_SUCCESS); - } - - result = configure_keygroup(conf, keys, rdclass); - if (result != ISC_R_SUCCESS) { - return (result); - } - - return (ISC_R_SUCCESS); -} - -isc_result_t -irs_dnsconf_load(isc_mem_t *mctx, const char *filename, irs_dnsconf_t **confp) { - irs_dnsconf_t *conf; - cfg_parser_t *parser = NULL; - cfg_obj_t *cfgobj = NULL; - isc_result_t result = ISC_R_SUCCESS; - - REQUIRE(confp != NULL && *confp == NULL); - - conf = isc_mem_get(mctx, sizeof(*conf)); - - conf->mctx = mctx; - ISC_LIST_INIT(conf->trusted_keylist); - - /* - * If the specified file does not exist, we'll simply with an empty - * configuration. - */ - if (!isc_file_exists(filename)) { - goto cleanup; - } - - result = cfg_parser_create(mctx, NULL, &parser); - if (result != ISC_R_SUCCESS) { - goto cleanup; - } - - result = cfg_parse_file(parser, filename, &cfg_type_dnsconf, &cfgobj); - if (result != ISC_R_SUCCESS) { - goto cleanup; - } - - result = configure_dnsseckeys(conf, cfgobj, dns_rdataclass_in); - -cleanup: - if (parser != NULL) { - if (cfgobj != NULL) { - cfg_obj_destroy(parser, &cfgobj); - } - cfg_parser_destroy(&parser); - } - - conf->magic = IRS_DNSCONF_MAGIC; - - if (result == ISC_R_SUCCESS) { - *confp = conf; - } else { - irs_dnsconf_destroy(&conf); - } - - return (result); -} - -void -irs_dnsconf_destroy(irs_dnsconf_t **confp) { - irs_dnsconf_t *conf; - irs_dnsconf_dnskey_t *keyent; - - REQUIRE(confp != NULL); - conf = *confp; - *confp = NULL; - REQUIRE(IRS_DNSCONF_VALID(conf)); - - while ((keyent = ISC_LIST_HEAD(conf->trusted_keylist)) != NULL) { - ISC_LIST_UNLINK(conf->trusted_keylist, keyent, link); - - isc_buffer_free(&keyent->keydatabuf); - dns_name_free(keyent->keyname, conf->mctx); - isc_mem_put(conf->mctx, keyent->keyname, sizeof(dns_name_t)); - isc_mem_put(conf->mctx, keyent, sizeof(*keyent)); - } - - isc_mem_put(conf->mctx, conf, sizeof(*conf)); -} - -irs_dnsconf_dnskeylist_t * -irs_dnsconf_gettrustedkeys(irs_dnsconf_t *conf) { - REQUIRE(IRS_DNSCONF_VALID(conf)); - - return (&conf->trusted_keylist); -} diff --git a/lib/irs/gai_strerror.c b/lib/irs/gai_strerror.c deleted file mode 100644 index 9c0a0416db..0000000000 --- a/lib/irs/gai_strerror.c +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -/*! \file gai_strerror.c - * gai_strerror() returns an error message corresponding to an - * error code returned by getaddrinfo() and getnameinfo(). The following error - * codes and their meaning are defined in - * \link netdb.h include/irs/netdb.h.\endlink - * This implementation is almost an exact copy of lwres/gai_sterror.c except - * that it catches up the latest API standard, RFC3493. - * - * \li #EAI_ADDRFAMILY address family for hostname not supported - * \li #EAI_AGAIN temporary failure in name resolution - * \li #EAI_BADFLAGS invalid value for ai_flags - * \li #EAI_FAIL non-recoverable failure in name resolution - * \li #EAI_FAMILY ai_family not supported - * \li #EAI_MEMORY memory allocation failure - * \li #EAI_NODATA no address associated with hostname (obsoleted in RFC3493) - * \li #EAI_NONAME hostname nor servname provided, or not known - * \li #EAI_SERVICE servname not supported for ai_socktype - * \li #EAI_SOCKTYPE ai_socktype not supported - * \li #EAI_SYSTEM system error returned in errno - * \li #EAI_BADHINTS Invalid value for hints (non-standard) - * \li #EAI_PROTOCOL Resolved protocol is unknown (non-standard) - * \li #EAI_OVERFLOW Argument buffer overflow - * \li #EAI_INSECUREDATA Insecure Data (experimental) - * - * The message invalid error code is returned if ecode is out of range. - * - * ai_flags, ai_family and ai_socktype are elements of the struct - * addrinfo used by lwres_getaddrinfo(). - * - * \section gai_strerror_see See Also - * - * strerror(), getaddrinfo(), getnameinfo(), RFC3493. - */ - -#include - -#include - -/*% Text of error messages. */ -static const char *gai_messages[] = { "no error", - "address family for hostname not " - "supported", - "temporary failure in name resolution", - "invalid value for ai_flags", - "non-recoverable failure in name " - "resolution", - "ai_family not supported", - "memory allocation failure", - "no address associated with hostname", - "hostname nor servname provided, or not " - "known", - "servname not supported for ai_socktype", - "ai_socktype not supported", - "system error returned in errno", - "bad hints", - "bad protocol", - "argument buffer overflow", - "insecure data provided" }; - -/*% - * Returns an error message corresponding to an error code returned by - * getaddrinfo() and getnameinfo() - */ -#if defined _WIN32 -char * -#else /* if defined _WIN32 */ -const char * -#endif /* if defined _WIN32 */ -gai_strerror(int ecode) { - union { - const char *const_ptr; - char *deconst_ptr; - } ptr; - - if ((ecode < 0) || - (ecode >= (int)(sizeof(gai_messages) / sizeof(*gai_messages)))) - { - ptr.const_ptr = "invalid error code"; - } else { - ptr.const_ptr = gai_messages[ecode]; - } - return (ptr.deconst_ptr); -} diff --git a/lib/irs/getaddrinfo.c b/lib/irs/getaddrinfo.c deleted file mode 100644 index 9b9645caf1..0000000000 --- a/lib/irs/getaddrinfo.c +++ /dev/null @@ -1,1357 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -/*! \file */ - -/** - * getaddrinfo() is used to get a list of IP addresses and port - * numbers for host hostname and service servname as defined in RFC3493. - * hostname and servname are pointers to null-terminated strings - * or NULL. hostname is either a host name or a numeric host address - * string: a dotted decimal IPv4 address or an IPv6 address. servname is - * either a decimal port number or a service name as listed in - * /etc/services. - * - * If the operating system does not provide a struct addrinfo, the - * following structure is used: - * - * \code - * struct addrinfo { - * int ai_flags; // AI_PASSIVE, AI_CANONNAME - * int ai_family; // PF_xxx - * int ai_socktype; // SOCK_xxx - * int ai_protocol; // 0 or IPPROTO_xxx for IPv4 and IPv6 - * size_t ai_addrlen; // length of ai_addr - * char *ai_canonname; // canonical name for hostname - * struct sockaddr *ai_addr; // binary address - * struct addrinfo *ai_next; // next structure in linked list - * }; - * \endcode - * - * - * hints is an optional pointer to a struct addrinfo. This structure can - * be used to provide hints concerning the type of socket that the caller - * supports or wishes to use. The caller can supply the following - * structure elements in *hints: - * - *
    - *
  • ai_family: - * The protocol family that should be used. When ai_family is set - * to PF_UNSPEC, it means the caller will accept any protocol - * family supported by the operating system.
    • - * - *
  • ai_socktype: - * denotes the type of socket -- SOCK_STREAM, SOCK_DGRAM or - * SOCK_RAW -- that is wanted. When ai_socktype is zero the caller - * will accept any socket type.
    • - * - *
  • ai_protocol: - * indicates which transport protocol is wanted: IPPROTO_UDP or - * IPPROTO_TCP. If ai_protocol is zero the caller will accept any - * protocol.
    • - * - *
  • ai_flags: - * Flag bits. If the AI_CANONNAME bit is set, a successful call to - * getaddrinfo() will return a null-terminated string - * containing the canonical name of the specified hostname in - * ai_canonname of the first addrinfo structure returned. Setting - * the AI_PASSIVE bit indicates that the returned socket address - * structure is intended for used in a call to bind(2). In this - * case, if the hostname argument is a NULL pointer, then the IP - * address portion of the socket address structure will be set to - * INADDR_ANY for an IPv4 address or IN6ADDR_ANY_INIT for an IPv6 - * address.

    - * - * When ai_flags does not set the AI_PASSIVE bit, the returned - * socket address structure will be ready for use in a call to - * connect(2) for a connection-oriented protocol or connect(2), - * sendto(2), or sendmsg(2) if a connectionless protocol was - * chosen. The IP address portion of the socket address structure - * will be set to the loopback address if hostname is a NULL - * pointer and AI_PASSIVE is not set in ai_flags.

    - * - * If ai_flags is set to AI_NUMERICHOST it indicates that hostname - * should be treated as a numeric string defining an IPv4 or IPv6 - * address and no name resolution should be attempted. - *
- * - * All other elements of the struct addrinfo passed via hints must be - * zero. - * - * A hints of NULL is treated as if the caller provided a struct addrinfo - * initialized to zero with ai_familyset to PF_UNSPEC. - * - * After a successful call to getaddrinfo(), *res is a pointer to a - * linked list of one or more addrinfo structures. Each struct addrinfo - * in this list cn be processed by following the ai_next pointer, until a - * NULL pointer is encountered. The three members ai_family, ai_socktype, - * and ai_protocol in each returned addrinfo structure contain the - * corresponding arguments for a call to socket(2). For each addrinfo - * structure in the list, the ai_addr member points to a filled-in socket - * address structure of length ai_addrlen. - * - * All of the information returned by getaddrinfo() is dynamically - * allocated: the addrinfo structures, and the socket address structures - * and canonical host name strings pointed to by the addrinfostructures. - * Memory allocated for the dynamically allocated structures created by a - * successful call to getaddrinfo() is released by freeaddrinfo(). - * ai is a pointer to a struct addrinfo created by a call to getaddrinfo(). - * - * \section irsreturn RETURN VALUES - * - * getaddrinfo() returns zero on success or one of the error codes - * listed in gai_strerror() if an error occurs. If both hostname and - * servname are NULL getaddrinfo() returns #EAI_NONAME. - * - * \section irssee SEE ALSO - * - * getaddrinfo(), freeaddrinfo(), - * gai_strerror(), RFC3493, getservbyname(3), connect(2), - * sendto(2), sendmsg(2), socket(2). - */ - -#include -#include -#include -#include -#include - -#ifdef _WIN32 -#include -#include -#include -#endif /* ifdef _WIN32 */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#define SA(addr) ((struct sockaddr *)(addr)) -#define SIN(addr) ((struct sockaddr_in *)(addr)) -#define SIN6(addr) ((struct sockaddr_in6 *)(addr)) -#define SLOCAL(addr) ((struct sockaddr_un *)(addr)) - -/*! \struct addrinfo - */ -static struct addrinfo * -ai_concat(struct addrinfo *ai1, struct addrinfo *ai2), - *ai_reverse(struct addrinfo *oai), - *ai_clone(struct addrinfo *oai, int family), - *ai_alloc(int family, int addrlen); -#ifdef AF_LOCAL -static int -get_local(const char *name, int socktype, struct addrinfo **res); -#endif /* ifdef AF_LOCAL */ - -static int -resolve_name(int family, const char *hostname, int flags, struct addrinfo **aip, - int socktype, int port); - -static int -add_ipv4(const char *hostname, int flags, struct addrinfo **aip, int socktype, - int port); -static int -add_ipv6(const char *hostname, int flags, struct addrinfo **aip, int socktype, - int port); -static void -set_order(int, int (**)(const char *, int, struct addrinfo **, int, int)); -static void -_freeaddrinfo(struct addrinfo *ai); - -#define FOUND_IPV4 0x1 -#define FOUND_IPV6 0x2 -#define FOUND_MAX 2 - -/*% - * Try converting the scope identifier in 'src' to a network interface index. - * Upon success, return true and store the resulting index in 'dst'. Upon - * failure, return false. - */ -static bool -parse_scopeid(const char *src, uint32_t *dst) { - uint32_t scopeid = 0; - - REQUIRE(src != NULL); - REQUIRE(dst != NULL); - -#ifdef HAVE_IF_NAMETOINDEX - /* - * Try using if_nametoindex() first if it is available. As it does not - * handle numeric scopes, we do not simply return if it fails. - */ - scopeid = (uint32_t)if_nametoindex(src); -#endif /* ifdef HAVE_IF_NAMETOINDEX */ - - /* - * Fall back to numeric scope processing if if_nametoindex() either - * fails or is unavailable. - */ - if (scopeid == 0) { - char *endptr = NULL; - scopeid = (uint32_t)strtoul(src, &endptr, 10); - /* - * The scope identifier must not be empty and no trailing - * characters are allowed after it. - */ - if (src == endptr || endptr == NULL || *endptr != '\0') { - return (false); - } - } - - *dst = scopeid; - - return (true); -} - -#define ISC_AI_MASK (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST) -/*% - * Get a list of IP addresses and port numbers for host hostname and - * service servname. - */ -int -getaddrinfo(const char *hostname, const char *servname, - const struct addrinfo *hints, struct addrinfo **res) { - struct servent *sp; - const char *proto; - int family, socktype, flags, protocol; - struct addrinfo *ai, *ai_list; - int err = 0; - int port, i; - int (*net_order[FOUND_MAX + 1])(const char *, int, struct addrinfo **, - int, int); - - if (hostname == NULL && servname == NULL) { - return (EAI_NONAME); - } - - proto = NULL; - if (hints != NULL) { - if ((hints->ai_flags & ~(ISC_AI_MASK)) != 0) { - return (EAI_BADFLAGS); - } - if (hints->ai_addrlen || hints->ai_canonname || - hints->ai_addr || hints->ai_next) - { - errno = EINVAL; - return (EAI_SYSTEM); - } - family = hints->ai_family; - socktype = hints->ai_socktype; - protocol = hints->ai_protocol; - flags = hints->ai_flags; - switch (family) { - case AF_UNSPEC: - switch (hints->ai_socktype) { - case SOCK_STREAM: - proto = "tcp"; - break; - case SOCK_DGRAM: - proto = "udp"; - break; - } - break; - case AF_INET: - case AF_INET6: - switch (hints->ai_socktype) { - case 0: - break; - case SOCK_STREAM: - proto = "tcp"; - break; - case SOCK_DGRAM: - proto = "udp"; - break; - case SOCK_RAW: - break; - default: - return (EAI_SOCKTYPE); - } - break; -#ifdef AF_LOCAL - case AF_LOCAL: - switch (hints->ai_socktype) { - case 0: - break; - case SOCK_STREAM: - break; - case SOCK_DGRAM: - break; - default: - return (EAI_SOCKTYPE); - } - break; -#endif /* ifdef AF_LOCAL */ - default: - return (EAI_FAMILY); - } - } else { - protocol = 0; - family = 0; - socktype = 0; - flags = 0; - } - -#ifdef AF_LOCAL - /*! - * First, deal with AF_LOCAL. If the family was not set, - * then assume AF_LOCAL if the first character of the - * hostname/servname is '/'. - */ - - if (hostname != NULL && - (family == AF_LOCAL || (family == 0 && *hostname == '/'))) - { - return (get_local(hostname, socktype, res)); - } - - if (servname != NULL && - (family == AF_LOCAL || (family == 0 && *servname == '/'))) - { - return (get_local(servname, socktype, res)); - } -#endif /* ifdef AF_LOCAL */ - - /* - * Ok, only AF_INET and AF_INET6 left. - */ - ai_list = NULL; - - /* - * First, look up the service name (port) if it was - * requested. If the socket type wasn't specified, then - * try and figure it out. - */ - if (servname != NULL) { - char *e; - - port = strtol(servname, &e, 10); - if (*e == '\0') { - if (socktype == 0) { - return (EAI_SOCKTYPE); - } - if (port < 0 || port > 65535) { - return (EAI_SERVICE); - } - port = htons((unsigned short)port); - } else { -#ifdef _WIN32 - WORD wVersionRequested; - WSADATA wsaData; - - wVersionRequested = MAKEWORD(2, 0); - - err = WSAStartup(wVersionRequested, &wsaData); - if (err != 0) { - return (EAI_FAIL); - } -#endif /* ifdef _WIN32 */ - sp = getservbyname(servname, proto); - if (sp != NULL) { - port = sp->s_port; - } -#ifdef _WIN32 - WSACleanup(); -#endif /* ifdef _WIN32 */ - if (sp == NULL) { - return (EAI_SERVICE); - } - if (socktype == 0) { - if (strcmp(sp->s_proto, "tcp") == 0) { - socktype = SOCK_STREAM; - } else if (strcmp(sp->s_proto, "udp") == 0) { - socktype = SOCK_DGRAM; - } - } - } - } else { - port = 0; - } - - /* - * Next, deal with just a service name, and no hostname. - * (we verified that one of them was non-null up above). - */ - if (hostname == NULL && (flags & AI_PASSIVE) != 0) { - if (family == AF_INET || family == 0) { - ai = ai_alloc(AF_INET, sizeof(struct sockaddr_in)); - if (ai == NULL) { - return (EAI_MEMORY); - } - ai->ai_socktype = socktype; - ai->ai_protocol = protocol; - SIN(ai->ai_addr)->sin_port = port; - ai->ai_next = ai_list; - ai_list = ai; - } - - if (family == AF_INET6 || family == 0) { - ai = ai_alloc(AF_INET6, sizeof(struct sockaddr_in6)); - if (ai == NULL) { - _freeaddrinfo(ai_list); - return (EAI_MEMORY); - } - ai->ai_socktype = socktype; - ai->ai_protocol = protocol; - SIN6(ai->ai_addr)->sin6_port = port; - ai->ai_next = ai_list; - ai_list = ai; - } - - *res = ai_list; - return (0); - } - - /* - * If the family isn't specified or AI_NUMERICHOST specified, check - * first to see if it is a numeric address. - * Though the gethostbyname2() routine will recognize numeric addresses, - * it will only recognize the format that it is being called for. Thus, - * a numeric AF_INET address will be treated by the AF_INET6 call as - * a domain name, and vice versa. Checking for both numerics here - * avoids that. - */ - if (hostname != NULL && (family == 0 || (flags & AI_NUMERICHOST) != 0)) - { - char abuf[sizeof(struct in6_addr)]; - char nbuf[NI_MAXHOST]; - int addrsize, addroff; - char ntmp[NI_MAXHOST]; - uint32_t scopeid = 0; - - /* - * Scope identifier portion. - */ - ntmp[0] = '\0'; - if (strchr(hostname, '%') != NULL) { - char *p; - strlcpy(ntmp, hostname, sizeof(ntmp)); - p = strchr(ntmp, '%'); - - if (p != NULL && parse_scopeid(p + 1, &scopeid)) { - *p = '\0'; - } else { - ntmp[0] = '\0'; - } - } - - if (inet_pton(AF_INET, hostname, (struct in_addr *)abuf) == 1) { - if (family == AF_INET6) { - /* - * Convert to a V4 mapped address. - */ - struct in6_addr *a6 = (struct in6_addr *)abuf; - memmove(&a6->s6_addr[12], &a6->s6_addr[0], 4); - memset(&a6->s6_addr[10], 0xff, 2); - memset(&a6->s6_addr[0], 0, 10); - goto inet6_addr; - } - addrsize = sizeof(struct in_addr); - addroff = offsetof(struct sockaddr_in, sin_addr); - family = AF_INET; - goto common; - } else if (ntmp[0] != '\0' && - inet_pton(AF_INET6, ntmp, abuf) == 1) { - if (family && family != AF_INET6) { - return (EAI_NONAME); - } - addrsize = sizeof(struct in6_addr); - addroff = offsetof(struct sockaddr_in6, sin6_addr); - family = AF_INET6; - goto common; - } else if (inet_pton(AF_INET6, hostname, abuf) == 1) { - if (family != 0 && family != AF_INET6) { - return (EAI_NONAME); - } - inet6_addr: - addrsize = sizeof(struct in6_addr); - addroff = offsetof(struct sockaddr_in6, sin6_addr); - family = AF_INET6; - - common: - ai = ai_alloc(family, - ((family == AF_INET6) - ? sizeof(struct sockaddr_in6) - : sizeof(struct sockaddr_in))); - if (ai == NULL) { - return (EAI_MEMORY); - } - ai_list = ai; - ai->ai_socktype = socktype; - SIN(ai->ai_addr)->sin_port = port; - memmove((char *)ai->ai_addr + addroff, abuf, addrsize); - if (ai->ai_family == AF_INET6) { - SIN6(ai->ai_addr)->sin6_scope_id = scopeid; - } - if ((flags & AI_CANONNAME) != 0) { - if (getnameinfo(ai->ai_addr, - (socklen_t)ai->ai_addrlen, nbuf, - sizeof(nbuf), NULL, 0, - NI_NUMERICHOST) == 0) - { - ai->ai_canonname = strdup(nbuf); - if (ai->ai_canonname == NULL) { - _freeaddrinfo(ai); - return (EAI_MEMORY); - } - } else { - /* XXX raise error? */ - ai->ai_canonname = NULL; - } - } - goto done; - } else if ((flags & AI_NUMERICHOST) != 0) { - return (EAI_NONAME); - } - } - - if (hostname == NULL && (flags & AI_PASSIVE) == 0) { - set_order(family, net_order); - for (i = 0; i < FOUND_MAX; i++) { - if (net_order[i] == NULL) { - break; - } - err = (net_order[i])(hostname, flags, &ai_list, - socktype, port); - if (err != 0) { - if (ai_list != NULL) { - _freeaddrinfo(ai_list); - ai_list = NULL; - } - break; - } - } - } else { - err = resolve_name(family, hostname, flags, &ai_list, socktype, - port); - } - - if (ai_list == NULL) { - if (err == 0) { - err = EAI_NONAME; - } - return (err); - } - -done: - ai_list = ai_reverse(ai_list); - - *res = ai_list; - return (0); -} - -typedef struct gai_restrans { - dns_clientrestrans_t *xid; - bool is_inprogress; - int error; - struct addrinfo ai_sentinel; - struct gai_resstate *resstate; -} gai_restrans_t; - -typedef struct gai_resstate { - isc_mem_t *mctx; - struct gai_statehead *head; - dns_fixedname_t fixedname; - dns_name_t *qname; - gai_restrans_t *trans4; - gai_restrans_t *trans6; - ISC_LINK(struct gai_resstate) link; -} gai_resstate_t; - -typedef struct gai_statehead { - int ai_family; - int ai_flags; - int ai_socktype; - int ai_port; - isc_appctx_t *actx; - dns_client_t *dnsclient; - isc_mutex_t list_lock; - ISC_LIST(struct gai_resstate) resstates; - unsigned int activestates; -} gai_statehead_t; - -static isc_result_t -make_resstate(isc_mem_t *mctx, gai_statehead_t *head, const char *hostname, - const char *domain, gai_resstate_t **statep) { - isc_result_t result; - gai_resstate_t *state; - dns_fixedname_t fixeddomain; - dns_name_t *qdomain; - unsigned int namelen; - isc_buffer_t b; - bool need_v4 = false; - bool need_v6 = false; - - state = isc_mem_get(mctx, sizeof(*state)); - - /* Construct base domain name */ - namelen = strlen(domain); - isc_buffer_constinit(&b, domain, namelen); - isc_buffer_add(&b, namelen); - qdomain = dns_fixedname_initname(&fixeddomain); - result = dns_name_fromtext(qdomain, &b, dns_rootname, 0, NULL); - if (result != ISC_R_SUCCESS) { - isc_mem_put(mctx, state, sizeof(*state)); - return (result); - } - - /* Construct query name */ - namelen = strlen(hostname); - isc_buffer_constinit(&b, hostname, namelen); - isc_buffer_add(&b, namelen); - state->qname = dns_fixedname_initname(&state->fixedname); - result = dns_name_fromtext(state->qname, &b, qdomain, 0, NULL); - if (result != ISC_R_SUCCESS) { - isc_mem_put(mctx, state, sizeof(*state)); - return (result); - } - - if (head->ai_family == AF_UNSPEC || head->ai_family == AF_INET) { - need_v4 = true; - } - if (head->ai_family == AF_UNSPEC || head->ai_family == AF_INET6) { - need_v6 = true; - } - - state->trans6 = NULL; - state->trans4 = NULL; - if (need_v4) { - state->trans4 = isc_mem_get(mctx, sizeof(gai_restrans_t)); - state->trans4->error = 0; - state->trans4->xid = NULL; - state->trans4->resstate = state; - state->trans4->is_inprogress = true; - state->trans4->ai_sentinel.ai_next = NULL; - } - if (need_v6) { - state->trans6 = isc_mem_get(mctx, sizeof(gai_restrans_t)); - state->trans6->error = 0; - state->trans6->xid = NULL; - state->trans6->resstate = state; - state->trans6->is_inprogress = true; - state->trans6->ai_sentinel.ai_next = NULL; - } - - state->mctx = mctx; - state->head = head; - ISC_LINK_INIT(state, link); - - *statep = state; - - return (ISC_R_SUCCESS); -} - -static isc_result_t -make_resstates(isc_mem_t *mctx, const char *hostname, gai_statehead_t *head, - irs_resconf_t *resconf) { - isc_result_t result; - irs_resconf_searchlist_t *searchlist; - irs_resconf_search_t *searchent; - gai_resstate_t *resstate, *resstate0; - - resstate0 = NULL; - result = make_resstate(mctx, head, hostname, ".", &resstate0); - if (result != ISC_R_SUCCESS) { - return (result); - } - - searchlist = irs_resconf_getsearchlist(resconf); - for (searchent = ISC_LIST_HEAD(*searchlist); searchent != NULL; - searchent = ISC_LIST_NEXT(searchent, link)) - { - resstate = NULL; - result = make_resstate(mctx, head, hostname, - (const char *)searchent->domain, - &resstate); - if (result != ISC_R_SUCCESS) { - break; - } - - ISC_LIST_APPEND(head->resstates, resstate, link); - head->activestates++; - } - - /* - * Insert the original hostname either at the head or the tail of the - * state list, depending on the number of labels contained in the - * original name and the 'ndots' configuration parameter. - */ - if (dns_name_countlabels(resstate0->qname) > - irs_resconf_getndots(resconf) + 1) { - ISC_LIST_PREPEND(head->resstates, resstate0, link); - } else { - ISC_LIST_APPEND(head->resstates, resstate0, link); - } - head->activestates++; - - if (result != ISC_R_SUCCESS) { - while ((resstate = ISC_LIST_HEAD(head->resstates)) != NULL) { - ISC_LIST_UNLINK(head->resstates, resstate, link); - if (resstate->trans4 != NULL) { - isc_mem_put(mctx, resstate->trans4, - sizeof(*resstate->trans4)); - } - if (resstate->trans6 != NULL) { - isc_mem_put(mctx, resstate->trans6, - sizeof(*resstate->trans6)); - } - - isc_mem_put(mctx, resstate, sizeof(*resstate)); - } - } - - return (result); -} - -static void -process_answer(isc_task_t *task, isc_event_t *event) { - int error = 0, family; - gai_restrans_t *trans = event->ev_arg; - gai_resstate_t *resstate; - dns_clientresevent_t *rev = (dns_clientresevent_t *)event; - dns_rdatatype_t qtype; - dns_name_t *name; - bool wantcname; - - REQUIRE(trans != NULL); - resstate = trans->resstate; - REQUIRE(resstate != NULL); - REQUIRE(task != NULL); - - if (trans == resstate->trans4) { - family = AF_INET; - qtype = dns_rdatatype_a; - } else { - INSIST(trans == resstate->trans6); - family = AF_INET6; - qtype = dns_rdatatype_aaaa; - } - - INSIST(trans->is_inprogress); - trans->is_inprogress = false; - - switch (rev->result) { - case ISC_R_SUCCESS: - case DNS_R_NCACHENXDOMAIN: /* treat this as a fatal error? */ - case DNS_R_NCACHENXRRSET: - break; - default: - switch (rev->vresult) { - case DNS_R_SIGINVALID: - case DNS_R_SIGEXPIRED: - case DNS_R_SIGFUTURE: - case DNS_R_KEYUNAUTHORIZED: - case DNS_R_MUSTBESECURE: - case DNS_R_COVERINGNSEC: - case DNS_R_NOTAUTHORITATIVE: - case DNS_R_NOVALIDKEY: - case DNS_R_NOVALIDDS: - case DNS_R_NOVALIDSIG: - error = EAI_INSECUREDATA; - break; - default: - error = EAI_FAIL; - } - goto done; - } - - wantcname = ((resstate->head->ai_flags & AI_CANONNAME) != 0); - - /* Parse the response and construct the addrinfo chain */ - for (name = ISC_LIST_HEAD(rev->answerlist); name != NULL; - name = ISC_LIST_NEXT(name, link)) - { - isc_result_t result; - dns_rdataset_t *rdataset; - char cname[1024]; - - if (wantcname) { - isc_buffer_t b; - - isc_buffer_init(&b, cname, sizeof(cname)); - result = dns_name_totext(name, true, &b); - if (result != ISC_R_SUCCESS) { - error = EAI_FAIL; - goto done; - } - isc_buffer_putuint8(&b, '\0'); - } - - for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) - { - if (!dns_rdataset_isassociated(rdataset)) { - continue; - } - if (rdataset->type != qtype) { - continue; - } - - for (result = dns_rdataset_first(rdataset); - result == ISC_R_SUCCESS; - result = dns_rdataset_next(rdataset)) - { - struct addrinfo *ai; - dns_rdata_t rdata; - dns_rdata_in_a_t rdata_a; - dns_rdata_in_aaaa_t rdata_aaaa; - - ai = ai_alloc( - family, - ((family == AF_INET6) - ? sizeof(struct sockaddr_in6) - : sizeof(struct sockaddr_in))); - if (ai == NULL) { - error = EAI_MEMORY; - goto done; - } - ai->ai_socktype = resstate->head->ai_socktype; - ai->ai_next = trans->ai_sentinel.ai_next; - trans->ai_sentinel.ai_next = ai; - - /* - * Set AF-specific parameters - * (IPv4/v6 address/port) - */ - dns_rdata_init(&rdata); - switch (family) { - case AF_INET: - dns_rdataset_current(rdataset, &rdata); - result = dns_rdata_tostruct( - &rdata, &rdata_a, NULL); - RUNTIME_CHECK(result == ISC_R_SUCCESS); - SIN(ai->ai_addr)->sin_port = - resstate->head->ai_port; - memmove(&SIN(ai->ai_addr)->sin_addr, - &rdata_a.in_addr, 4); - dns_rdata_freestruct(&rdata_a); - break; - case AF_INET6: - dns_rdataset_current(rdataset, &rdata); - result = dns_rdata_tostruct( - &rdata, &rdata_aaaa, NULL); - RUNTIME_CHECK(result == ISC_R_SUCCESS); - SIN6(ai->ai_addr)->sin6_port = - resstate->head->ai_port; - memmove(&SIN6(ai->ai_addr)->sin6_addr, - &rdata_aaaa.in6_addr, 16); - dns_rdata_freestruct(&rdata_aaaa); - break; - } - - if (wantcname) { - ai->ai_canonname = strdup(cname); - if (ai->ai_canonname == NULL) { - error = EAI_MEMORY; - goto done; - } - } - } - } - } - -done: - dns_client_freeresanswer(resstate->head->dnsclient, &rev->answerlist); - dns_client_destroyrestrans(&trans->xid); - - isc_event_free(&event); - - /* Make sure that error == 0 iff we have a non-empty list */ - if (error == 0) { - if (trans->ai_sentinel.ai_next == NULL) { - error = EAI_NONAME; - } - } else { - if (trans->ai_sentinel.ai_next != NULL) { - _freeaddrinfo(trans->ai_sentinel.ai_next); - trans->ai_sentinel.ai_next = NULL; - } - } - trans->error = error; - - /* Check whether we are done */ - if ((resstate->trans4 == NULL || !resstate->trans4->is_inprogress) && - (resstate->trans6 == NULL || !resstate->trans6->is_inprogress)) - { - /* - * We're done for this state. If there is no other outstanding - * state, we can exit. - */ - resstate->head->activestates--; - if (resstate->head->activestates == 0) { - isc_app_ctxsuspend(resstate->head->actx); - return; - } - - /* - * There are outstanding states, but if we are at the head - * of the state list (i.e., at the highest search priority) - * and have any answer, we can stop now by canceling the - * others. - */ - LOCK(&resstate->head->list_lock); - if (resstate == ISC_LIST_HEAD(resstate->head->resstates)) { - if ((resstate->trans4 != NULL && - resstate->trans4->ai_sentinel.ai_next != NULL) || - (resstate->trans6 != NULL && - resstate->trans6->ai_sentinel.ai_next != NULL)) - { - gai_resstate_t *rest; - - for (rest = ISC_LIST_NEXT(resstate, link); - rest != NULL; - rest = ISC_LIST_NEXT(rest, link)) - { - if (rest->trans4 != NULL && - rest->trans4->xid != NULL) { - dns_client_cancelresolve( - rest->trans4->xid); - } - if (rest->trans6 != NULL && - rest->trans6->xid != NULL) { - dns_client_cancelresolve( - rest->trans6->xid); - } - } - } else { - /* - * This search fails, so we move to the tail - * of the list so that the next entry will - * have the highest priority. - */ - ISC_LIST_UNLINK(resstate->head->resstates, - resstate, link); - ISC_LIST_APPEND(resstate->head->resstates, - resstate, link); - } - } - UNLOCK(&resstate->head->list_lock); - } -} - -static int -resolve_name(int family, const char *hostname, int flags, struct addrinfo **aip, - int socktype, int port) { - isc_result_t result; - irs_context_t *irsctx; - irs_resconf_t *conf; - isc_mem_t *mctx; - isc_appctx_t *actx; - isc_task_t *task; - int terror = 0; - int error = 0; - dns_client_t *client; - gai_resstate_t *resstate; - gai_statehead_t head; - bool all_fail = true; - - /* get IRS context and the associated parameters */ - irsctx = NULL; - result = irs_context_get(&irsctx); - if (result != ISC_R_SUCCESS) { - return (EAI_FAIL); - } - actx = irs_context_getappctx(irsctx); - - mctx = irs_context_getmctx(irsctx); - task = irs_context_gettask(irsctx); - conf = irs_context_getresconf(irsctx); - client = irs_context_getdnsclient(irsctx); - - /* construct resolution states */ - head.activestates = 0; - head.ai_family = family; - head.ai_socktype = socktype; - head.ai_flags = flags; - head.ai_port = port; - head.actx = actx; - head.dnsclient = client; - isc_mutex_init(&head.list_lock); - - ISC_LIST_INIT(head.resstates); - result = make_resstates(mctx, hostname, &head, conf); - if (result != ISC_R_SUCCESS) { - isc_mutex_destroy(&head.list_lock); - return (EAI_FAIL); - } - - LOCK(&head.list_lock); - for (resstate = ISC_LIST_HEAD(head.resstates); resstate != NULL; - resstate = ISC_LIST_NEXT(resstate, link)) - { - if (resstate->trans4 != NULL) { - result = dns_client_startresolve( - client, resstate->qname, dns_rdataclass_in, - dns_rdatatype_a, 0, task, process_answer, - resstate->trans4, &resstate->trans4->xid); - if (result == ISC_R_SUCCESS) { - resstate->trans4->is_inprogress = true; - all_fail = false; - } else { - resstate->trans4->is_inprogress = false; - } - } - if (resstate->trans6 != NULL) { - result = dns_client_startresolve( - client, resstate->qname, dns_rdataclass_in, - dns_rdatatype_aaaa, 0, task, process_answer, - resstate->trans6, &resstate->trans6->xid); - if (result == ISC_R_SUCCESS) { - resstate->trans6->is_inprogress = true; - all_fail = false; - } else { - resstate->trans6->is_inprogress = false; - } - } - } - UNLOCK(&head.list_lock); - - if (!all_fail) { - /* Start all the events */ - isc_app_ctxrun(actx); - } else { - error = EAI_FAIL; - } - - /* Cleanup */ - while ((resstate = ISC_LIST_HEAD(head.resstates)) != NULL) { - int terror4 = 0, terror6 = 0; - - ISC_LIST_UNLINK(head.resstates, resstate, link); - - if (*aip == NULL) { - struct addrinfo *sentinel4 = NULL; - struct addrinfo *sentinel6 = NULL; - - if (resstate->trans4 != NULL) { - sentinel4 = - resstate->trans4->ai_sentinel.ai_next; - resstate->trans4->ai_sentinel.ai_next = NULL; - } - if (resstate->trans6 != NULL) { - sentinel6 = - resstate->trans6->ai_sentinel.ai_next; - resstate->trans6->ai_sentinel.ai_next = NULL; - } - *aip = ai_concat(sentinel4, sentinel6); - } - - if (resstate->trans4 != NULL) { - INSIST(resstate->trans4->xid == NULL); - terror4 = resstate->trans4->error; - isc_mem_put(mctx, resstate->trans4, - sizeof(*resstate->trans4)); - } - if (resstate->trans6 != NULL) { - INSIST(resstate->trans6->xid == NULL); - terror6 = resstate->trans6->error; - isc_mem_put(mctx, resstate->trans6, - sizeof(*resstate->trans6)); - } - - /* - * If the entire lookup fails, we need to choose an appropriate - * error code from individual codes. We'll try to provide as - * specific a code as possible. In general, we are going to - * find an error code other than EAI_NONAME (which is too - * generic and may actually not be problematic in some cases). - * EAI_NONAME will be set below if no better code is found. - */ - if (terror == 0 || terror == EAI_NONAME) { - if (terror4 != 0 && terror4 != EAI_NONAME) { - terror = terror4; - } else if (terror6 != 0 && terror6 != EAI_NONAME) { - terror = terror6; - } - } - - isc_mem_put(mctx, resstate, sizeof(*resstate)); - } - - if (*aip == NULL) { - error = terror; - if (error == 0) { - error = EAI_NONAME; - } - } - -#if 1 /* XXX: enabled for finding leaks. should be cleaned up later. */ - isc_app_ctxfinish(actx); - irs_context_destroy(&irsctx); -#endif /* if 1 */ - - isc_mutex_destroy(&head.list_lock); - return (error); -} - -static void -set_order(int family, - int (**net_order)(const char *, int, struct addrinfo **, int, int)) { - char *order, *tok, *last; - int found; - - if (family) { - switch (family) { - case AF_INET: - *net_order++ = add_ipv4; - break; - case AF_INET6: - *net_order++ = add_ipv6; - break; - } - } else { - order = getenv("NET_ORDER"); - found = 0; - if (order != NULL) { - last = NULL; - for (tok = strtok_r(order, ":", &last); tok; - tok = strtok_r(NULL, ":", &last)) { - if (strcasecmp(tok, "inet6") == 0) { - if ((found & FOUND_IPV6) == 0) { - *net_order++ = add_ipv6; - } - found |= FOUND_IPV6; - } else if (strcasecmp(tok, "inet") == 0 || - strcasecmp(tok, "inet4") == 0) { - if ((found & FOUND_IPV4) == 0) { - *net_order++ = add_ipv4; - } - found |= FOUND_IPV4; - } - } - } - - /* - * Add in anything that we didn't find. - */ - if ((found & FOUND_IPV4) == 0) { - *net_order++ = add_ipv4; - } - if ((found & FOUND_IPV6) == 0) { - *net_order++ = add_ipv6; - } - } - *net_order = NULL; - return; -} - -static char v4_loop[4] = { 127, 0, 0, 1 }; - -static int -add_ipv4(const char *hostname, int flags, struct addrinfo **aip, int socktype, - int port) { - struct addrinfo *ai; - - UNUSED(hostname); - UNUSED(flags); - - ai = ai_clone(*aip, AF_INET); /* don't use ai_clone() */ - if (ai == NULL) { - return (EAI_MEMORY); - } - - *aip = ai; - ai->ai_socktype = socktype; - SIN(ai->ai_addr)->sin_port = port; - memmove(&SIN(ai->ai_addr)->sin_addr, v4_loop, 4); - - return (0); -} - -static char v6_loop[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }; - -static int -add_ipv6(const char *hostname, int flags, struct addrinfo **aip, int socktype, - int port) { - struct addrinfo *ai; - - UNUSED(hostname); - UNUSED(flags); - - ai = ai_clone(*aip, AF_INET6); /* don't use ai_clone() */ - if (ai == NULL) { - return (EAI_MEMORY); - } - - *aip = ai; - ai->ai_socktype = socktype; - SIN6(ai->ai_addr)->sin6_port = port; - memmove(&SIN6(ai->ai_addr)->sin6_addr, v6_loop, 16); - - return (0); -} - -/*% Free address info. */ -void -freeaddrinfo(struct addrinfo *ai) { - _freeaddrinfo(ai); -} - -static void -_freeaddrinfo(struct addrinfo *ai) { - struct addrinfo *ai_next; - - while (ai != NULL) { - ai_next = ai->ai_next; - if (ai->ai_addr != NULL) { - free(ai->ai_addr); - } - if (ai->ai_canonname) { - free(ai->ai_canonname); - } - free(ai); - ai = ai_next; - } -} - -#ifdef AF_LOCAL -static int -get_local(const char *name, int socktype, struct addrinfo **res) { - struct addrinfo *ai; - struct sockaddr_un *slocal; - - if (socktype == 0) { - return (EAI_SOCKTYPE); - } - - ai = ai_alloc(AF_LOCAL, sizeof(*slocal)); - if (ai == NULL) { - return (EAI_MEMORY); - } - - slocal = SLOCAL(ai->ai_addr); - strlcpy(slocal->sun_path, name, sizeof(slocal->sun_path)); - - ai->ai_socktype = socktype; - /* - * ai->ai_flags, ai->ai_protocol, ai->ai_canonname, - * and ai->ai_next were initialized to zero. - */ - - *res = ai; - return (0); -} -#endif /* ifdef AF_LOCAL */ - -/*! - * Allocate an addrinfo structure, and a sockaddr structure - * of the specified length. We initialize: - * ai_addrlen - * ai_family - * ai_addr - * ai_addr->sa_family - * ai_addr->sa_len (IRS_PLATFORM_HAVESALEN) - * and everything else is initialized to zero. - */ -static struct addrinfo * -ai_alloc(int family, int addrlen) { - struct addrinfo *ai; - - ai = (struct addrinfo *)calloc(1, sizeof(*ai)); - if (ai == NULL) { - return (NULL); - } - - ai->ai_addr = SA(calloc(1, addrlen)); - if (ai->ai_addr == NULL) { - free(ai); - return (NULL); - } - ai->ai_addrlen = addrlen; - ai->ai_family = family; - ai->ai_addr->sa_family = family; -#ifdef IRS_PLATFORM_HAVESALEN - ai->ai_addr->sa_len = addrlen; -#endif /* ifdef IRS_PLATFORM_HAVESALEN */ - return (ai); -} - -static struct addrinfo * -ai_clone(struct addrinfo *oai, int family) { - struct addrinfo *ai; - - ai = ai_alloc(family, - ((family == AF_INET6) ? sizeof(struct sockaddr_in6) - : sizeof(struct sockaddr_in))); - - if (ai == NULL) { - return (NULL); - } - if (oai == NULL) { - return (ai); - } - - ai->ai_flags = oai->ai_flags; - ai->ai_socktype = oai->ai_socktype; - ai->ai_protocol = oai->ai_protocol; - ai->ai_canonname = NULL; - ai->ai_next = oai; - return (ai); -} - -static struct addrinfo * -ai_reverse(struct addrinfo *oai) { - struct addrinfo *nai, *tai; - - nai = NULL; - - while (oai != NULL) { - /* - * Grab one off the old list. - */ - tai = oai; - oai = oai->ai_next; - /* - * Put it on the front of the new list. - */ - tai->ai_next = nai; - nai = tai; - } - return (nai); -} - -static struct addrinfo * -ai_concat(struct addrinfo *ai1, struct addrinfo *ai2) { - struct addrinfo *ai_tmp; - - if (ai1 == NULL) { - return (ai2); - } else if (ai2 == NULL) { - return (ai1); - } - - for (ai_tmp = ai1; ai_tmp != NULL && ai_tmp->ai_next != NULL; - ai_tmp = ai_tmp->ai_next) - { - } - - ai_tmp->ai_next = ai2; - - return (ai1); -} diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c deleted file mode 100644 index 2a8363fe0e..0000000000 --- a/lib/irs/getnameinfo.c +++ /dev/null @@ -1,435 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -/*! \file */ - -/* - * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/** - * getnameinfo() returns the hostname for the struct sockaddr sa which is - * salen bytes long. The hostname is of length hostlen and is returned via - * *host. The maximum length of the hostname is 1025 bytes: #NI_MAXHOST. - * - * The name of the service associated with the port number in sa is - * returned in *serv. It is servlen bytes long. The maximum length of the - * service name is #NI_MAXSERV - 32 bytes. - * - * The flags argument sets the following bits: - * - * \li #NI_NOFQDN: - * A fully qualified domain name is not required for local hosts. - * The local part of the fully qualified domain name is returned - * instead. - * - * \li #NI_NUMERICHOST - * Return the address in numeric form, as if calling inet_ntop(), - * instead of a host name. - * - * \li #NI_NAMEREQD - * A name is required. If the hostname cannot be found in the DNS - * and this flag is set, a non-zero error code is returned. If the - * hostname is not found and the flag is not set, the address is - * returned in numeric form. - * - * \li #NI_NUMERICSERV - * The service name is returned as a digit string representing the - * port number. - * - * \li #NI_DGRAM - * Specifies that the service being looked up is a datagram - * service, and causes getservbyport() to be called with a second - * argument of "udp" instead of its default of "tcp". This is - * required for the few ports (512-514) that have different - * services for UDP and TCP. - * - * \section getnameinfo_return Return Values - * - * getnameinfo() returns 0 on success or a non-zero error code if - * an error occurs. - * - * \section getname_see See Also - * - * RFC3493, getservbyport(), - * getnamebyaddr(). inet_ntop(). - */ - -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#define SUCCESS 0 - -/*% afd structure definition */ -static struct afd { - int a_af; - size_t a_addrlen; - size_t a_socklen; -} afdl[] = { - /*! - * First entry is linked last... - */ - { AF_INET, sizeof(struct in_addr), sizeof(struct sockaddr_in) }, - { AF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6) }, - { 0, 0, 0 }, -}; - -/*! - * The test against 0 is there to keep the Solaris compiler - * from complaining about "end-of-loop code not reached". - */ -#define ERR(code) \ - do { \ - result = (code); \ - if (result != 0) \ - goto cleanup; \ - } while (0) - -#ifdef _WIN32 -int -getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, - DWORD hostlen, char *serv, DWORD servlen, int flags) { -#else -int -getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, - socklen_t hostlen, char *serv, socklen_t servlen, int flags) { -#endif - struct afd *afd = NULL; - struct servent *sp; - unsigned short port = 0; -#ifdef IRS_PLATFORM_HAVESALEN - size_t len; -#endif /* ifdef IRS_PLATFORM_HAVESALEN */ - int family, i; - const void *addr = NULL; - char *p; -#if 0 - unsigned long v4a; - unsigned char pfx; -#endif /* if 0 */ - char numserv[sizeof("65000")]; - char numaddr[sizeof("abcd:abcd:abcd:abcd:abcd:abcd:255.255.255.255") + - 1 + sizeof("4294967295")]; - const char *proto; - int result = SUCCESS; - - if (sa == NULL) { - ERR(EAI_FAIL); - } - -#ifdef IRS_PLATFORM_HAVESALEN - len = sa->sa_len; - if (len != salen) { - ERR(EAI_FAIL); - } -#endif /* ifdef IRS_PLATFORM_HAVESALEN */ - - family = sa->sa_family; - for (i = 0; afdl[i].a_af; i++) { - if (afdl[i].a_af == family) { - { - afd = &afdl[i]; - goto found; - } - } - } - ERR(EAI_FAMILY); - -found: - if (salen != afd->a_socklen) { - ERR(EAI_FAIL); - } - - switch (family) { - case AF_INET: - port = ((const struct sockaddr_in *)sa)->sin_port; - addr = &((const struct sockaddr_in *)sa)->sin_addr.s_addr; - break; - - case AF_INET6: - port = ((const struct sockaddr_in6 *)sa)->sin6_port; - addr = ((const struct sockaddr_in6 *)sa)->sin6_addr.s6_addr; - break; - - default: - INSIST(0); - ISC_UNREACHABLE(); - } - proto = ((flags & NI_DGRAM) != 0) ? "udp" : "tcp"; - - if (serv == NULL || servlen == 0U) { - /* - * Caller does not want service. - */ - } else if ((flags & NI_NUMERICSERV) != 0 || - (sp = getservbyport(port, proto)) == NULL) - { - snprintf(numserv, sizeof(numserv), "%d", ntohs(port)); - if ((strlen(numserv) + 1) > servlen) { - ERR(EAI_OVERFLOW); - } - strlcpy(serv, numserv, servlen); - } else { - if ((strlen(sp->s_name) + 1) > servlen) { - ERR(EAI_OVERFLOW); - } - strlcpy(serv, sp->s_name, servlen); - } - -#if 0 - switch (sa->sa_family) { - case AF_INET: - v4a = ((struct sockaddr_in *)sa)->sin_addr.s_addr; - if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a)) { - flags |= NI_NUMERICHOST; - } - v4a >>= IN_CLASSA_NSHIFT; - if (v4a == 0 || v4a == IN_LOOPBACKNET) { - flags |= NI_NUMERICHOST; - } - break; - - case AF_INET6: - pfx = ((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr[0]; - if (pfx == 0 || pfx == 0xfe || pfx == 0xff) { - flags |= NI_NUMERICHOST; - } - break; - } -#endif /* if 0 */ - - if (host == NULL || hostlen == 0U) { - /* - * do nothing in this case. - * in case you are wondering if "&&" is more correct than - * "||" here: RFC3493 says that host == NULL or hostlen == 0 - * means that the caller does not want the result. - */ - } else if ((flags & NI_NUMERICHOST) != 0) { - if (inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr)) == - NULL) { - ERR(EAI_SYSTEM); - } -#if defined(IRS_HAVE_SIN6_SCOPE_ID) - if (afd->a_af == AF_INET6 && - ((const struct sockaddr_in6 *)sa)->sin6_scope_id) { - char *p = numaddr + strlen(numaddr); - const char *stringscope = NULL; -#ifdef VENDOR_SPECIFIC - /* - * Vendors may want to add support for - * non-numeric scope identifier. - */ - stringscope = foo; -#endif /* ifdef VENDOR_SPECIFIC */ - if (stringscope == NULL) { - snprintf(p, sizeof(numaddr) - (p - numaddr), - "%%%u", - ((const struct sockaddr_in6 *)sa) - ->sin6_scope_id); - } else { - snprintf(p, sizeof(numaddr) - (p - numaddr), - "%%%s", stringscope); - } - } -#endif /* if defined(IRS_HAVE_SIN6_SCOPE_ID) */ - if (strlen(numaddr) + 1 > hostlen) { - ERR(EAI_OVERFLOW); - } - strlcpy(host, numaddr, hostlen); - } else { - isc_netaddr_t netaddr; - dns_fixedname_t ptrfname; - dns_name_t *ptrname; - irs_context_t *irsctx = NULL; - dns_client_t *client; - bool found = false; - dns_namelist_t answerlist; - dns_rdataset_t *rdataset; - isc_region_t hostregion; - char hoststr[1024]; /* is this enough? */ - isc_result_t iresult; - - /* Get IRS context and the associated DNS client object */ - iresult = irs_context_get(&irsctx); - if (iresult != ISC_R_SUCCESS) { - ERR(EAI_FAIL); - } - client = irs_context_getdnsclient(irsctx); - - /* Make query name */ - isc_netaddr_fromsockaddr(&netaddr, (const isc_sockaddr_t *)sa); - ptrname = dns_fixedname_initname(&ptrfname); - iresult = dns_byaddr_createptrname(&netaddr, 0, ptrname); - if (iresult != ISC_R_SUCCESS) { - ERR(EAI_FAIL); - } - - /* Get the PTR RRset */ - ISC_LIST_INIT(answerlist); - iresult = dns_client_resolve( - client, ptrname, dns_rdataclass_in, dns_rdatatype_ptr, - DNS_CLIENTRESOPT_ALLOWRUN, &answerlist); - switch (iresult) { - case ISC_R_SUCCESS: - /* - * a 'non-existent' error is not necessarily fatal for - * getnameinfo(). - */ - case DNS_R_NCACHENXDOMAIN: - case DNS_R_NCACHENXRRSET: - break; - case DNS_R_SIGINVALID: - case DNS_R_SIGEXPIRED: - case DNS_R_SIGFUTURE: - case DNS_R_KEYUNAUTHORIZED: - case DNS_R_MUSTBESECURE: - case DNS_R_COVERINGNSEC: - case DNS_R_NOTAUTHORITATIVE: - case DNS_R_NOVALIDKEY: - case DNS_R_NOVALIDDS: - case DNS_R_NOVALIDSIG: - /* - * Don't use ERR as GCC 7 wants to raise a - * warning with ERR about possible falling - * through which is impossible. - */ - result = EAI_INSECUREDATA; - goto cleanup; - default: - ERR(EAI_FAIL); - } - - /* Parse the answer for the hostname */ - for (ptrname = ISC_LIST_HEAD(answerlist); ptrname != NULL; - ptrname = ISC_LIST_NEXT(ptrname, link)) - { - for (rdataset = ISC_LIST_HEAD(ptrname->list); - rdataset != NULL; - rdataset = ISC_LIST_NEXT(rdataset, link)) - { - if (!dns_rdataset_isassociated(rdataset)) { - continue; - } - if (rdataset->type != dns_rdatatype_ptr) { - continue; - } - - for (iresult = dns_rdataset_first(rdataset); - iresult == ISC_R_SUCCESS; - iresult = dns_rdataset_next(rdataset)) - { - dns_rdata_t rdata; - dns_rdata_ptr_t rdata_ptr; - isc_buffer_t b; - - dns_rdata_init(&rdata); - dns_rdataset_current(rdataset, &rdata); - dns_rdata_tostruct(&rdata, &rdata_ptr, - NULL); - - isc_buffer_init(&b, hoststr, - sizeof(hoststr)); - iresult = dns_name_totext( - &rdata_ptr.ptr, true, &b); - dns_rdata_freestruct(&rdata_ptr); - if (iresult == ISC_R_SUCCESS) { - /* - * We ignore the rest of the - * answer. After all, - * getnameinfo() can return - * at most one hostname. - */ - found = true; - isc_buffer_usedregion( - &b, &hostregion); - goto ptrfound; - } - } - } - } - ptrfound: - dns_client_freeresanswer(client, &answerlist); - if (found) { - if ((flags & NI_NOFQDN) != 0) { - p = strchr(hoststr, '.'); - if (p) { - *p = '\0'; - } - } - if (hostregion.length + 1 > hostlen) { - ERR(EAI_OVERFLOW); - } - snprintf(host, hostlen, "%.*s", (int)hostregion.length, - (char *)hostregion.base); - } else { - if ((flags & NI_NAMEREQD) != 0) { - ERR(EAI_NONAME); - } - if (inet_ntop(afd->a_af, addr, numaddr, - sizeof(numaddr)) == NULL) { - ERR(EAI_SYSTEM); - } - if ((strlen(numaddr) + 1) > hostlen) { - ERR(EAI_OVERFLOW); - } - strlcpy(host, numaddr, hostlen); - } - } - result = SUCCESS; - -cleanup: - return (result); -} diff --git a/lib/irs/include/irs/context.h b/lib/irs/include/irs/context.h deleted file mode 100644 index 8a10892f30..0000000000 --- a/lib/irs/include/irs/context.h +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#ifndef IRS_CONTEXT_H -#define IRS_CONTEXT_H 1 - -/*! \file - * - * \brief - * The IRS context module provides an abstract interface to the DNS library - * with an application. An IRS context object initializes and holds various - * resources used in the DNS library. - */ - -#include - -#include - -ISC_LANG_BEGINDECLS - -isc_result_t -irs_context_create(irs_context_t **contextp); -/*%< - * Create an IRS context. It internally initializes the ISC and DNS libraries - * (if not yet), creates a DNS client object and initializes the client using - * the configuration files parsed via the 'resconf' and 'dnsconf' IRS modules. - * Some of the internally initialized objects can be used by the application - * via irs_context_getxxx() functions (see below). - * - * Requires: - * - *\li contextp != NULL && *contextp == NULL. - */ - -isc_result_t -irs_context_get(irs_context_t **contextp); -/*%< - * Return an IRS context for the calling thread. If no IRS context is - * associated to the thread, this function creates a new one by calling - * irs_context_create(), and associates it with the thread as a thread specific - * data value. This function is provided for standard libraries that are - * expected to be thread-safe but do not accept an appropriate IRS context - * as a library parameter, e.g., getaddrinfo(). - * - * Requires: - * - *\li contextp != NULL && *contextp == NULL. - */ - -void -irs_context_destroy(irs_context_t **contextp); -/*%< - * Destroy an IRS context. - * - * Requires: - * - *\li '*contextp' is a valid IRS context. - * - * Ensures: - *\li '*contextp' == NULL. - */ - -isc_mem_t * -irs_context_getmctx(irs_context_t *context); -/*%< - * Return the memory context held in the context. - * - * Requires: - * - *\li 'context' is a valid IRS context. - */ - -isc_appctx_t * -irs_context_getappctx(irs_context_t *context); -/*%< - * Return the application context held in the context. - * - * Requires: - * - *\li 'context' is a valid IRS context. - */ - -isc_taskmgr_t * -irs_context_gettaskmgr(irs_context_t *context); -/*%< - * Return the task manager held in the context. - * - * Requires: - * - *\li 'context' is a valid IRS context. - */ - -isc_timermgr_t * -irs_context_gettimermgr(irs_context_t *context); -/*%< - * Return the timer manager held in the context. - * - * Requires: - * - *\li 'context' is a valid IRS context. - */ - -isc_task_t * -irs_context_gettask(irs_context_t *context); -/*%< - * Return the task object held in the context. - * - * Requires: - * - *\li 'context' is a valid IRS context. - */ - -dns_client_t * -irs_context_getdnsclient(irs_context_t *context); -/*%< - * Return the DNS client object held in the context. - * - * Requires: - * - *\li 'context' is a valid IRS context. - */ - -irs_resconf_t * -irs_context_getresconf(irs_context_t *context); -/*%< - * Return the resolver configuration object held in the context. - * - * Requires: - * - *\li 'context' is a valid IRS context. - */ - -irs_dnsconf_t * -irs_context_getdnsconf(irs_context_t *context); -/*%< - * Return the advanced DNS configuration object held in the context. - * - * Requires: - * - *\li 'context' is a valid IRS context. - */ - -ISC_LANG_ENDDECLS - -#endif /* IRS_CONTEXT_H */ diff --git a/lib/irs/include/irs/dnsconf.h b/lib/irs/include/irs/dnsconf.h deleted file mode 100644 index 42ed7ec709..0000000000 --- a/lib/irs/include/irs/dnsconf.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#ifndef IRS_DNSCONF_H -#define IRS_DNSCONF_H 1 - -/*! \file - * - * \brief - * The IRS dnsconf module parses an "advanced" configuration file related to - * the DNS library, such as trust anchors for DNSSEC validation, and creates - * the corresponding configuration objects for the DNS library modules. - * - * Notes: - * This module is very experimental and the configuration syntax or library - * interfaces may change in future versions. Currently, only static - * key configuration is supported; "trusted-keys" and "trust-anchors"/ - * "managed-keys" statements will be parsed exactly as they are in - * named.conf, except that "trust-anchors" and "managed-keys" entries will - * be treated as if they were configured with "static-key", even if they - * were actually configured with "initial-key". - */ - -#include - -/*% - * A compound structure storing DNS key information mainly for DNSSEC - * validation. A dns_key_t object will be created using the 'keyname' and - * 'keydatabuf' members with the dst_key_fromdns() function. - */ -typedef struct irs_dnsconf_dnskey { - dns_name_t * keyname; - isc_buffer_t *keydatabuf; - ISC_LINK(struct irs_dnsconf_dnskey) link; -} irs_dnsconf_dnskey_t; - -typedef ISC_LIST(irs_dnsconf_dnskey_t) irs_dnsconf_dnskeylist_t; - -ISC_LANG_BEGINDECLS - -isc_result_t -irs_dnsconf_load(isc_mem_t *mctx, const char *filename, irs_dnsconf_t **confp); -/*%< - * Load the "advanced" DNS configuration file 'filename' in the "dns.conf" - * format, and create a new irs_dnsconf_t object from the configuration. - * - * Requires: - * - *\li 'mctx' is a valid memory context. - * - *\li 'filename' != NULL - * - *\li 'confp' != NULL && '*confp' == NULL - */ - -void -irs_dnsconf_destroy(irs_dnsconf_t **confp); -/*%< - * Destroy the dnsconf object. - * - * Requires: - * - *\li '*confp' is a valid dnsconf object. - * - * Ensures: - * - *\li *confp == NULL - */ - -irs_dnsconf_dnskeylist_t * -irs_dnsconf_gettrustedkeys(irs_dnsconf_t *conf); -/*%< - * Return a list of key information stored in 'conf'. - * - * Requires: - * - *\li 'conf' is a valid dnsconf object. - */ - -ISC_LANG_ENDDECLS - -#endif /* IRS_DNSCONF_H */ diff --git a/lib/irs/include/irs/netdb.h b/lib/irs/include/irs/netdb.h deleted file mode 100644 index bf89777473..0000000000 --- a/lib/irs/include/irs/netdb.h +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -/*! \file */ - -#ifndef IRS_NETDB_H -#define IRS_NETDB_H 1 - -#include /* Contractual provision. */ -#include /* Required on FreeBSD (and others?) for size_t. */ - -/* - * Undefine all #defines we are interested in as may or may not have - * defined them. - */ - -/* - * Error return codes from gethostbyname() and gethostbyaddr() - * (left in extern int h_errno). - */ - -#undef NETDB_INTERNAL -#undef NETDB_SUCCESS -#undef HOST_NOT_FOUND -#undef TRY_AGAIN -#undef NO_RECOVERY -#undef NO_DATA -#undef NO_ADDRESS - -#define NETDB_INTERNAL -1 /* see errno */ -#define NETDB_SUCCESS 0 /* no problem */ -#define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */ -#define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */ -#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ -#define NO_DATA 4 /* Valid name, no data record of requested type */ -#define NO_ADDRESS NO_DATA /* no address, look for MX record */ - -/* - * Error return codes from getaddrinfo(). EAI_INSECUREDATA is our own extension - * and it's very unlikely to be already defined, but undef it just in case; it - * at least doesn't do any harm. - */ - -#undef EAI_ADDRFAMILY -#undef EAI_AGAIN -#undef EAI_BADFLAGS -#undef EAI_FAIL -#undef EAI_FAMILY -#undef EAI_MEMORY -#undef EAI_NODATA -#undef EAI_NONAME -#undef EAI_SERVICE -#undef EAI_SOCKTYPE -#undef EAI_SYSTEM -#undef EAI_BADHINTS -#undef EAI_PROTOCOL -#undef EAI_OVERFLOW -#undef EAI_INSECUREDATA -#undef EAI_MAX - -#define EAI_ADDRFAMILY 1 /* address family for hostname not supported */ -#define EAI_AGAIN 2 /* temporary failure in name resolution */ -#define EAI_BADFLAGS 3 /* invalid value for ai_flags */ -#define EAI_FAIL 4 /* non-recoverable failure in name resolution */ -#define EAI_FAMILY 5 /* ai_family not supported */ -#define EAI_MEMORY 6 /* memory allocation failure */ -#define EAI_NODATA 7 /* no address associated with hostname */ -#define EAI_NONAME 8 /* hostname nor servname provided, or not known */ -#define EAI_SERVICE 9 /* servname not supported for ai_socktype */ -#define EAI_SOCKTYPE 10 /* ai_socktype not supported */ -#define EAI_SYSTEM 11 /* system error returned in errno */ -#define EAI_BADHINTS 12 -#define EAI_PROTOCOL 13 -#define EAI_OVERFLOW 14 -#define EAI_INSECUREDATA 15 -#define EAI_MAX 16 - -/* - * Flag values for getaddrinfo() - */ -#undef AI_PASSIVE -#undef AI_CANONNAME -#undef AI_NUMERICHOST - -#define AI_PASSIVE 0x00000001 -#define AI_CANONNAME 0x00000002 -#define AI_NUMERICHOST 0x00000004 - -/* - * Flag values for getipnodebyname() - */ -#undef AI_V4MAPPED -#undef AI_ALL -#undef AI_ADDRCONFIG -#undef AI_DEFAULT - -#define AI_V4MAPPED 0x00000008 -#define AI_ALL 0x00000010 -#define AI_ADDRCONFIG 0x00000020 -#define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG) - -/* - * Constants for getnameinfo() - */ -#undef NI_MAXHOST -#undef NI_MAXSERV - -#define NI_MAXHOST 1025 -#define NI_MAXSERV 32 - -/* - * Flag values for getnameinfo() - */ -#undef NI_NOFQDN -#undef NI_NUMERICHOST -#undef NI_NAMEREQD -#undef NI_NUMERICSERV -#undef NI_DGRAM -#undef NI_NUMERICSCOPE - -#define NI_NOFQDN 0x00000001 -#define NI_NUMERICHOST 0x00000002 -#define NI_NAMEREQD 0x00000004 -#define NI_NUMERICSERV 0x00000008 -#define NI_DGRAM 0x00000010 - -/* - * Define to map into irs_ namespace. - */ - -#define IRS_NAMESPACE - -#ifdef IRS_NAMESPACE - -/* - * Use our versions not the ones from the C library. - */ - -#ifdef getnameinfo -#undef getnameinfo -#endif -#define getnameinfo irs_getnameinfo - -#ifdef getaddrinfo -#undef getaddrinfo -#endif -#define getaddrinfo irs_getaddrinfo - -#ifdef freeaddrinfo -#undef freeaddrinfo -#endif -#define freeaddrinfo irs_freeaddrinfo - -#ifdef gai_strerror -#undef gai_strerror -#endif -#define gai_strerror irs_gai_strerror - -int -getaddrinfo(const char *hostname, const char *servname, - const struct addrinfo *hints, struct addrinfo **res); - -int -getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, - socklen_t hostlen, char *serv, socklen_t servlen, int flags); - -void -freeaddrinfo(struct addrinfo *ai); - -const char * -gai_strerror(int ecode); - -#endif /* IRS_NAMESPACE */ - -/* - * Tell Emacs to use C mode on this file. - * Local variables: - * mode: c - * End: - */ - -#endif /* IRS_NETDB_H */ diff --git a/lib/irs/include/irs/resconf.h b/lib/irs/include/irs/resconf.h index faf55c7d87..de09fa460a 100644 --- a/lib/irs/include/irs/resconf.h +++ b/lib/irs/include/irs/resconf.h @@ -9,8 +9,11 @@ * information regarding copyright ownership. */ -#ifndef IRS_RESCONF_H -#define IRS_RESCONF_H 1 +#pragma once + +#include +#include +#include /*! \file * @@ -20,7 +23,8 @@ * modules. */ -#include +/*%< resolv.conf configuration information */ +typedef struct irs_resconf irs_resconf_t; /*% * A DNS search list specified in the 'domain' or 'search' statements @@ -112,5 +116,3 @@ irs_resconf_getndots(irs_resconf_t *conf); */ ISC_LANG_ENDDECLS - -#endif /* IRS_RESCONF_H */ diff --git a/lib/irs/include/irs/types.h b/lib/irs/include/irs/types.h deleted file mode 100644 index 09ddb46f33..0000000000 --- a/lib/irs/include/irs/types.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#ifndef IRS_TYPES_H -#define IRS_TYPES_H 1 - -/* Core Types. Alphabetized by defined type. */ - -/*%< per-thread IRS context */ -typedef struct irs_context irs_context_t; -/*%< resolv.conf configuration information */ -typedef struct irs_resconf irs_resconf_t; -/*%< advanced DNS-related configuration information */ -typedef struct irs_dnsconf irs_dnsconf_t; - -#endif /* IRS_TYPES_H */ diff --git a/lib/irs/resconf.c b/lib/irs/resconf.c index 532a8cd0e1..e8b77192ec 100644 --- a/lib/irs/resconf.c +++ b/lib/irs/resconf.c @@ -51,7 +51,6 @@ #include #include -#include #include #define IRS_RESCONF_MAGIC ISC_MAGIC('R', 'E', 'S', 'c') diff --git a/lib/irs/tests/resconf_test.c b/lib/irs/tests/resconf_test.c index 2cb81f6c09..b12115b368 100644 --- a/lib/irs/tests/resconf_test.c +++ b/lib/irs/tests/resconf_test.c @@ -27,7 +27,6 @@ #include #include -#include static isc_mem_t *mctx = NULL; diff --git a/lib/irs/win32/include/irs/netdb.h b/lib/irs/win32/include/irs/netdb.h deleted file mode 100644 index be632eb073..0000000000 --- a/lib/irs/win32/include/irs/netdb.h +++ /dev/null @@ -1,205 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -/*! \file */ - -#ifndef IRS_NETDB_H -#define IRS_NETDB_H 1 - -#include /* Required on FreeBSD (and others?) for size_t. */ - -/* - * Define if does not declare struct addrinfo. - */ -#undef ISC_IRS_NEEDADDRINFO - -#ifdef ISC_IRS_NEEDADDRINFO -struct addrinfo { - int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ - int ai_family; /* PF_xxx */ - int ai_socktype; /* SOCK_xxx */ - int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and - * IPv6 */ - size_t ai_addrlen; /* Length of ai_addr */ - char * ai_canonname; /* Canonical name for hostname */ - struct sockaddr *ai_addr; /* Binary address */ - struct addrinfo *ai_next; /* Next structure in linked list */ -}; -#endif /* ifdef ISC_IRS_NEEDADDRINFO */ - -/* - * Undefine all #defines we are interested in as may or may not have - * defined them. - */ - -/* - * Error return codes from gethostbyname() and gethostbyaddr() - * (left in extern int h_errno). - */ - -#undef NETDB_INTERNAL -#undef NETDB_SUCCESS -#undef HOST_NOT_FOUND -#undef TRY_AGAIN -#undef NO_RECOVERY -#undef NO_DATA -#undef NO_ADDRESS - -#define NETDB_INTERNAL -1 /* see errno */ -#define NETDB_SUCCESS 0 /* no problem */ -#define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */ -#define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */ -#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ -#define NO_DATA 4 /* Valid name, no data record of requested type */ -#define NO_ADDRESS NO_DATA /* no address, look for MX record */ - -/* - * Error return codes from getaddrinfo(). EAI_INSECUREDATA is our own extension - * and it's very unlikely to be already defined, but undef it just in case; it - * at least doesn't do any harm. - */ - -#undef EAI_ADDRFAMILY -#undef EAI_AGAIN -#undef EAI_BADFLAGS -#undef EAI_FAIL -#undef EAI_FAMILY -#undef EAI_MEMORY -#undef EAI_NODATA -#undef EAI_NONAME -#undef EAI_SERVICE -#undef EAI_SOCKTYPE -#undef EAI_SYSTEM -#undef EAI_BADHINTS -#undef EAI_PROTOCOL -#undef EAI_OVERFLOW -#undef EAI_INSECUREDATA -#undef EAI_MAX - -#define EAI_ADDRFAMILY 1 /* address family for hostname not supported */ -#define EAI_AGAIN 2 /* temporary failure in name resolution */ -#define EAI_BADFLAGS 3 /* invalid value for ai_flags */ -#define EAI_FAIL 4 /* non-recoverable failure in name resolution */ -#define EAI_FAMILY 5 /* ai_family not supported */ -#define EAI_MEMORY 6 /* memory allocation failure */ -#define EAI_NODATA 7 /* no address associated with hostname */ -#define EAI_NONAME 8 /* hostname nor servname provided, or not known */ -#define EAI_SERVICE 9 /* servname not supported for ai_socktype */ -#define EAI_SOCKTYPE 10 /* ai_socktype not supported */ -#define EAI_SYSTEM 11 /* system error returned in errno */ -#define EAI_BADHINTS 12 -#define EAI_PROTOCOL 13 -#define EAI_OVERFLOW 14 -#define EAI_INSECUREDATA 15 -#define EAI_MAX 16 - -/* - * Flag values for getaddrinfo() - */ -#undef AI_PASSIVE -#undef AI_CANONNAME -#undef AI_NUMERICHOST - -#define AI_PASSIVE 0x00000001 -#define AI_CANONNAME 0x00000002 -#define AI_NUMERICHOST 0x00000004 - -/* - * Flag values for getipnodebyname() - */ -#undef AI_V4MAPPED -#undef AI_ALL -#undef AI_ADDRCONFIG -#undef AI_DEFAULT - -#define AI_V4MAPPED 0x00000008 -#define AI_ALL 0x00000010 -#define AI_ADDRCONFIG 0x00000020 -#define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG) - -/* - * Constants for getnameinfo() - */ -#undef NI_MAXHOST -#undef NI_MAXSERV - -#define NI_MAXHOST 1025 -#define NI_MAXSERV 32 - -/* - * Flag values for getnameinfo() - */ -#undef NI_NOFQDN -#undef NI_NUMERICHOST -#undef NI_NAMEREQD -#undef NI_NUMERICSERV -#undef NI_DGRAM -#undef NI_NUMERICSCOPE - -#define NI_NOFQDN 0x00000001 -#define NI_NUMERICHOST 0x00000002 -#define NI_NAMEREQD 0x00000004 -#define NI_NUMERICSERV 0x00000008 -#define NI_DGRAM 0x00000010 - -/* - * Define to map into irs_ namespace. - */ - -#define IRS_NAMESPACE - -#ifdef IRS_NAMESPACE - -/* - * Use our versions not the ones from the C library. - */ - -#ifdef getnameinfo -#undef getnameinfo -#endif /* ifdef getnameinfo */ -#define getnameinfo irs_getnameinfo - -#ifdef getaddrinfo -#undef getaddrinfo -#endif /* ifdef getaddrinfo */ -#define getaddrinfo irs_getaddrinfo - -#ifdef freeaddrinfo -#undef freeaddrinfo -#endif /* ifdef freeaddrinfo */ -#define freeaddrinfo irs_freeaddrinfo - -#ifdef gai_strerror -#undef gai_strerror -#endif /* ifdef gai_strerror */ -#define gai_strerror irs_gai_strerror - -#endif /* ifdef IRS_NAMESPACE */ - -int -getaddrinfo(const char *, const char *, const struct addrinfo *, - struct addrinfo **); -int -getnameinfo(const struct sockaddr *, socklen_t, char *, DWORD, char *, DWORD, - int); -void -freeaddrinfo(struct addrinfo *); -char * -gai_strerror(int); - -/* - * Tell Emacs to use C mode on this file. - * Local variables: - * mode: c - * End: - */ - -#endif /* IRS_NETDB_H */ diff --git a/lib/irs/win32/libirs.def b/lib/irs/win32/libirs.def index d4e9f6f4dc..9a86c7c63c 100644 --- a/lib/irs/win32/libirs.def +++ b/lib/irs/win32/libirs.def @@ -2,24 +2,6 @@ LIBRARY libirs ; Exported Functions EXPORTS -irs_context_create -irs_context_destroy -irs_context_get -irs_context_getappctx -irs_context_getdnsclient -irs_context_getdnsconf -irs_context_getmctx -irs_context_getresconf -irs_context_gettask -irs_context_gettaskmgr -irs_context_gettimermgr -irs_dnsconf_destroy -irs_dnsconf_gettrustedkeys -irs_dnsconf_load -irs_freeaddrinfo -irs_gai_strerror -irs_getaddrinfo -irs_getnameinfo irs_resconf_destroy irs_resconf_getnameservers irs_resconf_getndots diff --git a/lib/irs/win32/libirs.vcxproj.filters.in b/lib/irs/win32/libirs.vcxproj.filters.in index 670a65c18f..ca2d7c1b57 100644 --- a/lib/irs/win32/libirs.vcxproj.filters.in +++ b/lib/irs/win32/libirs.vcxproj.filters.in @@ -21,40 +21,13 @@ Source Files - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - Source Files - - Header Files - - - Header Files - - - Header Files - Header Files - - Header Files - diff --git a/lib/irs/win32/libirs.vcxproj.in b/lib/irs/win32/libirs.vcxproj.in index 0f24284d8e..eaca5dac28 100644 --- a/lib/irs/win32/libirs.vcxproj.in +++ b/lib/irs/win32/libirs.vcxproj.in @@ -118,20 +118,10 @@ - - - - - - - - - - diff --git a/lib/samples/Makefile.am b/lib/samples/Makefile.am index 6f18fcd536..54e2b5fc5d 100644 --- a/lib/samples/Makefile.am +++ b/lib/samples/Makefile.am @@ -8,7 +8,6 @@ AM_CPPFLAGS += \ noinst_PROGRAMS = \ resolve \ sample-async \ - sample-gai \ sample-update \ sample-request \ nsprobe @@ -19,9 +18,6 @@ resolve_LDADD = $(LIBISC_LIBS) $(LIBIRS_LIBS) $(LIBDNS_LIBS) sample_async_SOURCES = sample-async.c sample_async_LDADD = $(LIBISC_LIBS) $(LIBDNS_LIBS) -sample_gai_SOURCES = sample-gai.c -sample_gai_LDADD = $(LIBIRS_LIBS) - sample_update_SOURCES = sample-update.c sample_update_LDADD = $(LIBISC_LIBS) $(LIBDNS_LIBS) diff --git a/lib/samples/resolve.c b/lib/samples/resolve.c index cdfe07f104..4f50826b0c 100644 --- a/lib/samples/resolve.c +++ b/lib/samples/resolve.c @@ -51,7 +51,6 @@ #include -#include #include static char *algname; diff --git a/lib/samples/sample-gai.c b/lib/samples/sample-gai.c deleted file mode 100644 index 92c0d3196a..0000000000 --- a/lib/samples/sample-gai.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) Internet Systems Consortium, Inc. ("ISC") - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * See the COPYRIGHT file distributed with this work for additional - * information regarding copyright ownership. - */ - -#include -#include -#include - -#include -#include - -#include - -static void -do_gai(int family, char *hostname) { - struct addrinfo hints, *res, *res0; - int error; - char namebuf[1024], addrbuf[1024], servbuf[1024]; - - memset(&hints, 0, sizeof(hints)); - hints.ai_family = family; - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_CANONNAME; - error = getaddrinfo(hostname, "http", &hints, &res0); - if (error) { - fprintf(stderr, "getaddrinfo failed for %s,family=%d: %s\n", - hostname, family, gai_strerror(error)); - return; - } - - for (res = res0; res; res = res->ai_next) { - error = getnameinfo(res->ai_addr, (socklen_t)res->ai_addrlen, - addrbuf, sizeof(addrbuf), NULL, 0, - NI_NUMERICHOST); - if (error == 0) { - error = getnameinfo(res->ai_addr, - (socklen_t)res->ai_addrlen, namebuf, - sizeof(namebuf), servbuf, - sizeof(servbuf), 0); - } - if (error != 0) { - fprintf(stderr, "getnameinfo failed: %s\n", - gai_strerror(error)); - } else { - printf("%s(%s/%s)=%s:%s\n", hostname, res->ai_canonname, - addrbuf, namebuf, servbuf); - } - } - - freeaddrinfo(res0); -} - -int -main(int argc, char *argv[]) { - if (argc < 2) { - exit(1); - } - - do_gai(AF_INET, argv[1]); - do_gai(AF_INET6, argv[1]); - do_gai(AF_UNSPEC, argv[1]); - - return (0); -} diff --git a/util/copyrights b/util/copyrights index 3e834da26a..293a843c85 100644 --- a/util/copyrights +++ b/util/copyrights @@ -1853,16 +1853,7 @@ ./lib/dns/zoneverify.c C 2018,2019,2020 ./lib/dns/zt.c C 1999,2000,2001,2002,2004,2005,2006,2007,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020 ./lib/irs/api X 2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020 -./lib/irs/context.c C 2009,2014,2016,2018,2019,2020 -./lib/irs/dnsconf.c C 2009,2012,2016,2018,2019,2020 -./lib/irs/gai_strerror.c C 2009,2014,2016,2018,2019,2020 -./lib/irs/getaddrinfo.c C 2009,2012,2013,2014,2015,2016,2017,2018,2019,2020 -./lib/irs/getnameinfo.c C 2009,2011,2012,2013,2014,2016,2017,2018,2019,2020 -./lib/irs/include/irs/context.h C 2009,2016,2018,2019,2020 -./lib/irs/include/irs/dnsconf.h C 2009,2016,2018,2019,2020 -./lib/irs/include/irs/netdb.h C 2009,2016,2017,2018,2019,2020 ./lib/irs/include/irs/resconf.h C 2009,2014,2016,2018,2019,2020 -./lib/irs/include/irs/types.h C 2009,2016,2018,2019,2020 ./lib/irs/resconf.c C 2009,2011,2012,2014,2015,2016,2017,2018,2019,2020 ./lib/irs/tests/resconf_test.c C 2016,2018,2019,2020 ./lib/irs/tests/testdata/domain.conf CONF-SH 2016,2018,2019 @@ -1883,7 +1874,6 @@ ./lib/irs/tests/testdata/timeout.conf CONF-SH 2016,2018,2019 ./lib/irs/tests/testdata/unknown.conf CONF-SH 2016,2018,2019 ./lib/irs/win32/DLLMain.c C 2014,2016,2018,2019,2020 -./lib/irs/win32/include/irs/netdb.h C 2014,2016,2017,2018,2019,2020 ./lib/irs/win32/libirs.def X 2014,2018,2019,2020 ./lib/irs/win32/libirs.vcxproj.filters.in X 2014,2015,2016,2018,2019,2020 ./lib/irs/win32/libirs.vcxproj.in X 2014,2015,2016,2017,2018,2019,2020 @@ -2271,7 +2261,6 @@ ./lib/samples/resolve.c C 2009,2012,2013,2014,2015,2016,2017,2018,2019,2020 ./lib/samples/rootkey.sh SH 2013,2016,2018,2019,2020 ./lib/samples/sample-async.c C 2009,2013,2014,2015,2016,2018,2019,2020 -./lib/samples/sample-gai.c C 2009,2012,2013,2014,2015,2016,2018,2019,2020 ./lib/samples/sample-request.c C 2009,2012,2013,2014,2015,2016,2018,2019,2020 ./lib/samples/sample-update.c C 2009,2010,2012,2013,2014,2015,2016,2017,2018,2019,2020 ./lib/samples/win32/async.vcxproj.filters.in X 2014,2015,2018,2019,2020 From ed13f1b595ede460d47f17878f1e2ce217f1f5fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 23 Apr 2020 11:54:54 +0200 Subject: [PATCH 2/2] Add CHANGES note for GL #1758 --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 3bb189a332..cec94bbd5c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5393. [cleanup] Unused or redundant APIs were removed from libirs. + [GL #1758] + 5392. [bug] It was possible for named to crash during shutdown or reconfiguration if an RPZ zone was still being updated. [GL #1779]