* [gentoo-commits] repo/gentoo:master commit in: net-dns/c-ares/files/, net-dns/c-ares/
@ 2016-02-25 1:41 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2016-02-25 1:41 UTC (permalink / raw
To: gentoo-commits
commit: f9409795d6f1c3b475bbb5cd0c69c262cd3b26fb
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 01:50:59 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 01:51:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9409795
net-dns/c-ares: disable test, bug #575470
Package-Manager: portage-2.2.26
net-dns/c-ares/c-ares-1.11.0.ebuild | 7 ++++++-
net-dns/c-ares/files/remove-tests.patch | 14 ++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/net-dns/c-ares/c-ares-1.11.0.ebuild b/net-dns/c-ares/c-ares-1.11.0.ebuild
index 374cbc8..64f8bc8 100644
--- a/net-dns/c-ares/c-ares-1.11.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.11.0.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils multilib-minimal
+inherit autotools eutils multilib-minimal
DESCRIPTION="C library that resolves names asynchronously"
HOMEPAGE="http://c-ares.haxx.se/"
@@ -23,6 +23,11 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/ares_build.h
)
+src_prepare() {
+ epatch "${FILESDIR}"/remove-tests.patch
+ eautoreconf
+}
+
multilib_src_configure() {
ECONF_SOURCE=${S} \
econf \
diff --git a/net-dns/c-ares/files/remove-tests.patch b/net-dns/c-ares/files/remove-tests.patch
new file mode 100644
index 0000000..6b4ce0a
--- /dev/null
+++ b/net-dns/c-ares/files/remove-tests.patch
@@ -0,0 +1,14 @@
+diff -Naur c-ares-1.11.0.orig/configure.ac c-ares-1.11.0/configure.ac
+--- c-ares-1.11.0.orig/configure.ac 2016-02-19 09:09:13.000000000 +0000
++++ c-ares-1.11.0/configure.ac 2016-02-25 01:26:53.092956316 +0000
+@@ -877,10 +877,6 @@
+
+ XC_CHECK_BUILD_FLAGS
+
+-if test "x$cross_compiling" = "xno"; then
+- AC_CONFIG_SUBDIRS([test])
+-fi
+-
+ AC_CONFIG_FILES([Makefile libcares.pc])
+ AC_OUTPUT
+ XC_AMEND_DISTCLEAN(['.'])
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/c-ares/files/, net-dns/c-ares/
@ 2023-11-17 12:20 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-11-17 12:20 UTC (permalink / raw
To: gentoo-commits
commit: 13cec3831f51a7fca63a549c46b78566c89eeb3d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 17 12:20:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 12:20:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13cec383
net-dns/c-ares: backport /etc/hosts lookup performance fixes
With particular thanks to Daniel and Brad for chipping in on the bug and looking
into it quickly.
Closes: https://bugs.gentoo.org/917400
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-dns/c-ares/c-ares-1.22.0-r1.ebuild | 109 ++++++
.../files/c-ares-1.22.0-hosts-lookup-perf.patch | 403 +++++++++++++++++++++
.../c-ares/files/c-ares-1.22.0-hosts-lookup.patch | 109 ++++++
3 files changed, 621 insertions(+)
diff --git a/net-dns/c-ares/c-ares-1.22.0-r1.ebuild b/net-dns/c-ares/c-ares-1.22.0-r1.ebuild
new file mode 100644
index 000000000000..5356eceefd2a
--- /dev/null
+++ b/net-dns/c-ares/c-ares-1.22.0-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
+inherit edo multilib-minimal verify-sig
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="https://c-ares.org/"
+SRC_URI="
+ https://c-ares.org/download/${P}.tar.gz
+ verify-sig? ( https://c-ares.org/download/${P}.tar.gz.asc )
+"
+
+# ISC for lib/{bitncmp.c,inet_ntop.c,inet_net_pton.c} (bug #912405)
+LICENSE="MIT ISC"
+# Subslot = SONAME of libcares.so.2
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
+
+DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-hosts-lookup.patch
+ "${FILESDIR}"/${P}-hosts-lookup-perf.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/ares_build.h
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ # Checking for obsolete headers
+ malloc
+ calloc
+ free
+
+ # Non-existent on Linux
+ closesocket
+ CloseSocket
+ ioctlsocket
+ bitncmp
+)
+
+multilib_src_configure() {
+ # These configure tests take a long time to run. The args one runs in O(n^4).
+ export ac_cv_func_getnameinfo='yes'
+ export ac_cv_func_recvfrom='yes'
+ export ac_cv_func_recv='yes'
+ export ac_cv_func_send='yes'
+ export curl_cv_func_getnameinfo_args='const struct sockaddr *,socklen_t,size_t,int'
+ export curl_cv_func_recv_args='int,void *,size_t,int,int'
+ export curl_cv_func_recvfrom_args='int,void *,size_t,int,struct sockaddr *,socklen_t *,int'
+ export curl_cv_func_send_args='int,const void *,size_t,int,int'
+ export curl_cv_getnameinfo='yes'
+ export curl_cv_recv='yes'
+ export curl_cv_recvfrom='yes'
+ export curl_cv_send='yes'
+
+ local myeconfargs=(
+ --cache-file="${BUILD_DIR}"/config.cache
+
+ --enable-nonblocking
+ --enable-symbol-hiding
+ $(use_enable static-libs static)
+ $(use_enable test tests)
+ )
+
+ # Needed for running unit tests only
+ # Violates sandbox and tests pass fine without
+ export ax_cv_uts_namespace=no
+ export ax_cv_user_namespace=no
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ cd "${BUILD_DIR}"/test || die
+
+ # We're skipping the "real" network tests with the filter
+ # see https://github.com/c-ares/c-ares/tree/main/test
+ local network_tests=(
+ # Most live tests have Live in the name
+ *Live*
+ # These don't but are still in ares-test-live.cc => live
+ *GetTCPSock*
+ *TimeoutValue*
+ *GetSock*
+ *GetSock_virtualized*
+ *VerifySocketFunctionCallback*
+ # Seems flaky, even run manually
+ # https://github.com/c-ares/c-ares/commit/9e542a8839f81c990bb0dff14beeaf9aa6bcc18d
+ *MockUDPMaxQueriesTest.GetHostByNameParallelLookups*
+ )
+
+ # The format for disabling test1, test2, and test3 looks like:
+ # -test1:test2:test3
+ edo ./arestest --gtest_filter=-$(echo $(IFS=:; echo "${network_tests[*]}"))
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-dns/c-ares/files/c-ares-1.22.0-hosts-lookup-perf.patch b/net-dns/c-ares/files/c-ares-1.22.0-hosts-lookup-perf.patch
new file mode 100644
index 000000000000..4830c9cb97e9
--- /dev/null
+++ b/net-dns/c-ares/files/c-ares-1.22.0-hosts-lookup-perf.patch
@@ -0,0 +1,403 @@
+https://github.com/c-ares/c-ares/commit/2724f0e26c8875ce194d68dc15840e9435a1c805
+
+From 2724f0e26c8875ce194d68dc15840e9435a1c805 Mon Sep 17 00:00:00 2001
+From: Brad House <brad@brad-house.com>
+Date: Thu, 16 Nov 2023 15:20:48 -0500
+Subject: [PATCH] optimize: large /etc/hosts files reading
+
+profiling found some hot paths that could be optimized to reduce
+insert times into the cache.
+
+Fix By: Brad House (@bradh352)
+--- a/src/lib/ares__hosts_file.c
++++ b/src/lib/ares__hosts_file.c
+@@ -313,81 +313,51 @@ static ares_hosts_file_t *ares__hosts_file_create(const char *filename)
+ return NULL;
+ }
+
+-static ares_bool_t ares__hosts_entry_ipaddr_exists(ares_hosts_entry_t *entry,
+- const char *ipaddr)
+-{
+- ares__llist_node_t *node;
+-
+- for (node = ares__llist_node_first(entry->ips); node != NULL;
+- node = ares__llist_node_next(node)) {
+- const char *myaddr = ares__llist_node_val(node);
+- if (strcmp(myaddr, ipaddr) == 0) {
+- return ARES_TRUE;
+- }
+- }
+-
+- return ARES_FALSE;
+-}
+-
+-static ares_bool_t ares__hosts_entry_host_exists(ares_hosts_entry_t *entry,
+- const char *host)
+-{
+- ares__llist_node_t *node;
+-
+- for (node = ares__llist_node_first(entry->ips); node != NULL;
+- node = ares__llist_node_next(node)) {
+- const char *myhost = ares__llist_node_val(node);
+- if (strcasecmp(myhost, host) == 0) {
+- return ARES_TRUE;
+- }
+- }
+-
+- return ARES_FALSE;
+-}
++typedef enum {
++ ARES_MATCH_NONE = 0,
++ ARES_MATCH_IPADDR = 1,
++ ARES_MATCH_HOST = 2
++} ares_hosts_file_match_t;
+
+-static ares_status_t ares__hosts_file_merge_entry(ares_hosts_entry_t *existing,
+- ares_hosts_entry_t *entry)
++static ares_status_t ares__hosts_file_merge_entry(ares_hosts_file_t *hf,
++ ares_hosts_entry_t *existing,
++ ares_hosts_entry_t *entry,
++ ares_hosts_file_match_t matchtype)
+ {
+ ares__llist_node_t *node;
+
+- while ((node = ares__llist_node_first(entry->ips)) != NULL) {
+- char *ipaddr = ares__llist_node_claim(node);
++ /* If we matched on IP address, we know there can only be 1, so there's no
++ * reason to do anything */
++ if (matchtype != ARES_MATCH_IPADDR) {
++ while ((node = ares__llist_node_first(entry->ips)) != NULL) {
++ const char *ipaddr = ares__llist_node_val(node);
+
+- if (ares__hosts_entry_ipaddr_exists(existing, ipaddr)) {
+- ares_free(ipaddr);
+- continue;
+- }
++ if (ares__htable_strvp_get_direct(hf->iphash, ipaddr) != NULL) {
++ ares__llist_node_destroy(node);
++ continue;
++ }
+
+- if (ares__llist_insert_last(existing->ips, ipaddr) == NULL) {
+- ares_free(ipaddr);
+- return ARES_ENOMEM;
++ ares__llist_node_move_parent_last(node, existing->ips);
+ }
+ }
+
+
+ while ((node = ares__llist_node_first(entry->hosts)) != NULL) {
+- char *hostname = ares__llist_node_claim(node);
++ const char *hostname = ares__llist_node_val(node);
+
+- if (ares__hosts_entry_host_exists(existing, hostname)) {
+- ares_free(hostname);
++ if (ares__htable_strvp_get_direct(hf->hosthash, hostname) != NULL) {
++ ares__llist_node_destroy(node);
+ continue;
+ }
+
+- if (ares__llist_insert_last(existing->hosts, hostname) == NULL) {
+- ares_free(hostname);
+- return ARES_ENOMEM;
+- }
++ ares__llist_node_move_parent_last(node, existing->hosts);
+ }
+
+ ares__hosts_entry_destroy(entry);
+ return ARES_SUCCESS;
+ }
+
+-typedef enum {
+- ARES_MATCH_NONE = 0,
+- ARES_MATCH_IPADDR = 1,
+- ARES_MATCH_HOST = 2
+-} ares_hosts_file_match_t;
++
+
+ static ares_hosts_file_match_t
+ ares__hosts_file_match(const ares_hosts_file_t *hf, ares_hosts_entry_t *entry,
+@@ -435,7 +405,7 @@ static ares_status_t ares__hosts_file_add(ares_hosts_file_t *hosts,
+ matchtype = ares__hosts_file_match(hosts, entry, &match);
+
+ if (matchtype != ARES_MATCH_NONE) {
+- status = ares__hosts_file_merge_entry(match, entry);
++ status = ares__hosts_file_merge_entry(hosts, match, entry, matchtype);
+ if (status != ARES_SUCCESS) {
+ ares__hosts_entry_destroy(entry);
+ return status;
+@@ -481,6 +451,22 @@ static ares_status_t ares__hosts_file_add(ares_hosts_file_t *hosts,
+ return ARES_SUCCESS;
+ }
+
++static ares_bool_t ares__hosts_entry_isdup(ares_hosts_entry_t *entry,
++ const char *host)
++{
++ ares__llist_node_t *node;
++
++ for (node = ares__llist_node_first(entry->ips); node != NULL;
++ node = ares__llist_node_next(node)) {
++ const char *myhost = ares__llist_node_val(node);
++ if (strcasecmp(myhost, host) == 0) {
++ return ARES_TRUE;
++ }
++ }
++
++ return ARES_FALSE;
++}
++
+ static ares_status_t ares__parse_hosts_hostnames(ares__buf_t *buf,
+ ares_hosts_entry_t *entry)
+ {
+@@ -531,7 +517,7 @@ static ares_status_t ares__parse_hosts_hostnames(ares__buf_t *buf,
+ }
+
+ /* Don't add a duplicate to the same entry */
+- if (ares__hosts_entry_host_exists(entry, hostname)) {
++ if (ares__hosts_entry_isdup(entry, hostname)) {
+ continue;
+ }
+
+--- a/src/lib/ares__htable.c
++++ b/src/lib/ares__htable.c
+@@ -66,7 +66,7 @@ static unsigned int ares__htable_generate_seed(ares__htable_t *htable)
+
+ static void ares__htable_buckets_destroy(ares__llist_t **buckets,
+ unsigned int size,
+- unsigned char destroy_vals)
++ ares_bool_t destroy_vals)
+ {
+ unsigned int i;
+
+@@ -94,7 +94,7 @@ void ares__htable_destroy(ares__htable_t *htable)
+ if (htable == NULL) {
+ return;
+ }
+- ares__htable_buckets_destroy(htable->buckets, htable->size, 1);
++ ares__htable_buckets_destroy(htable->buckets, htable->size, ARES_TRUE);
+ ares_free(htable);
+ }
+
+@@ -180,11 +180,40 @@ static ares_bool_t ares__htable_expand(ares__htable_t *htable)
+
+ for (i = 0; i < old_size; i++) {
+ ares__llist_node_t *node;
+- for (node = ares__llist_node_first(htable->buckets[i]); node != NULL;
+- node = ares__llist_node_next(node)) {
++
++ /* Nothing in this bucket */
++ if (htable->buckets[i] == NULL)
++ continue;
++
++ /* Fast past optimization (most likely case), there is likely only a single
++ * entry in both the source and destination, check for this to confirm and
++ * if so, just move the bucket over */
++ if (ares__llist_len(htable->buckets[i]) == 1) {
++ void *val = ares__llist_first_val(htable->buckets[i]);
++ size_t idx = HASH_IDX(htable, htable->bucket_key(val));
++
++ if (buckets[idx] == NULL) {
++ /* Swap! */
++ buckets[idx] = htable->buckets[i];
++ htable->buckets[i] = NULL;
++ continue;
++ }
++ }
++
++ /* Slow path, collisions */
++ while ((node = ares__llist_node_first(htable->buckets[i])) != NULL) {
+ void *val = ares__llist_node_val(node);
+ size_t idx = HASH_IDX(htable, htable->bucket_key(val));
+
++ /* Try fast path again as maybe we popped one collision off and the
++ * next we can reuse the llist parent */
++ if (buckets[idx] == NULL && ares__llist_len(htable->buckets[i]) == 1) {
++ /* Swap! */
++ buckets[idx] = htable->buckets[i];
++ htable->buckets[i] = NULL;
++ break;
++ }
++
+ if (buckets[idx] == NULL) {
+ buckets[idx] = ares__llist_create(htable->bucket_free);
+ }
+@@ -192,19 +221,17 @@ static ares_bool_t ares__htable_expand(ares__htable_t *htable)
+ goto fail;
+ }
+
+- if (ares__llist_insert_first(buckets[idx], val) == NULL) {
+- goto fail;
+- }
++ ares__llist_node_move_parent_first(node, buckets[idx]);
+ }
+ }
+
+ /* Swap out buckets */
+- ares__htable_buckets_destroy(htable->buckets, old_size, 0);
++ ares__htable_buckets_destroy(htable->buckets, old_size, ARES_FALSE);
+ htable->buckets = buckets;
+ return ARES_TRUE;
+
+ fail:
+- ares__htable_buckets_destroy(buckets, htable->size, 0);
++ ares__htable_buckets_destroy(buckets, htable->size, ARES_FALSE);
+ htable->size = old_size;
+
+ return ARES_FALSE;
+--- a/src/lib/ares__llist.c
++++ b/src/lib/ares__llist.c
+@@ -71,24 +71,14 @@ typedef enum {
+ ARES__LLIST_INSERT_BEFORE
+ } ares__llist_insert_type_t;
+
+-static ares__llist_node_t *ares__llist_insert_at(ares__llist_t *list,
+- ares__llist_insert_type_t type,
+- ares__llist_node_t *at,
+- void *val)
++static void ares__llist_attach_at(ares__llist_t *list,
++ ares__llist_insert_type_t type,
++ ares__llist_node_t *at,
++ ares__llist_node_t *node)
+ {
+- ares__llist_node_t *node = NULL;
+-
+- if (list == NULL || val == NULL) {
+- return NULL;
+- }
+-
+- node = ares_malloc_zero(sizeof(*node));
+-
+- if (node == NULL) {
+- return NULL;
+- }
++ if (list == NULL || node == NULL)
++ return;
+
+- node->data = val;
+ node->parent = list;
+
+ if (type == ARES__LLIST_INSERT_BEFORE && (at == list->head || at == NULL)) {
+@@ -126,6 +116,27 @@ static ares__llist_node_t *ares__llist_insert_at(ares__llist_t *list,
+ }
+
+ list->cnt++;
++}
++
++static ares__llist_node_t *ares__llist_insert_at(ares__llist_t *list,
++ ares__llist_insert_type_t type,
++ ares__llist_node_t *at,
++ void *val)
++{
++ ares__llist_node_t *node = NULL;
++
++ if (list == NULL || val == NULL) {
++ return NULL;
++ }
++
++ node = ares_malloc_zero(sizeof(*node));
++
++ if (node == NULL) {
++ return NULL;
++ }
++
++ node->data = val;
++ ares__llist_attach_at(list, type, at, node);
+
+ return node;
+ }
+@@ -233,17 +244,14 @@ void *ares__llist_last_val(ares__llist_t *list)
+ return ares__llist_node_val(ares__llist_node_last(list));
+ }
+
+-void *ares__llist_node_claim(ares__llist_node_t *node)
++static void ares__llist_node_detach(ares__llist_node_t *node)
+ {
+- void *val;
+ ares__llist_t *list;
+
+- if (node == NULL) {
+- return NULL;
+- }
++ if (node == NULL)
++ return;
+
+ list = node->parent;
+- val = node->data;
+
+ if (node->prev) {
+ node->prev->next = node->next;
+@@ -260,9 +268,22 @@ void *ares__llist_node_claim(ares__llist_node_t *node)
+ if (node == list->tail) {
+ list->tail = node->prev;
+ }
+- ares_free(node);
+
++ node->parent = NULL;
+ list->cnt--;
++}
++
++void *ares__llist_node_claim(ares__llist_node_t *node)
++{
++ void *val;
++
++ if (node == NULL) {
++ return NULL;
++ }
++
++ val = node->data;
++ ares__llist_node_detach(node);
++ ares_free(node);
+
+ return val;
+ }
+@@ -313,3 +334,23 @@ void ares__llist_destroy(ares__llist_t *list)
+ }
+ ares_free(list);
+ }
++
++void ares__llist_node_move_parent_last(ares__llist_node_t *node,
++ ares__llist_t *new_parent)
++{
++ if (node == NULL || new_parent == NULL)
++ return;
++
++ ares__llist_node_detach(node);
++ ares__llist_attach_at(new_parent, ARES__LLIST_INSERT_TAIL, NULL, node);
++}
++
++void ares__llist_node_move_parent_first(ares__llist_node_t *node,
++ ares__llist_t *new_parent)
++{
++ if (node == NULL || new_parent == NULL)
++ return;
++
++ ares__llist_node_detach(node);
++ ares__llist_attach_at(new_parent, ARES__LLIST_INSERT_HEAD, NULL, node);
++}
+--- a/src/lib/ares__llist.h
++++ b/src/lib/ares__llist.h
+@@ -198,6 +198,23 @@ void ares__llist_node_destroy(ares__llist_node_t *node);
+ */
+ void ares__llist_destroy(ares__llist_t *list);
+
++/*! Detach node from the current list and re-attach it to the new list as the
++ * last entry.
++ *
++ * \param[in] node node to move
++ * \param[in] parent new list
++ */
++void ares__llist_node_move_parent_last(ares__llist_node_t *node,
++ ares__llist_t *new_parent);
++
++/*! Detach node from the current list and re-attach it to the new list as the
++ * first entry.
++ *
++ * \param[in] node node to move
++ * \param[in] parent new list
++ */
++void ares__llist_node_move_parent_first(ares__llist_node_t *node,
++ ares__llist_t *new_parent);
+ /*! @} */
+
+ #endif /* __ARES__LLIST_H */
+
diff --git a/net-dns/c-ares/files/c-ares-1.22.0-hosts-lookup.patch b/net-dns/c-ares/files/c-ares-1.22.0-hosts-lookup.patch
new file mode 100644
index 000000000000..c0e76ca7e83c
--- /dev/null
+++ b/net-dns/c-ares/files/c-ares-1.22.0-hosts-lookup.patch
@@ -0,0 +1,109 @@
+https://github.com/c-ares/c-ares/commit/a3631763ca30804c3095d99474e05625f0c9b0fa
+
+From a3631763ca30804c3095d99474e05625f0c9b0fa Mon Sep 17 00:00:00 2001
+From: Brad House <brad@brad-house.com>
+Date: Thu, 16 Nov 2023 12:19:39 -0500
+Subject: [PATCH] Fix /etc/hosts processing performance with all entries using
+ same IP address
+
+Some users use blacklist files like https://github.com/StevenBlack/hosts which
+can contain 200k+ host entries all pointing to 0.0.0.0. Due to the merge
+logic in the new hosts processor, all those entries will be associated as
+aliases for the same ip address.
+
+The first issue is that it attempts to check the status of all the hosts for
+the merged entry, when it should only be checking the new hosts added to the
+merged entry, so this caused exponential time as the entries got longer.
+
+The next issue is if searching for one of those hosts, it would append all
+the matches as cnames/aliases, but there is zero use for 200k aliases
+being appended to a lookup, so we are artificially capping this to 100.
+
+Bug report reference: https://bugs.gentoo.org/917400
+
+Fix By: Brad House (@bradh352)
+--- a/src/lib/ares__hosts_file.c
++++ b/src/lib/ares__hosts_file.c
+@@ -422,9 +422,15 @@ static ares_status_t ares__hosts_file_add(ares_hosts_file_t *hosts,
+ ares_hosts_entry_t *entry)
+ {
+ ares_hosts_entry_t *match = NULL;
+- ares_status_t status = ARES_SUCCESS;
++ ares_status_t status = ARES_SUCCESS;
+ ares__llist_node_t *node;
+ ares_hosts_file_match_t matchtype;
++ size_t num_hostnames;
++
++ /* Record the number of hostnames in this entry file. If we merge into an
++ * existing record, these will be *appended* to the entry, so we'll count
++ * backwards when adding to the hosts hashtable */
++ num_hostnames = ares__llist_len(entry->hosts);
+
+ matchtype = ares__hosts_file_match(hosts, entry, &match);
+
+@@ -450,10 +456,17 @@ static ares_status_t ares__hosts_file_add(ares_hosts_file_t *hosts,
+ }
+ }
+
+- for (node = ares__llist_node_first(entry->hosts); node != NULL;
+- node = ares__llist_node_next(node)) {
++ /* Go backwards, on a merge, hostnames are appended. Breakout once we've
++ * consumed all the hosts that we appended */
++ for (node = ares__llist_node_last(entry->hosts); node != NULL;
++ node = ares__llist_node_prev(node)) {
+ const char *val = ares__llist_node_val(node);
+
++ if (num_hostnames == 0)
++ break;
++
++ num_hostnames--;
++
+ /* first hostname match wins. If we detect a duplicate hostname for another
+ * ip it will automatically be added to the same entry */
+ if (ares__htable_strvp_get(hosts->hosthash, val, NULL)) {
+@@ -950,6 +963,12 @@ ares_status_t ares__hosts_entry_to_hostent(const ares_hosts_entry_t *entry,
+
+ /* Copy aliases */
+ naliases = ares__llist_len(entry->hosts) - 1;
++
++ /* Cap at 100, some people use https://github.com/StevenBlack/hosts and we
++ * don't need 200k+ aliases */
++ if (naliases > 100)
++ naliases = 100;
++
+ (*hostent)->h_aliases =
+ ares_malloc_zero((naliases + 1) * sizeof(*(*hostent)->h_aliases));
+ if ((*hostent)->h_aliases == NULL) {
+@@ -968,6 +987,10 @@ ares_status_t ares__hosts_entry_to_hostent(const ares_hosts_entry_t *entry,
+ goto fail;
+ }
+ idx++;
++
++ /* Break out if artificially capped */
++ if (idx == naliases)
++ break;
+ node = ares__llist_node_next(node);
+ }
+
+@@ -988,6 +1011,7 @@ static ares_status_t
+ const char *primaryhost;
+ ares__llist_node_t *node;
+ ares_status_t status;
++ size_t cnt = 0;
+
+ node = ares__llist_node_first(entry->hosts);
+ primaryhost = ares__llist_node_val(node);
+@@ -997,6 +1021,12 @@ static ares_status_t
+ while (node != NULL) {
+ const char *host = ares__llist_node_val(node);
+
++ /* Cap at 100 entries. , some people use https://github.com/StevenBlack/hosts
++ * and we don't need 200k+ aliases */
++ cnt++;
++ if (cnt > 100)
++ break;
++
+ cname = ares__append_addrinfo_cname(&cnames);
+ if (cname == NULL) {
+ status = ARES_ENOMEM;
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/c-ares/files/, net-dns/c-ares/
@ 2024-01-19 7:10 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-01-19 7:10 UTC (permalink / raw
To: gentoo-commits
commit: a28f282c916409fa07de88716d221a93c83cf976
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 07:09:58 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 07:10:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a28f282c
net-dns/c-ares: backport RR sanity check fix
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-dns/c-ares/c-ares-1.25.0-r1.ebuild | 96 ++++++++++++
.../files/c-ares-1.25.0-fix-sanity-check-rr.patch | 166 +++++++++++++++++++++
2 files changed, 262 insertions(+)
diff --git a/net-dns/c-ares/c-ares-1.25.0-r1.ebuild b/net-dns/c-ares/c-ares-1.25.0-r1.ebuild
new file mode 100644
index 000000000000..f765378e9adf
--- /dev/null
+++ b/net-dns/c-ares/c-ares-1.25.0-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
+inherit edo multilib-minimal verify-sig
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="https://c-ares.org/"
+SRC_URI="
+ https://c-ares.org/download/${P}.tar.gz
+ verify-sig? ( https://c-ares.org/download/${P}.tar.gz.asc )
+"
+
+# ISC for lib/{bitncmp.c,inet_ntop.c,inet_net_pton.c} (bug #912405)
+LICENSE="MIT ISC"
+# Subslot = SONAME of libcares.so.2
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? ( dev-cpp/gtest )
+ verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
+"
+
+DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO )
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/ares_build.h
+)
+
+A__QA_CONFIG_IMPL_DECL_SKIP=(
+ # Checking for obsolete headers
+ malloc
+ calloc
+ free
+
+ # Non-existent on Linux
+ closesocket
+ CloseSocket
+ ioctlsocket
+ bitncmp
+ ConvertInterfaceIndexToLuid
+ ConvertInterfaceLuidToNameA
+)
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-sanity-check-rr.patch
+)
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-symbol-hiding
+ $(use_enable static-libs static)
+ $(use_enable test tests)
+ )
+
+ # Needed for running unit tests only
+ # Violates sandbox and tests pass fine without
+ export ax_cv_uts_namespace=no
+ export ax_cv_user_namespace=no
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ cd "${BUILD_DIR}"/test || die
+
+ # We're skipping the "real" network tests with the filter
+ # see https://github.com/c-ares/c-ares/tree/main/test
+ local network_tests=(
+ # Most live tests have Live in the name
+ *Live*
+ # These don't but are still in ares-test-live.cc => live
+ *GetTCPSock*
+ *TimeoutValue*
+ *GetSock*
+ *GetSock_virtualized*
+ *VerifySocketFunctionCallback*
+ # Seems flaky, even run manually
+ # https://github.com/c-ares/c-ares/commit/9e542a8839f81c990bb0dff14beeaf9aa6bcc18d
+ *MockUDPMaxQueriesTest.GetHostByNameParallelLookups*
+ )
+
+ # The format for disabling test1, test2, and test3 looks like:
+ # -test1:test2:test3
+ edo ./arestest --gtest_filter=-$(echo $(IFS=:; echo "${network_tests[*]}"))
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-dns/c-ares/files/c-ares-1.25.0-fix-sanity-check-rr.patch b/net-dns/c-ares/files/c-ares-1.25.0-fix-sanity-check-rr.patch
new file mode 100644
index 000000000000..9b494ebfe8fe
--- /dev/null
+++ b/net-dns/c-ares/files/c-ares-1.25.0-fix-sanity-check-rr.patch
@@ -0,0 +1,166 @@
+https://github.com/c-ares/c-ares/issues/683
+https://github.com/c-ares/c-ares/commit/626dcb155b4daf3360e4251c64ce052e7e520b34
+
+From 626dcb155b4daf3360e4251c64ce052e7e520b34 Mon Sep 17 00:00:00 2001
+From: Brad House <brad@brad-house.com>
+Date: Fri, 12 Jan 2024 09:55:42 -0500
+Subject: [PATCH] Do not sanity check RR Name vs Question (#685)
+
+It appears as though we should never sanity check the RR name vs the question name as some DNS servers may return results for alias records.
+
+Fixes Bug: #683
+Fix By: Brad House (@bradh352)
+--- a/src/lib/ares__parse_into_addrinfo.c
++++ b/src/lib/ares__parse_into_addrinfo.c
+@@ -81,7 +81,6 @@ ares_status_t ares__parse_into_addrinfo(const unsigned char *abuf, size_t alen,
+ }
+
+ for (i = 0; i < ancount; i++) {
+- const char *rname = NULL;
+ ares_dns_rec_type_t rtype;
+ const ares_dns_rr_t *rr =
+ ares_dns_record_rr_get(dnsrec, ARES_SECTION_ANSWER, i);
+@@ -91,13 +90,18 @@ ares_status_t ares__parse_into_addrinfo(const unsigned char *abuf, size_t alen,
+ }
+
+ rtype = ares_dns_rr_get_type(rr);
+- rname = ares_dns_rr_get_name(rr);
+
+- /* Old code did this hostname sanity check */
+- if ((rtype == ARES_REC_TYPE_A || rtype == ARES_REC_TYPE_AAAA) &&
+- strcasecmp(rname, hostname) != 0) {
+- continue;
+- }
++ /* Issue #683
++ * Old code did this hostname sanity check, however it appears this is
++ * flawed logic. Other resolvers don't do this sanity check. Leaving
++ * this code commented out for future reference.
++ *
++ * rname = ares_dns_rr_get_name(rr);
++ * if ((rtype == ARES_REC_TYPE_A || rtype == ARES_REC_TYPE_AAAA) &&
++ * strcasecmp(rname, hostname) != 0) {
++ * continue;
++ * }
++ */
+
+ if (rtype == ARES_REC_TYPE_CNAME) {
+ struct ares_addrinfo_cname *cname;
+--- a/src/lib/ares_parse_ptr_reply.c
++++ b/src/lib/ares_parse_ptr_reply.c
+@@ -113,7 +113,6 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen_int,
+
+ /* Cycle through answers */
+ for (i = 0; i < ancount; i++) {
+- const char *rname = NULL;
+ const ares_dns_rr_t *rr =
+ ares_dns_record_rr_get(dnsrec, ARES_SECTION_ANSWER, i);
+
+@@ -141,17 +140,20 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen_int,
+ continue;
+ }
+
+- /* Old code compared the name in the rr to the ptrname, so we'll do that
+- * check here, but I'm not sure its necessary */
+- rname = ares_dns_rr_get_name(rr);
+- if (rname == NULL) {
+- /* Shouldn't be possible */
+- status = ARES_EBADRESP;
+- goto done;
+- }
+- if (strcasecmp(ptrname, rname) != 0) {
+- continue;
+- }
++ /* Issue #683
++ * Old code compared the name in the rr to the ptrname, but I think this
++ * is wrong since it was proven wrong for A & AAAA records. Leaving
++ * this code commented out for future reference
++ *
++ * rname = ares_dns_rr_get_name(rr);
++ * if (rname == NULL) {
++ * status = ARES_EBADRESP;
++ * goto done;
++ * }
++ * if (strcasecmp(ptrname, rname) != 0) {
++ * continue;
++ * }
++ */
+
+ /* Save most recent PTR record as the hostname */
+ hostname = ares_dns_rr_get_str(rr, ARES_RR_PTR_DNAME);
+--- a/test/ares-test-parse-a.cc
++++ b/test/ares-test-parse-a.cc
+@@ -312,13 +312,19 @@ TEST_F(LibraryTest, ParseAReplyErrors) {
+ EXPECT_EQ(nullptr, host);
+ pkt.add_question(new DNSQuestion("example.com", T_A));
+
+- // Question != answer
++ // Question != answer, this is ok as of Issue #683
+ pkt.questions_.clear();
+ pkt.add_question(new DNSQuestion("Axample.com", T_A));
+ data = pkt.data();
+- EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), (int)data.size(),
++ EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(),
+ &host, info, &count));
+- EXPECT_EQ(nullptr, host);
++ ASSERT_NE(nullptr, host);
++ std::stringstream ss;
++ ss << HostEnt(host);
++ EXPECT_EQ("{'Axample.com' aliases=[] addrs=[2.3.4.5]}", ss.str());
++ ares_free_hostent(host);
++ host = nullptr;
++
+ pkt.questions_.clear();
+ pkt.add_question(new DNSQuestion("example.com", T_A));
+
+--- a/test/ares-test-parse-aaaa.cc
++++ b/test/ares-test-parse-aaaa.cc
+@@ -139,13 +139,19 @@ TEST_F(LibraryTest, ParseAaaaReplyErrors) {
+ EXPECT_EQ(nullptr, host);
+ pkt.add_question(new DNSQuestion("example.com", T_AAAA));
+
+- // Question != answer
++ // Question != answer, this is ok as of Issue #683
+ pkt.questions_.clear();
+ pkt.add_question(new DNSQuestion("Axample.com", T_AAAA));
+ data = pkt.data();
+- EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), (int)data.size(),
++ EXPECT_EQ(ARES_SUCCESS, ares_parse_aaaa_reply(data.data(), (int)data.size(),
+ &host, info, &count));
+- EXPECT_EQ(nullptr, host);
++ ASSERT_NE(nullptr, host);
++ std::stringstream ss;
++ ss << HostEnt(host);
++ EXPECT_EQ("{'Axample.com' aliases=[] addrs=[0101:0101:0202:0202:0303:0303:0404:0404]}", ss.str());
++ ares_free_hostent(host);
++
++ host = nullptr;
+ pkt.questions_.clear();
+ pkt.add_question(new DNSQuestion("example.com", T_AAAA));
+
+--- a/test/ares-test-parse-ptr.cc
++++ b/test/ares-test-parse-ptr.cc
+@@ -163,13 +163,20 @@ TEST_F(LibraryTest, ParsePtrReplyErrors) {
+ addrv4, sizeof(addrv4), AF_INET, &host));
+ pkt.add_question(new DNSQuestion("64.48.32.16.in-addr.arpa", T_PTR));
+
+- // Question != answer
++ // Question != answer, ok after #683
++ host = nullptr;
+ pkt.questions_.clear();
+ pkt.add_question(new DNSQuestion("99.48.32.16.in-addr.arpa", T_PTR));
+ data = pkt.data();
+- EXPECT_EQ(ARES_ENODATA, ares_parse_ptr_reply(data.data(), (int)data.size(),
++ EXPECT_EQ(ARES_SUCCESS, ares_parse_ptr_reply(data.data(), (int)data.size(),
+ addrv4, sizeof(addrv4), AF_INET, &host));
+- EXPECT_EQ(nullptr, host);
++ ASSERT_NE(nullptr, host);
++ std::stringstream ss;
++ ss << HostEnt(host);
++ EXPECT_EQ("{'other.com' aliases=[other.com] addrs=[16.32.48.64]}", ss.str());
++ ares_free_hostent(host);
++
++ host = nullptr;
+ pkt.questions_.clear();
+ pkt.add_question(new DNSQuestion("64.48.32.16.in-addr.arpa", T_PTR));
+
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-19 7:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-17 12:20 [gentoo-commits] repo/gentoo:master commit in: net-dns/c-ares/files/, net-dns/c-ares/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-01-19 7:10 Sam James
2016-02-25 1:41 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox