admin/grpc
1
0
Fork 0
mirror of https://github.com/grpc/grpc.git synced 2026-01-24 10:53:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

[c-ares] update version to 1.34.5 (#39508)

Browse Source 
Fixes https://github.com/grpc/grpc/issues/39026

A few notheworthy changes here besides the version bump itself:

- Reorder the way we pull in `ares.h` in various places, so that we make sure to pull in necessary windows header ahead of time. In older c-ares, the `ares.h` public header was more self-contained w.r.t. windows headers including `winsock2.h`. E.g. see [old way of inclusion](6360e96b5c/include/ares.h (L64)) vs. [new way of inclusion](42ddbc14ec/include/ares.h (L52)). I'm not crazy about this fix here but couldn't see a much cleaner way (we could maybe set `CARES_HAVE_WINSOCK2_H` in `port_platform.h` alternatively)

- Upated hand-crafted `config_windows/ares_config.h` to set newly required build defs for the c-ares build itself to work on windows

- Fix ruby macos cross-compilation build to correctly set `SYSTEM` Makefile var to `Darwin` (so that we pull in `config_darwin/ares_config.h`, so far we've been getting away with the linux build mode)

- Change ruby macos MINGW32 cross-compilation build to use our hand crafted `config_windows/ares_config.h` header

- Explicitly link `iphlpapi` on Windows. I think we used to pick this up during c-ares library build from [this pragma](6360e96b5c/include/ares.h (L71)), but now that's [hidden under build define](42ddbc14ec/include/ares.h (L59))

Closes #39508

PiperOrigin-RevId: 783875246
This commit is contained in:
apolcyn
2025-07-16 13:30:18 -07:00
committed by Copybara-Service
parent 4ea3102507
commit 18dbb83657
16 changed files with 507 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
Makefile generated
View File

@@ -2201,23 +2201,15 @@ endif
# deps: []
# transitive_deps: []
LIBCARES_SRC = \
third_party/cares/cares/src/lib/ares__addrinfo2hostent.c \
third_party/cares/cares/src/lib/ares__addrinfo_localhost.c \
third_party/cares/cares/src/lib/ares__close_sockets.c \
third_party/cares/cares/src/lib/ares__get_hostent.c \
third_party/cares/cares/src/lib/ares__parse_into_addrinfo.c \
third_party/cares/cares/src/lib/ares__read_line.c \
third_party/cares/cares/src/lib/ares__readaddrinfo.c \
third_party/cares/cares/src/lib/ares__sortaddrinfo.c \
third_party/cares/cares/src/lib/ares__timeval.c \
third_party/cares/cares/src/lib/ares_addrinfo2hostent.c \
third_party/cares/cares/src/lib/ares_addrinfo_localhost.c \
third_party/cares/cares/src/lib/ares_android.c \
third_party/cares/cares/src/lib/ares_cancel.c \
third_party/cares/cares/src/lib/ares_create_query.c \
third_party/cares/cares/src/lib/ares_close_sockets.c \
third_party/cares/cares/src/lib/ares_conn.c \
third_party/cares/cares/src/lib/ares_cookie.c \
third_party/cares/cares/src/lib/ares_data.c \
third_party/cares/cares/src/lib/ares_destroy.c \
third_party/cares/cares/src/lib/ares_expand_name.c \
third_party/cares/cares/src/lib/ares_expand_string.c \
third_party/cares/cares/src/lib/ares_fds.c \
third_party/cares/cares/src/lib/ares_free_hostent.c \
third_party/cares/cares/src/lib/ares_free_string.c \
third_party/cares/cares/src/lib/ares_freeaddrinfo.c \
@@ -2226,47 +2218,86 @@ LIBCARES_SRC = \
third_party/cares/cares/src/lib/ares_gethostbyaddr.c \
third_party/cares/cares/src/lib/ares_gethostbyname.c \
third_party/cares/cares/src/lib/ares_getnameinfo.c \
third_party/cares/cares/src/lib/ares_getsock.c \
third_party/cares/cares/src/lib/ares_hosts_file.c \
third_party/cares/cares/src/lib/ares_init.c \
third_party/cares/cares/src/lib/ares_library_init.c \
third_party/cares/cares/src/lib/ares_llist.c \
third_party/cares/cares/src/lib/ares_mkquery.c \
third_party/cares/cares/src/lib/ares_nowarn.c \
third_party/cares/cares/src/lib/ares_metrics.c \
third_party/cares/cares/src/lib/ares_options.c \
third_party/cares/cares/src/lib/ares_parse_a_reply.c \
third_party/cares/cares/src/lib/ares_parse_aaaa_reply.c \
third_party/cares/cares/src/lib/ares_parse_caa_reply.c \
third_party/cares/cares/src/lib/ares_parse_mx_reply.c \
third_party/cares/cares/src/lib/ares_parse_naptr_reply.c \
third_party/cares/cares/src/lib/ares_parse_ns_reply.c \
third_party/cares/cares/src/lib/ares_parse_ptr_reply.c \
third_party/cares/cares/src/lib/ares_parse_soa_reply.c \
third_party/cares/cares/src/lib/ares_parse_srv_reply.c \
third_party/cares/cares/src/lib/ares_parse_txt_reply.c \
third_party/cares/cares/src/lib/ares_parse_uri_reply.c \
third_party/cares/cares/src/lib/ares_platform.c \
third_party/cares/cares/src/lib/ares_parse_into_addrinfo.c \
third_party/cares/cares/src/lib/ares_process.c \
third_party/cares/cares/src/lib/ares_qcache.c \
third_party/cares/cares/src/lib/ares_query.c \
third_party/cares/cares/src/lib/ares_rand.c \
third_party/cares/cares/src/lib/ares_search.c \
third_party/cares/cares/src/lib/ares_send.c \
third_party/cares/cares/src/lib/ares_strcasecmp.c \
third_party/cares/cares/src/lib/ares_strdup.c \
third_party/cares/cares/src/lib/ares_set_socket_functions.c \
third_party/cares/cares/src/lib/ares_socket.c \
third_party/cares/cares/src/lib/ares_sortaddrinfo.c \
third_party/cares/cares/src/lib/ares_strerror.c \
third_party/cares/cares/src/lib/ares_strsplit.c \
third_party/cares/cares/src/lib/ares_sysconfig.c \
third_party/cares/cares/src/lib/ares_sysconfig_files.c \
third_party/cares/cares/src/lib/ares_sysconfig_mac.c \
third_party/cares/cares/src/lib/ares_sysconfig_win.c \
third_party/cares/cares/src/lib/ares_timeout.c \
third_party/cares/cares/src/lib/ares_update_servers.c \
third_party/cares/cares/src/lib/ares_version.c \
third_party/cares/cares/src/lib/ares_writev.c \
third_party/cares/cares/src/lib/bitncmp.c \
third_party/cares/cares/src/lib/dsa/ares_array.c \
third_party/cares/cares/src/lib/dsa/ares_htable.c \
third_party/cares/cares/src/lib/dsa/ares_htable_asvp.c \
third_party/cares/cares/src/lib/dsa/ares_htable_dict.c \
third_party/cares/cares/src/lib/dsa/ares_htable_strvp.c \
third_party/cares/cares/src/lib/dsa/ares_htable_szvp.c \
third_party/cares/cares/src/lib/dsa/ares_htable_vpstr.c \
third_party/cares/cares/src/lib/dsa/ares_htable_vpvp.c \
third_party/cares/cares/src/lib/dsa/ares_llist.c \
third_party/cares/cares/src/lib/dsa/ares_slist.c \
third_party/cares/cares/src/lib/event/ares_event_configchg.c \
third_party/cares/cares/src/lib/event/ares_event_epoll.c \
third_party/cares/cares/src/lib/event/ares_event_kqueue.c \
third_party/cares/cares/src/lib/event/ares_event_poll.c \
third_party/cares/cares/src/lib/event/ares_event_select.c \
third_party/cares/cares/src/lib/event/ares_event_thread.c \
third_party/cares/cares/src/lib/event/ares_event_wake_pipe.c \
third_party/cares/cares/src/lib/event/ares_event_win32.c \
third_party/cares/cares/src/lib/inet_net_pton.c \
third_party/cares/cares/src/lib/inet_ntop.c \
third_party/cares/cares/src/lib/legacy/ares_create_query.c \
third_party/cares/cares/src/lib/legacy/ares_expand_name.c \
third_party/cares/cares/src/lib/legacy/ares_expand_string.c \
third_party/cares/cares/src/lib/legacy/ares_fds.c \
third_party/cares/cares/src/lib/legacy/ares_getsock.c \
third_party/cares/cares/src/lib/legacy/ares_parse_a_reply.c \
third_party/cares/cares/src/lib/legacy/ares_parse_aaaa_reply.c \
third_party/cares/cares/src/lib/legacy/ares_parse_caa_reply.c \
third_party/cares/cares/src/lib/legacy/ares_parse_mx_reply.c \
third_party/cares/cares/src/lib/legacy/ares_parse_naptr_reply.c \
third_party/cares/cares/src/lib/legacy/ares_parse_ns_reply.c \
third_party/cares/cares/src/lib/legacy/ares_parse_ptr_reply.c \
third_party/cares/cares/src/lib/legacy/ares_parse_soa_reply.c \
third_party/cares/cares/src/lib/legacy/ares_parse_srv_reply.c \
third_party/cares/cares/src/lib/legacy/ares_parse_txt_reply.c \
third_party/cares/cares/src/lib/legacy/ares_parse_uri_reply.c \
third_party/cares/cares/src/lib/record/ares_dns_mapping.c \
third_party/cares/cares/src/lib/record/ares_dns_multistring.c \
third_party/cares/cares/src/lib/record/ares_dns_name.c \
third_party/cares/cares/src/lib/record/ares_dns_parse.c \
third_party/cares/cares/src/lib/record/ares_dns_record.c \
third_party/cares/cares/src/lib/record/ares_dns_write.c \
third_party/cares/cares/src/lib/str/ares_buf.c \
third_party/cares/cares/src/lib/str/ares_str.c \
third_party/cares/cares/src/lib/str/ares_strsplit.c \
third_party/cares/cares/src/lib/util/ares_iface_ips.c \
third_party/cares/cares/src/lib/util/ares_math.c \
third_party/cares/cares/src/lib/util/ares_rand.c \
third_party/cares/cares/src/lib/util/ares_threads.c \
third_party/cares/cares/src/lib/util/ares_timeval.c \
third_party/cares/cares/src/lib/util/ares_uri.c \
third_party/cares/cares/src/lib/windows_port.c \
LIBCARES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBCARES_SRC))))
$(LIBCARES_OBJS): CFLAGS += -g
$(LIBCARES_OBJS): CPPFLAGS += -Ithird_party/cares/cares/include -Ithird_party/cares -Ithird_party/cares/cares -fvisibility=hidden -D_GNU_SOURCE $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) $(if $(subst FreeBSD,,$(SYSTEM)),,-Ithird_party/cares/config_freebsd) $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst OpenBSD,,$(SYSTEM)),,-Ithird_party/cares/config_openbsd) -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,)
$(LIBCARES_OBJS): CPPFLAGS += -Ithird_party/cares/cares/include -Ithird_party/cares -Ithird_party/cares/cares -Ithird_party/cares/cares/src/lib/include -Ithird_party/cares/cares/src/lib -fvisibility=hidden -D_GNU_SOURCE $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) $(if $(subst FreeBSD,,$(SYSTEM)),,-Ithird_party/cares/config_freebsd) $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst OpenBSD,,$(SYSTEM)),,-Ithird_party/cares/config_openbsd) $(if $(subst MINGW32,,$(SYSTEM)),,-Ithird_party/cares/config_windows) -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DHAVE_CONFIG_H
# static library for "cares"
$(LIBDIR)/$(CONFIG)/libcares.a: $(LIBCARES_OBJS)

10
Rakefile
View File

@@ -222,6 +222,13 @@ task 'gem:native', [:plat] do |t, args|
else
debug_symbols_dir = File.join(Dir.pwd, 'src/ruby/nativedebug/symbols')
end
makefile_system_override = ''
if plat =~ /darwin/
# When cross-compiling c-core for macos from linux, we need to overwrite
# SYSTEM for our Makefile to work. Note this is not needed for mingw b/c
# C-core is built in a separate command.
makefile_system_override = 'Darwin'
end
run_rake_compiler(plat, <<~EOT)
#{prepare_ccache_cmd} && \
gem update --system --no-document && \
@@ -232,7 +239,8 @@ task 'gem:native', [:plat] do |t, args|
RUBY_CC_VERSION=#{RakeCompilerDock.ruby_cc_version(*target_ruby_minor_versions)} \
V=#{verbose} \
GRPC_CONFIG=#{grpc_config} \
GRPC_RUBY_BUILD_PROCS=#{nproc_override}
GRPC_RUBY_BUILD_PROCS=#{nproc_override} \
SYSTEM=#{makefile_system_override}
EOT
end
# Generate debug symbol packages to complement the native libraries we just built

8
bazel/grpc_deps.bzl
View File

@@ -141,11 +141,11 @@ def grpc_deps():
http_archive(
name = "com_github_cares_cares",
build_file = "@com_github_grpc_grpc//third_party:cares/cares.BUILD",
sha256 = "bf26e5b25e259911914a85ae847b6d723488adb5af4f8bdeb9d0871a318476e3",
strip_prefix = "c-ares-6360e96b5cf8e5980c887ce58ef727e53d77243a",
sha256 = "cd1968cd09d384a5c553c82bf53ba458e47e9bfcdc253a3627f1b36ea6f814e2",
strip_prefix = "c-ares-d3a507e920e7af18a5efb7f9f1d8044ed4750013",
urls = [
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/6360e96b5cf8e5980c887ce58ef727e53d77243a.tar.gz",
"https://github.com/c-ares/c-ares/archive/6360e96b5cf8e5980c887ce58ef727e53d77243a.tar.gz",
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/d3a507e920e7af18a5efb7f9f1d8044ed4750013.tar.gz",
"https://github.com/c-ares/c-ares/archive/d3a507e920e7af18a5efb7f9f1d8044ed4750013.tar.gz",
],
)

4
build_handwritten.yaml
View File

@@ -141,10 +141,12 @@ defaults:
cares:
CFLAGS: -g
CPPFLAGS: -Ithird_party/cares/cares/include -Ithird_party/cares -Ithird_party/cares/cares
-Ithird_party/cares/cares/src/lib/include -Ithird_party/cares/cares/src/lib
-fvisibility=hidden -D_GNU_SOURCE $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin)
$(if $(subst FreeBSD,,$(SYSTEM)),,-Ithird_party/cares/config_freebsd) $(if $(subst
Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst OpenBSD,,$(SYSTEM)),,-Ithird_party/cares/config_openbsd)
-DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,)
$(if $(subst MINGW32,,$(SYSTEM)),,-Ithird_party/cares/config_windows) -DWIN32_LEAN_AND_MEAN
-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DHAVE_CONFIG_H
global:
CFLAGS: -g
COREFLAGS: -fno-exceptions

141
grpc.gemspec generated
View File

@@ -3149,28 +3149,21 @@ Gem::Specification.new do |s|
s.files += %w( third_party/cares/ares_build.h )
s.files += %w( third_party/cares/cares/include/ares.h )
s.files += %w( third_party/cares/cares/include/ares_dns.h )
s.files += %w( third_party/cares/cares/include/ares_dns_record.h )
s.files += %w( third_party/cares/cares/include/ares_nameser.h )
s.files += %w( third_party/cares/cares/include/ares_rules.h )
s.files += %w( third_party/cares/cares/include/ares_version.h )
s.files += %w( third_party/cares/cares/src/lib/ares__addrinfo2hostent.c )
s.files += %w( third_party/cares/cares/src/lib/ares__addrinfo_localhost.c )
s.files += %w( third_party/cares/cares/src/lib/ares__close_sockets.c )
s.files += %w( third_party/cares/cares/src/lib/ares__get_hostent.c )
s.files += %w( third_party/cares/cares/src/lib/ares__parse_into_addrinfo.c )
s.files += %w( third_party/cares/cares/src/lib/ares__read_line.c )
s.files += %w( third_party/cares/cares/src/lib/ares__readaddrinfo.c )
s.files += %w( third_party/cares/cares/src/lib/ares__sortaddrinfo.c )
s.files += %w( third_party/cares/cares/src/lib/ares__timeval.c )
s.files += %w( third_party/cares/cares/src/lib/ares_addrinfo2hostent.c )
s.files += %w( third_party/cares/cares/src/lib/ares_addrinfo_localhost.c )
s.files += %w( third_party/cares/cares/src/lib/ares_android.c )
s.files += %w( third_party/cares/cares/src/lib/ares_android.h )
s.files += %w( third_party/cares/cares/src/lib/ares_cancel.c )
s.files += %w( third_party/cares/cares/src/lib/ares_create_query.c )
s.files += %w( third_party/cares/cares/src/lib/ares_close_sockets.c )
s.files += %w( third_party/cares/cares/src/lib/ares_conn.c )
s.files += %w( third_party/cares/cares/src/lib/ares_conn.h )
s.files += %w( third_party/cares/cares/src/lib/ares_cookie.c )
s.files += %w( third_party/cares/cares/src/lib/ares_data.c )
s.files += %w( third_party/cares/cares/src/lib/ares_data.h )
s.files += %w( third_party/cares/cares/src/lib/ares_destroy.c )
s.files += %w( third_party/cares/cares/src/lib/ares_expand_name.c )
s.files += %w( third_party/cares/cares/src/lib/ares_expand_string.c )
s.files += %w( third_party/cares/cares/src/lib/ares_fds.c )
s.files += %w( third_party/cares/cares/src/lib/ares_free_hostent.c )
s.files += %w( third_party/cares/cares/src/lib/ares_free_string.c )
s.files += %w( third_party/cares/cares/src/lib/ares_freeaddrinfo.c )
@@ -3180,58 +3173,112 @@ Gem::Specification.new do |s|
s.files += %w( third_party/cares/cares/src/lib/ares_gethostbyaddr.c )
s.files += %w( third_party/cares/cares/src/lib/ares_gethostbyname.c )
s.files += %w( third_party/cares/cares/src/lib/ares_getnameinfo.c )
s.files += %w( third_party/cares/cares/src/lib/ares_getsock.c )
s.files += %w( third_party/cares/cares/src/lib/ares_hosts_file.c )
s.files += %w( third_party/cares/cares/src/lib/ares_inet_net_pton.h )
s.files += %w( third_party/cares/cares/src/lib/ares_init.c )
s.files += %w( third_party/cares/cares/src/lib/ares_iphlpapi.h )
s.files += %w( third_party/cares/cares/src/lib/ares_ipv6.h )
s.files += %w( third_party/cares/cares/src/lib/ares_library_init.c )
s.files += %w( third_party/cares/cares/src/lib/ares_llist.c )
s.files += %w( third_party/cares/cares/src/lib/ares_llist.h )
s.files += %w( third_party/cares/cares/src/lib/ares_mkquery.c )
s.files += %w( third_party/cares/cares/src/lib/ares_nowarn.c )
s.files += %w( third_party/cares/cares/src/lib/ares_nowarn.h )
s.files += %w( third_party/cares/cares/src/lib/ares_metrics.c )
s.files += %w( third_party/cares/cares/src/lib/ares_options.c )
s.files += %w( third_party/cares/cares/src/lib/ares_parse_a_reply.c )
s.files += %w( third_party/cares/cares/src/lib/ares_parse_aaaa_reply.c )
s.files += %w( third_party/cares/cares/src/lib/ares_parse_caa_reply.c )
s.files += %w( third_party/cares/cares/src/lib/ares_parse_mx_reply.c )
s.files += %w( third_party/cares/cares/src/lib/ares_parse_naptr_reply.c )
s.files += %w( third_party/cares/cares/src/lib/ares_parse_ns_reply.c )
s.files += %w( third_party/cares/cares/src/lib/ares_parse_ptr_reply.c )
s.files += %w( third_party/cares/cares/src/lib/ares_parse_soa_reply.c )
s.files += %w( third_party/cares/cares/src/lib/ares_parse_srv_reply.c )
s.files += %w( third_party/cares/cares/src/lib/ares_parse_txt_reply.c )
s.files += %w( third_party/cares/cares/src/lib/ares_parse_uri_reply.c )
s.files += %w( third_party/cares/cares/src/lib/ares_platform.c )
s.files += %w( third_party/cares/cares/src/lib/ares_platform.h )
s.files += %w( third_party/cares/cares/src/lib/ares_parse_into_addrinfo.c )
s.files += %w( third_party/cares/cares/src/lib/ares_private.h )
s.files += %w( third_party/cares/cares/src/lib/ares_process.c )
s.files += %w( third_party/cares/cares/src/lib/ares_qcache.c )
s.files += %w( third_party/cares/cares/src/lib/ares_query.c )
s.files += %w( third_party/cares/cares/src/lib/ares_rand.c )
s.files += %w( third_party/cares/cares/src/lib/ares_search.c )
s.files += %w( third_party/cares/cares/src/lib/ares_send.c )
s.files += %w( third_party/cares/cares/src/lib/ares_set_socket_functions.c )
s.files += %w( third_party/cares/cares/src/lib/ares_setup.h )
s.files += %w( third_party/cares/cares/src/lib/ares_strcasecmp.c )
s.files += %w( third_party/cares/cares/src/lib/ares_strcasecmp.h )
s.files += %w( third_party/cares/cares/src/lib/ares_strdup.c )
s.files += %w( third_party/cares/cares/src/lib/ares_strdup.h )
s.files += %w( third_party/cares/cares/src/lib/ares_socket.c )
s.files += %w( third_party/cares/cares/src/lib/ares_socket.h )
s.files += %w( third_party/cares/cares/src/lib/ares_sortaddrinfo.c )
s.files += %w( third_party/cares/cares/src/lib/ares_strerror.c )
s.files += %w( third_party/cares/cares/src/lib/ares_strsplit.c )
s.files += %w( third_party/cares/cares/src/lib/ares_strsplit.h )
s.files += %w( third_party/cares/cares/src/lib/ares_sysconfig.c )
s.files += %w( third_party/cares/cares/src/lib/ares_sysconfig_files.c )
s.files += %w( third_party/cares/cares/src/lib/ares_sysconfig_mac.c )
s.files += %w( third_party/cares/cares/src/lib/ares_sysconfig_win.c )
s.files += %w( third_party/cares/cares/src/lib/ares_timeout.c )
s.files += %w( third_party/cares/cares/src/lib/ares_update_servers.c )
s.files += %w( third_party/cares/cares/src/lib/ares_version.c )
s.files += %w( third_party/cares/cares/src/lib/ares_writev.c )
s.files += %w( third_party/cares/cares/src/lib/ares_writev.h )
s.files += %w( third_party/cares/cares/src/lib/bitncmp.c )
s.files += %w( third_party/cares/cares/src/lib/bitncmp.h )
s.files += %w( third_party/cares/cares/src/lib/config-dos.h )
s.files += %w( third_party/cares/cares/src/lib/config-win32.h )
s.files += %w( third_party/cares/cares/src/lib/dsa/ares_array.c )
s.files += %w( third_party/cares/cares/src/lib/dsa/ares_htable.c )
s.files += %w( third_party/cares/cares/src/lib/dsa/ares_htable.h )
s.files += %w( third_party/cares/cares/src/lib/dsa/ares_htable_asvp.c )
s.files += %w( third_party/cares/cares/src/lib/dsa/ares_htable_dict.c )
s.files += %w( third_party/cares/cares/src/lib/dsa/ares_htable_strvp.c )
s.files += %w( third_party/cares/cares/src/lib/dsa/ares_htable_szvp.c )
s.files += %w( third_party/cares/cares/src/lib/dsa/ares_htable_vpstr.c )
s.files += %w( third_party/cares/cares/src/lib/dsa/ares_htable_vpvp.c )
s.files += %w( third_party/cares/cares/src/lib/dsa/ares_llist.c )
s.files += %w( third_party/cares/cares/src/lib/dsa/ares_slist.c )
s.files += %w( third_party/cares/cares/src/lib/dsa/ares_slist.h )
s.files += %w( third_party/cares/cares/src/lib/event/ares_event.h )
s.files += %w( third_party/cares/cares/src/lib/event/ares_event_configchg.c )
s.files += %w( third_party/cares/cares/src/lib/event/ares_event_epoll.c )
s.files += %w( third_party/cares/cares/src/lib/event/ares_event_kqueue.c )
s.files += %w( third_party/cares/cares/src/lib/event/ares_event_poll.c )
s.files += %w( third_party/cares/cares/src/lib/event/ares_event_select.c )
s.files += %w( third_party/cares/cares/src/lib/event/ares_event_thread.c )
s.files += %w( third_party/cares/cares/src/lib/event/ares_event_wake_pipe.c )
s.files += %w( third_party/cares/cares/src/lib/event/ares_event_win32.c )
s.files += %w( third_party/cares/cares/src/lib/event/ares_event_win32.h )
s.files += %w( third_party/cares/cares/src/lib/include/ares_array.h )
s.files += %w( third_party/cares/cares/src/lib/include/ares_buf.h )
s.files += %w( third_party/cares/cares/src/lib/include/ares_htable_asvp.h )
s.files += %w( third_party/cares/cares/src/lib/include/ares_htable_dict.h )
s.files += %w( third_party/cares/cares/src/lib/include/ares_htable_strvp.h )
s.files += %w( third_party/cares/cares/src/lib/include/ares_htable_szvp.h )
s.files += %w( third_party/cares/cares/src/lib/include/ares_htable_vpstr.h )
s.files += %w( third_party/cares/cares/src/lib/include/ares_htable_vpvp.h )
s.files += %w( third_party/cares/cares/src/lib/include/ares_llist.h )
s.files += %w( third_party/cares/cares/src/lib/include/ares_mem.h )
s.files += %w( third_party/cares/cares/src/lib/include/ares_str.h )
s.files += %w( third_party/cares/cares/src/lib/inet_net_pton.c )
s.files += %w( third_party/cares/cares/src/lib/inet_ntop.c )
s.files += %w( third_party/cares/cares/src/lib/setup_once.h )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_create_query.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_expand_name.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_expand_string.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_fds.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_getsock.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_parse_a_reply.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_parse_aaaa_reply.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_parse_caa_reply.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_parse_mx_reply.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_parse_naptr_reply.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_parse_ns_reply.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_parse_ptr_reply.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_parse_soa_reply.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_parse_srv_reply.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_parse_txt_reply.c )
s.files += %w( third_party/cares/cares/src/lib/legacy/ares_parse_uri_reply.c )
s.files += %w( third_party/cares/cares/src/lib/record/ares_dns_mapping.c )
s.files += %w( third_party/cares/cares/src/lib/record/ares_dns_multistring.c )
s.files += %w( third_party/cares/cares/src/lib/record/ares_dns_multistring.h )
s.files += %w( third_party/cares/cares/src/lib/record/ares_dns_name.c )
s.files += %w( third_party/cares/cares/src/lib/record/ares_dns_parse.c )
s.files += %w( third_party/cares/cares/src/lib/record/ares_dns_private.h )
s.files += %w( third_party/cares/cares/src/lib/record/ares_dns_record.c )
s.files += %w( third_party/cares/cares/src/lib/record/ares_dns_write.c )
s.files += %w( third_party/cares/cares/src/lib/str/ares_buf.c )
s.files += %w( third_party/cares/cares/src/lib/str/ares_str.c )
s.files += %w( third_party/cares/cares/src/lib/str/ares_strsplit.c )
s.files += %w( third_party/cares/cares/src/lib/str/ares_strsplit.h )
s.files += %w( third_party/cares/cares/src/lib/thirdparty/apple/dnsinfo.h )
s.files += %w( third_party/cares/cares/src/lib/util/ares_iface_ips.c )
s.files += %w( third_party/cares/cares/src/lib/util/ares_iface_ips.h )
s.files += %w( third_party/cares/cares/src/lib/util/ares_math.c )
s.files += %w( third_party/cares/cares/src/lib/util/ares_math.h )
s.files += %w( third_party/cares/cares/src/lib/util/ares_rand.c )
s.files += %w( third_party/cares/cares/src/lib/util/ares_rand.h )
s.files += %w( third_party/cares/cares/src/lib/util/ares_threads.c )
s.files += %w( third_party/cares/cares/src/lib/util/ares_threads.h )
s.files += %w( third_party/cares/cares/src/lib/util/ares_time.h )
s.files += %w( third_party/cares/cares/src/lib/util/ares_timeval.c )
s.files += %w( third_party/cares/cares/src/lib/util/ares_uri.c )
s.files += %w( third_party/cares/cares/src/lib/util/ares_uri.h )
s.files += %w( third_party/cares/cares/src/lib/windows_port.c )
s.files += %w( third_party/cares/cares/src/tools/ares_getopt.h )
s.files += %w( third_party/cares/config_darwin/ares_config.h )
s.files += %w( third_party/cares/config_freebsd/ares_config.h )
s.files += %w( third_party/cares/config_linux/ares_config.h )

2
setup.py
View File

@@ -57,6 +57,8 @@ CARES_INCLUDE = (
os.path.join("third_party", "cares", "cares", "include"),
os.path.join("third_party", "cares"),
os.path.join("third_party", "cares", "cares"),
os.path.join("third_party", "cares", "cares", "src", "lib", "include"),
os.path.join("third_party", "cares", "cares", "src", "lib"),
)
if "darwin" in sys.platform:
CARES_INCLUDE += (os.path.join("third_party", "cares", "config_darwin"),)

207
src/c-ares/gen_build_yaml.py
View File

@@ -57,98 +57,145 @@ try:
"language": "c",
"secure": False,
"src": [
"third_party/cares/cares/src/lib/ares__read_line.c",
"third_party/cares/cares/src/lib/ares__get_hostent.c",
"third_party/cares/cares/src/lib/ares__close_sockets.c",
"third_party/cares/cares/src/lib/ares__timeval.c",
"third_party/cares/cares/src/lib/ares_gethostbyaddr.c",
"third_party/cares/cares/src/lib/ares_getenv.c",
"third_party/cares/cares/src/lib/ares_free_string.c",
"third_party/cares/cares/src/lib/ares_free_hostent.c",
"third_party/cares/cares/src/lib/ares_fds.c",
"third_party/cares/cares/src/lib/ares_expand_string.c",
"third_party/cares/cares/src/lib/ares_create_query.c",
"third_party/cares/cares/src/lib/ares_cancel.c",
"third_party/cares/cares/src/lib/ares_android.c",
"third_party/cares/cares/src/lib/ares_parse_txt_reply.c",
"third_party/cares/cares/src/lib/ares_parse_srv_reply.c",
"third_party/cares/cares/src/lib/ares_parse_soa_reply.c",
"third_party/cares/cares/src/lib/ares_parse_ptr_reply.c",
"third_party/cares/cares/src/lib/ares_parse_ns_reply.c",
"third_party/cares/cares/src/lib/ares_parse_naptr_reply.c",
"third_party/cares/cares/src/lib/ares_parse_mx_reply.c",
"third_party/cares/cares/src/lib/ares_parse_caa_reply.c",
"third_party/cares/cares/src/lib/ares_options.c",
"third_party/cares/cares/src/lib/ares_nowarn.c",
"third_party/cares/cares/src/lib/ares_mkquery.c",
"third_party/cares/cares/src/lib/ares_llist.c",
"third_party/cares/cares/src/lib/ares_getsock.c",
"third_party/cares/cares/src/lib/ares_getnameinfo.c",
"third_party/cares/cares/src/lib/bitncmp.c",
"third_party/cares/cares/src/lib/ares_writev.c",
"third_party/cares/cares/src/lib/ares_version.c",
"third_party/cares/cares/src/lib/ares_timeout.c",
"third_party/cares/cares/src/lib/ares_strerror.c",
"third_party/cares/cares/src/lib/ares_strcasecmp.c",
"third_party/cares/cares/src/lib/ares_search.c",
"third_party/cares/cares/src/lib/ares_platform.c",
"third_party/cares/cares/src/lib/windows_port.c",
"third_party/cares/cares/src/lib/inet_ntop.c",
"third_party/cares/cares/src/lib/ares__sortaddrinfo.c",
"third_party/cares/cares/src/lib/ares__readaddrinfo.c",
"third_party/cares/cares/src/lib/ares_parse_uri_reply.c",
"third_party/cares/cares/src/lib/ares__parse_into_addrinfo.c",
"third_party/cares/cares/src/lib/ares_parse_a_reply.c",
"third_party/cares/cares/src/lib/ares_parse_aaaa_reply.c",
"third_party/cares/cares/src/lib/ares_library_init.c",
"third_party/cares/cares/src/lib/ares_init.c",
"third_party/cares/cares/src/lib/ares_gethostbyname.c",
"third_party/cares/cares/src/lib/event/ares_event_configchg.c",
"third_party/cares/cares/src/lib/event/ares_event_poll.c",
"third_party/cares/cares/src/lib/event/ares_event_epoll.c",
"third_party/cares/cares/src/lib/event/ares_event_wake_pipe.c",
"third_party/cares/cares/src/lib/event/ares_event_select.c",
"third_party/cares/cares/src/lib/event/ares_event_kqueue.c",
"third_party/cares/cares/src/lib/event/ares_event_win32.c",
"third_party/cares/cares/src/lib/event/ares_event_thread.c",
"third_party/cares/cares/src/lib/ares_gethostbyaddr.c",
"third_party/cares/cares/src/lib/ares_set_socket_functions.c",
"third_party/cares/cares/src/lib/ares_options.c",
"third_party/cares/cares/src/lib/ares_getaddrinfo.c",
"third_party/cares/cares/src/lib/ares_freeaddrinfo.c",
"third_party/cares/cares/src/lib/ares_expand_name.c",
"third_party/cares/cares/src/lib/ares_init.c",
"third_party/cares/cares/src/lib/ares_android.c",
"third_party/cares/cares/src/lib/ares_destroy.c",
"third_party/cares/cares/src/lib/ares_data.c",
"third_party/cares/cares/src/lib/ares__addrinfo_localhost.c",
"third_party/cares/cares/src/lib/ares__addrinfo2hostent.c",
"third_party/cares/cares/src/lib/inet_net_pton.c",
"third_party/cares/cares/src/lib/ares_strsplit.c",
"third_party/cares/cares/src/lib/ares_strdup.c",
"third_party/cares/cares/src/lib/ares_getenv.c",
"third_party/cares/cares/src/lib/ares_addrinfo_localhost.c",
"third_party/cares/cares/src/lib/ares_send.c",
"third_party/cares/cares/src/lib/ares_rand.c",
"third_party/cares/cares/src/lib/ares_query.c",
"third_party/cares/cares/src/lib/ares_free_hostent.c",
"third_party/cares/cares/src/lib/ares_data.c",
"third_party/cares/cares/src/lib/ares_parse_into_addrinfo.c",
"third_party/cares/cares/src/lib/ares_cancel.c",
"third_party/cares/cares/src/lib/ares_search.c",
"third_party/cares/cares/src/lib/ares_sysconfig_win.c",
"third_party/cares/cares/src/lib/ares_gethostbyname.c",
"third_party/cares/cares/src/lib/ares_addrinfo2hostent.c",
"third_party/cares/cares/src/lib/ares_freeaddrinfo.c",
"third_party/cares/cares/src/lib/ares_sysconfig.c",
"third_party/cares/cares/src/lib/ares_hosts_file.c",
"third_party/cares/cares/src/lib/ares_sortaddrinfo.c",
"third_party/cares/cares/src/lib/ares_free_string.c",
"third_party/cares/cares/src/lib/ares_qcache.c",
"third_party/cares/cares/src/lib/str/ares_str.c",
"third_party/cares/cares/src/lib/str/ares_strsplit.c",
"third_party/cares/cares/src/lib/str/ares_buf.c",
"third_party/cares/cares/src/lib/windows_port.c",
"third_party/cares/cares/src/lib/ares_socket.c",
"third_party/cares/cares/src/lib/ares_timeout.c",
"third_party/cares/cares/src/lib/ares_cookie.c",
"third_party/cares/cares/src/lib/dsa/ares_htable_vpstr.c",
"third_party/cares/cares/src/lib/dsa/ares_htable_strvp.c",
"third_party/cares/cares/src/lib/dsa/ares_htable_dict.c",
"third_party/cares/cares/src/lib/dsa/ares_htable_szvp.c",
"third_party/cares/cares/src/lib/dsa/ares_htable_vpvp.c",
"third_party/cares/cares/src/lib/dsa/ares_llist.c",
"third_party/cares/cares/src/lib/dsa/ares_htable.c",
"third_party/cares/cares/src/lib/dsa/ares_htable_asvp.c",
"third_party/cares/cares/src/lib/dsa/ares_array.c",
"third_party/cares/cares/src/lib/dsa/ares_slist.c",
"third_party/cares/cares/src/lib/ares_sysconfig_mac.c",
"third_party/cares/cares/src/lib/ares_process.c",
"third_party/cares/cares/src/lib/ares_close_sockets.c",
"third_party/cares/cares/src/lib/legacy/ares_create_query.c",
"third_party/cares/cares/src/lib/legacy/ares_parse_txt_reply.c",
"third_party/cares/cares/src/lib/legacy/ares_parse_ptr_reply.c",
"third_party/cares/cares/src/lib/legacy/ares_fds.c",
"third_party/cares/cares/src/lib/legacy/ares_expand_string.c",
"third_party/cares/cares/src/lib/legacy/ares_parse_uri_reply.c",
"third_party/cares/cares/src/lib/legacy/ares_parse_naptr_reply.c",
"third_party/cares/cares/src/lib/legacy/ares_parse_aaaa_reply.c",
"third_party/cares/cares/src/lib/legacy/ares_parse_srv_reply.c",
"third_party/cares/cares/src/lib/legacy/ares_parse_soa_reply.c",
"third_party/cares/cares/src/lib/legacy/ares_parse_mx_reply.c",
"third_party/cares/cares/src/lib/legacy/ares_parse_caa_reply.c",
"third_party/cares/cares/src/lib/legacy/ares_expand_name.c",
"third_party/cares/cares/src/lib/legacy/ares_getsock.c",
"third_party/cares/cares/src/lib/legacy/ares_parse_ns_reply.c",
"third_party/cares/cares/src/lib/legacy/ares_parse_a_reply.c",
"third_party/cares/cares/src/lib/ares_strerror.c",
"third_party/cares/cares/src/lib/ares_getnameinfo.c",
"third_party/cares/cares/src/lib/ares_version.c",
"third_party/cares/cares/src/lib/ares_library_init.c",
"third_party/cares/cares/src/lib/ares_sysconfig_files.c",
"third_party/cares/cares/src/lib/ares_metrics.c",
"third_party/cares/cares/src/lib/ares_conn.c",
"third_party/cares/cares/src/lib/ares_query.c",
"third_party/cares/cares/src/lib/inet_net_pton.c",
"third_party/cares/cares/src/lib/util/ares_rand.c",
"third_party/cares/cares/src/lib/util/ares_iface_ips.c",
"third_party/cares/cares/src/lib/util/ares_timeval.c",
"third_party/cares/cares/src/lib/util/ares_uri.c",
"third_party/cares/cares/src/lib/util/ares_threads.c",
"third_party/cares/cares/src/lib/util/ares_math.c",
"third_party/cares/cares/src/lib/ares_update_servers.c",
"third_party/cares/cares/src/lib/record/ares_dns_write.c",
"third_party/cares/cares/src/lib/record/ares_dns_record.c",
"third_party/cares/cares/src/lib/record/ares_dns_multistring.c",
"third_party/cares/cares/src/lib/record/ares_dns_mapping.c",
"third_party/cares/cares/src/lib/record/ares_dns_name.c",
"third_party/cares/cares/src/lib/record/ares_dns_parse.c",
],
"headers": [
"third_party/cares/ares_build.h",
"third_party/cares/cares/include/ares_version.h",
"third_party/cares/cares/include/ares.h",
"third_party/cares/cares/include/ares_rules.h",
"third_party/cares/cares/include/ares_dns.h",
"third_party/cares/cares/include/ares_nameser.h",
"third_party/cares/cares/src/tools/ares_getopt.h",
"third_party/cares/cares/src/lib/ares_strsplit.h",
"third_party/cares/cares/src/lib/ares_android.h",
"third_party/cares/cares/src/lib/ares_private.h",
"third_party/cares/cares/src/lib/ares_llist.h",
"third_party/cares/cares/src/lib/ares_platform.h",
"third_party/cares/cares/src/lib/ares_ipv6.h",
"third_party/cares/cares/src/lib/config-dos.h",
"third_party/cares/cares/src/lib/bitncmp.h",
"third_party/cares/cares/src/lib/ares_strcasecmp.h",
"third_party/cares/cares/src/lib/setup_once.h",
"third_party/cares/cares/src/lib/ares_inet_net_pton.h",
"third_party/cares/cares/src/lib/ares_data.h",
"third_party/cares/cares/src/lib/ares_getenv.h",
"third_party/cares/cares/src/lib/config-win32.h",
"third_party/cares/cares/src/lib/ares_strdup.h",
"third_party/cares/cares/src/lib/ares_iphlpapi.h",
"third_party/cares/cares/src/lib/ares_setup.h",
"third_party/cares/cares/src/lib/ares_writev.h",
"third_party/cares/cares/src/lib/ares_nowarn.h",
"third_party/cares/config_darwin/ares_config.h",
"third_party/cares/config_freebsd/ares_config.h",
"third_party/cares/config_linux/ares_config.h",
"third_party/cares/config_openbsd/ares_config.h",
"third_party/cares/cares/include/ares_nameser.h",
"third_party/cares/cares/include/ares_dns_record.h",
"third_party/cares/cares/include/ares.h",
"third_party/cares/cares/include/ares_version.h",
"third_party/cares/cares/include/ares_dns.h",
"third_party/cares/cares/src/lib/event/ares_event_win32.h",
"third_party/cares/cares/src/lib/event/ares_event.h",
"third_party/cares/cares/src/lib/include/ares_htable_asvp.h",
"third_party/cares/cares/src/lib/include/ares_llist.h",
"third_party/cares/cares/src/lib/include/ares_htable_vpstr.h",
"third_party/cares/cares/src/lib/include/ares_htable_strvp.h",
"third_party/cares/cares/src/lib/include/ares_htable_vpvp.h",
"third_party/cares/cares/src/lib/include/ares_htable_szvp.h",
"third_party/cares/cares/src/lib/include/ares_mem.h",
"third_party/cares/cares/src/lib/include/ares_htable_dict.h",
"third_party/cares/cares/src/lib/include/ares_array.h",
"third_party/cares/cares/src/lib/include/ares_buf.h",
"third_party/cares/cares/src/lib/include/ares_str.h",
"third_party/cares/cares/src/lib/ares_android.h",
"third_party/cares/cares/src/lib/ares_private.h",
"third_party/cares/cares/src/lib/ares_socket.h",
"third_party/cares/cares/src/lib/ares_ipv6.h",
"third_party/cares/cares/src/lib/config-dos.h",
"third_party/cares/cares/src/lib/ares_inet_net_pton.h",
"third_party/cares/cares/src/lib/str/ares_strsplit.h",
"third_party/cares/cares/src/lib/dsa/ares_slist.h",
"third_party/cares/cares/src/lib/dsa/ares_htable.h",
"third_party/cares/cares/src/lib/ares_data.h",
"third_party/cares/cares/src/lib/ares_getenv.h",
"third_party/cares/cares/src/lib/config-win32.h",
"third_party/cares/cares/src/lib/ares_conn.h",
"third_party/cares/cares/src/lib/ares_setup.h",
"third_party/cares/cares/src/lib/thirdparty/apple/dnsinfo.h",
"third_party/cares/cares/src/lib/util/ares_threads.h",
"third_party/cares/cares/src/lib/util/ares_time.h",
"third_party/cares/cares/src/lib/util/ares_iface_ips.h",
"third_party/cares/cares/src/lib/util/ares_math.h",
"third_party/cares/cares/src/lib/util/ares_rand.h",
"third_party/cares/cares/src/lib/util/ares_uri.h",
"third_party/cares/cares/src/lib/record/ares_dns_multistring.h",
"third_party/cares/cares/src/lib/record/ares_dns_private.h",
],
}
]

4
src/core/lib/event_engine/ares_resolver.h
View File

@@ -22,8 +22,10 @@
#if GRPC_ARES == 1
#include <ares.h>
#include <grpc/event_engine/event_engine.h>
// ares.h is not self-contained w.r.t. windows headers so pull in
// event_engine.h first
#include <ares.h>
#include <list>
#include <memory>

3
src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
View File

@@ -18,7 +18,6 @@
#if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
#include <ares.h>
#include <grpc/support/log_windows.h>
#include <winsock2.h>
@@ -27,6 +26,8 @@
#include "absl/status/status.h"
#include "absl/strings/str_format.h"
#include "src/core/lib/address_utils/sockaddr_utils.h"
// We pull in ares.h transitively here, ares.h is not self-contained
// w.r.t. windows headers though, so make sure pull them in above.
#include "src/core/lib/event_engine/ares_resolver.h"
#include "src/core/lib/event_engine/grpc_polled_fd.h"
#include "src/core/lib/event_engine/windows/grpc_polled_fd_windows.h"

3
src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
View File

@@ -20,7 +20,6 @@
#include "src/core/lib/iomgr/port.h" // IWYU pragma: keep
#if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
#include <ares.h>
#include <grpc/support/alloc.h>
#include <grpc/support/log_windows.h>
#include <grpc/support/string_util.h>
@@ -41,6 +40,8 @@
#include "src/core/lib/iomgr/tcp_windows.h"
#include "src/core/lib/slice/slice.h"
#include "src/core/lib/slice/slice_internal.h"
// We pull in ares.h transitively here, ares.h is not self-contained
// w.r.t. windows headers though, so make sure pull them in above.
#include "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h"
#include "src/core/resolver/dns/c_ares/grpc_ares_wrapper.h"
#include "src/core/util/crash.h"

101
src/python/grpcio/grpc_core_dependencies.py generated
View File

@@ -1341,23 +1341,15 @@ CORE_SOURCE_FILES = [
'third_party/boringssl-with-bazel/src/ssl/tls13_server.cc',
'third_party/boringssl-with-bazel/src/ssl/tls_method.cc',
'third_party/boringssl-with-bazel/src/ssl/tls_record.cc',
'third_party/cares/cares/src/lib/ares__addrinfo2hostent.c',
'third_party/cares/cares/src/lib/ares__addrinfo_localhost.c',
'third_party/cares/cares/src/lib/ares__close_sockets.c',
'third_party/cares/cares/src/lib/ares__get_hostent.c',
'third_party/cares/cares/src/lib/ares__parse_into_addrinfo.c',
'third_party/cares/cares/src/lib/ares__read_line.c',
'third_party/cares/cares/src/lib/ares__readaddrinfo.c',
'third_party/cares/cares/src/lib/ares__sortaddrinfo.c',
'third_party/cares/cares/src/lib/ares__timeval.c',
'third_party/cares/cares/src/lib/ares_addrinfo2hostent.c',
'third_party/cares/cares/src/lib/ares_addrinfo_localhost.c',
'third_party/cares/cares/src/lib/ares_android.c',
'third_party/cares/cares/src/lib/ares_cancel.c',
'third_party/cares/cares/src/lib/ares_create_query.c',
'third_party/cares/cares/src/lib/ares_close_sockets.c',
'third_party/cares/cares/src/lib/ares_conn.c',
'third_party/cares/cares/src/lib/ares_cookie.c',
'third_party/cares/cares/src/lib/ares_data.c',
'third_party/cares/cares/src/lib/ares_destroy.c',
'third_party/cares/cares/src/lib/ares_expand_name.c',
'third_party/cares/cares/src/lib/ares_expand_string.c',
'third_party/cares/cares/src/lib/ares_fds.c',
'third_party/cares/cares/src/lib/ares_free_hostent.c',
'third_party/cares/cares/src/lib/ares_free_string.c',
'third_party/cares/cares/src/lib/ares_freeaddrinfo.c',
@@ -1366,40 +1358,79 @@ CORE_SOURCE_FILES = [
'third_party/cares/cares/src/lib/ares_gethostbyaddr.c',
'third_party/cares/cares/src/lib/ares_gethostbyname.c',
'third_party/cares/cares/src/lib/ares_getnameinfo.c',
'third_party/cares/cares/src/lib/ares_getsock.c',
'third_party/cares/cares/src/lib/ares_hosts_file.c',
'third_party/cares/cares/src/lib/ares_init.c',
'third_party/cares/cares/src/lib/ares_library_init.c',
'third_party/cares/cares/src/lib/ares_llist.c',
'third_party/cares/cares/src/lib/ares_mkquery.c',
'third_party/cares/cares/src/lib/ares_nowarn.c',
'third_party/cares/cares/src/lib/ares_metrics.c',
'third_party/cares/cares/src/lib/ares_options.c',
'third_party/cares/cares/src/lib/ares_parse_a_reply.c',
'third_party/cares/cares/src/lib/ares_parse_aaaa_reply.c',
'third_party/cares/cares/src/lib/ares_parse_caa_reply.c',
'third_party/cares/cares/src/lib/ares_parse_mx_reply.c',
'third_party/cares/cares/src/lib/ares_parse_naptr_reply.c',
'third_party/cares/cares/src/lib/ares_parse_ns_reply.c',
'third_party/cares/cares/src/lib/ares_parse_ptr_reply.c',
'third_party/cares/cares/src/lib/ares_parse_soa_reply.c',
'third_party/cares/cares/src/lib/ares_parse_srv_reply.c',
'third_party/cares/cares/src/lib/ares_parse_txt_reply.c',
'third_party/cares/cares/src/lib/ares_parse_uri_reply.c',
'third_party/cares/cares/src/lib/ares_platform.c',
'third_party/cares/cares/src/lib/ares_parse_into_addrinfo.c',
'third_party/cares/cares/src/lib/ares_process.c',
'third_party/cares/cares/src/lib/ares_qcache.c',
'third_party/cares/cares/src/lib/ares_query.c',
'third_party/cares/cares/src/lib/ares_rand.c',
'third_party/cares/cares/src/lib/ares_search.c',
'third_party/cares/cares/src/lib/ares_send.c',
'third_party/cares/cares/src/lib/ares_strcasecmp.c',
'third_party/cares/cares/src/lib/ares_strdup.c',
'third_party/cares/cares/src/lib/ares_set_socket_functions.c',
'third_party/cares/cares/src/lib/ares_socket.c',
'third_party/cares/cares/src/lib/ares_sortaddrinfo.c',
'third_party/cares/cares/src/lib/ares_strerror.c',
'third_party/cares/cares/src/lib/ares_strsplit.c',
'third_party/cares/cares/src/lib/ares_sysconfig.c',
'third_party/cares/cares/src/lib/ares_sysconfig_files.c',
'third_party/cares/cares/src/lib/ares_sysconfig_mac.c',
'third_party/cares/cares/src/lib/ares_sysconfig_win.c',
'third_party/cares/cares/src/lib/ares_timeout.c',
'third_party/cares/cares/src/lib/ares_update_servers.c',
'third_party/cares/cares/src/lib/ares_version.c',
'third_party/cares/cares/src/lib/ares_writev.c',
'third_party/cares/cares/src/lib/bitncmp.c',
'third_party/cares/cares/src/lib/dsa/ares_array.c',
'third_party/cares/cares/src/lib/dsa/ares_htable.c',
'third_party/cares/cares/src/lib/dsa/ares_htable_asvp.c',
'third_party/cares/cares/src/lib/dsa/ares_htable_dict.c',
'third_party/cares/cares/src/lib/dsa/ares_htable_strvp.c',
'third_party/cares/cares/src/lib/dsa/ares_htable_szvp.c',
'third_party/cares/cares/src/lib/dsa/ares_htable_vpstr.c',
'third_party/cares/cares/src/lib/dsa/ares_htable_vpvp.c',
'third_party/cares/cares/src/lib/dsa/ares_llist.c',
'third_party/cares/cares/src/lib/dsa/ares_slist.c',
'third_party/cares/cares/src/lib/event/ares_event_configchg.c',
'third_party/cares/cares/src/lib/event/ares_event_epoll.c',
'third_party/cares/cares/src/lib/event/ares_event_kqueue.c',
'third_party/cares/cares/src/lib/event/ares_event_poll.c',
'third_party/cares/cares/src/lib/event/ares_event_select.c',
'third_party/cares/cares/src/lib/event/ares_event_thread.c',
'third_party/cares/cares/src/lib/event/ares_event_wake_pipe.c',
'third_party/cares/cares/src/lib/event/ares_event_win32.c',
'third_party/cares/cares/src/lib/inet_net_pton.c',
'third_party/cares/cares/src/lib/inet_ntop.c',
'third_party/cares/cares/src/lib/legacy/ares_create_query.c',
'third_party/cares/cares/src/lib/legacy/ares_expand_name.c',
'third_party/cares/cares/src/lib/legacy/ares_expand_string.c',
'third_party/cares/cares/src/lib/legacy/ares_fds.c',
'third_party/cares/cares/src/lib/legacy/ares_getsock.c',
'third_party/cares/cares/src/lib/legacy/ares_parse_a_reply.c',
'third_party/cares/cares/src/lib/legacy/ares_parse_aaaa_reply.c',
'third_party/cares/cares/src/lib/legacy/ares_parse_caa_reply.c',
'third_party/cares/cares/src/lib/legacy/ares_parse_mx_reply.c',
'third_party/cares/cares/src/lib/legacy/ares_parse_naptr_reply.c',
'third_party/cares/cares/src/lib/legacy/ares_parse_ns_reply.c',
'third_party/cares/cares/src/lib/legacy/ares_parse_ptr_reply.c',
'third_party/cares/cares/src/lib/legacy/ares_parse_soa_reply.c',
'third_party/cares/cares/src/lib/legacy/ares_parse_srv_reply.c',
'third_party/cares/cares/src/lib/legacy/ares_parse_txt_reply.c',
'third_party/cares/cares/src/lib/legacy/ares_parse_uri_reply.c',
'third_party/cares/cares/src/lib/record/ares_dns_mapping.c',
'third_party/cares/cares/src/lib/record/ares_dns_multistring.c',
'third_party/cares/cares/src/lib/record/ares_dns_name.c',
'third_party/cares/cares/src/lib/record/ares_dns_parse.c',
'third_party/cares/cares/src/lib/record/ares_dns_record.c',
'third_party/cares/cares/src/lib/record/ares_dns_write.c',
'third_party/cares/cares/src/lib/str/ares_buf.c',
'third_party/cares/cares/src/lib/str/ares_str.c',
'third_party/cares/cares/src/lib/str/ares_strsplit.c',
'third_party/cares/cares/src/lib/util/ares_iface_ips.c',
'third_party/cares/cares/src/lib/util/ares_math.c',
'third_party/cares/cares/src/lib/util/ares_rand.c',
'third_party/cares/cares/src/lib/util/ares_threads.c',
'third_party/cares/cares/src/lib/util/ares_timeval.c',
'third_party/cares/cares/src/lib/util/ares_uri.c',
'third_party/cares/cares/src/lib/windows_port.c',
'third_party/re2/re2/bitstate.cc',
'third_party/re2/re2/compile.cc',

1
test/core/util/http_client/httpcli_test.cc
View File

@@ -248,6 +248,7 @@ void InjectNonResponsiveDNSServer(ares_channel* channel) {
// Configure a non-responsive DNS server at the front of c-ares's nameserver
// list.
struct ares_addr_port_node dns_server_addrs[1];
memset(dns_server_addrs, 0, sizeof(struct ares_addr_port_node));
dns_server_addrs[0].family = AF_INET6;
(reinterpret_cast<char*>(&dns_server_addrs[0].addr.addr6))[15] = 0x1;
dns_server_addrs[0].tcp_port = g_fake_non_responsive_dns_server_port;

2
third_party/cares/cares vendored

Submodule third_party/cares/cares updated: 6360e96b5c...d3a507e920

194
third_party/cares/cares.BUILD vendored
View File

@@ -133,95 +133,142 @@ copy_file(
cc_library(
name = "ares",
srcs = [
"src/lib/ares__read_line.c",
"src/lib/ares__get_hostent.c",
"src/lib/ares__close_sockets.c",
"src/lib/ares__timeval.c",
"src/lib/ares_gethostbyaddr.c",
"src/lib/ares_getenv.c",
"src/lib/ares_free_string.c",
"src/lib/ares_free_hostent.c",
"src/lib/ares_fds.c",
"src/lib/ares_expand_string.c",
"src/lib/ares_create_query.c",
"src/lib/ares_cancel.c",
"src/lib/ares_android.c",
"src/lib/ares_parse_txt_reply.c",
"src/lib/ares_parse_srv_reply.c",
"src/lib/ares_parse_soa_reply.c",
"src/lib/ares_parse_ptr_reply.c",
"src/lib/ares_parse_ns_reply.c",
"src/lib/ares_parse_naptr_reply.c",
"src/lib/ares_parse_mx_reply.c",
"src/lib/ares_parse_caa_reply.c",
"src/lib/ares_options.c",
"src/lib/ares_nowarn.c",
"src/lib/ares_mkquery.c",
"src/lib/ares_llist.c",
"src/lib/ares_getsock.c",
"src/lib/ares_getnameinfo.c",
"src/lib/bitncmp.c",
"src/lib/ares_writev.c",
"src/lib/ares_version.c",
"src/lib/ares_timeout.c",
"src/lib/ares_strerror.c",
"src/lib/ares_strcasecmp.c",
"src/lib/ares_search.c",
"src/lib/ares_platform.c",
"src/lib/windows_port.c",
"src/lib/inet_ntop.c",
"src/lib/ares__sortaddrinfo.c",
"src/lib/ares__readaddrinfo.c",
"src/lib/ares_parse_uri_reply.c",
"src/lib/ares__parse_into_addrinfo.c",
"src/lib/ares_parse_a_reply.c",
"src/lib/ares_parse_aaaa_reply.c",
"src/lib/ares_library_init.c",
"src/lib/ares_init.c",
"src/lib/ares_gethostbyname.c",
"src/lib/event/ares_event_configchg.c",
"src/lib/event/ares_event_poll.c",
"src/lib/event/ares_event_epoll.c",
"src/lib/event/ares_event_wake_pipe.c",
"src/lib/event/ares_event_select.c",
"src/lib/event/ares_event_kqueue.c",
"src/lib/event/ares_event_win32.c",
"src/lib/event/ares_event_thread.c",
"src/lib/ares_gethostbyaddr.c",
"src/lib/ares_set_socket_functions.c",
"src/lib/ares_options.c",
"src/lib/ares_getaddrinfo.c",
"src/lib/ares_freeaddrinfo.c",
"src/lib/ares_expand_name.c",
"src/lib/ares_init.c",
"src/lib/ares_android.c",
"src/lib/ares_destroy.c",
"src/lib/ares_data.c",
"src/lib/ares__addrinfo_localhost.c",
"src/lib/ares__addrinfo2hostent.c",
"src/lib/inet_net_pton.c",
"src/lib/ares_strsplit.c",
"src/lib/ares_strdup.c",
"src/lib/ares_getenv.c",
"src/lib/ares_addrinfo_localhost.c",
"src/lib/ares_send.c",
"src/lib/ares_rand.c",
"src/lib/ares_query.c",
"src/lib/ares_free_hostent.c",
"src/lib/ares_data.c",
"src/lib/ares_parse_into_addrinfo.c",
"src/lib/ares_cancel.c",
"src/lib/ares_search.c",
"src/lib/ares_sysconfig_win.c",
"src/lib/ares_gethostbyname.c",
"src/lib/ares_addrinfo2hostent.c",
"src/lib/ares_freeaddrinfo.c",
"src/lib/ares_sysconfig.c",
"src/lib/ares_hosts_file.c",
"src/lib/ares_sortaddrinfo.c",
"src/lib/ares_free_string.c",
"src/lib/ares_qcache.c",
"src/lib/str/ares_str.c",
"src/lib/str/ares_strsplit.c",
"src/lib/str/ares_buf.c",
"src/lib/windows_port.c",
"src/lib/ares_socket.c",
"src/lib/ares_timeout.c",
"src/lib/ares_cookie.c",
"src/lib/dsa/ares_htable_vpstr.c",
"src/lib/dsa/ares_htable_strvp.c",
"src/lib/dsa/ares_htable_dict.c",
"src/lib/dsa/ares_htable_szvp.c",
"src/lib/dsa/ares_htable_vpvp.c",
"src/lib/dsa/ares_llist.c",
"src/lib/dsa/ares_htable.c",
"src/lib/dsa/ares_htable_asvp.c",
"src/lib/dsa/ares_array.c",
"src/lib/dsa/ares_slist.c",
"src/lib/ares_sysconfig_mac.c",
"src/lib/ares_process.c",
"src/lib/ares_close_sockets.c",
"src/lib/legacy/ares_create_query.c",
"src/lib/legacy/ares_parse_txt_reply.c",
"src/lib/legacy/ares_parse_ptr_reply.c",
"src/lib/legacy/ares_fds.c",
"src/lib/legacy/ares_expand_string.c",
"src/lib/legacy/ares_parse_uri_reply.c",
"src/lib/legacy/ares_parse_naptr_reply.c",
"src/lib/legacy/ares_parse_aaaa_reply.c",
"src/lib/legacy/ares_parse_srv_reply.c",
"src/lib/legacy/ares_parse_soa_reply.c",
"src/lib/legacy/ares_parse_mx_reply.c",
"src/lib/legacy/ares_parse_caa_reply.c",
"src/lib/legacy/ares_expand_name.c",
"src/lib/legacy/ares_getsock.c",
"src/lib/legacy/ares_parse_ns_reply.c",
"src/lib/legacy/ares_parse_a_reply.c",
"src/lib/ares_strerror.c",
"src/lib/ares_getnameinfo.c",
"src/lib/ares_version.c",
"src/lib/ares_library_init.c",
"src/lib/ares_sysconfig_files.c",
"src/lib/ares_metrics.c",
"src/lib/ares_conn.c",
"src/lib/ares_query.c",
"src/lib/inet_net_pton.c",
"src/lib/util/ares_rand.c",
"src/lib/util/ares_iface_ips.c",
"src/lib/util/ares_timeval.c",
"src/lib/util/ares_uri.c",
"src/lib/util/ares_threads.c",
"src/lib/util/ares_math.c",
"src/lib/ares_update_servers.c",
"src/lib/record/ares_dns_write.c",
"src/lib/record/ares_dns_record.c",
"src/lib/record/ares_dns_multistring.c",
"src/lib/record/ares_dns_mapping.c",
"src/lib/record/ares_dns_name.c",
"src/lib/record/ares_dns_parse.c",
],
hdrs = [
"ares_build.h",
"ares_config.h",
"include/ares_version.h",
"include/ares.h",
"include/ares_rules.h",
"include/ares_dns.h",
"include/ares_nameser.h",
"src/tools/ares_getopt.h",
"src/lib/ares_strsplit.h",
"include/ares_dns_record.h",
"include/ares.h",
"include/ares_version.h",
"include/ares_dns.h",
"src/lib/event/ares_event_win32.h",
"src/lib/event/ares_event.h",
"src/lib/include/ares_htable_asvp.h",
"src/lib/include/ares_llist.h",
"src/lib/include/ares_htable_vpstr.h",
"src/lib/include/ares_htable_strvp.h",
"src/lib/include/ares_htable_vpvp.h",
"src/lib/include/ares_htable_szvp.h",
"src/lib/include/ares_mem.h",
"src/lib/include/ares_htable_dict.h",
"src/lib/include/ares_array.h",
"src/lib/include/ares_buf.h",
"src/lib/include/ares_str.h",
"src/lib/ares_android.h",
"src/lib/ares_private.h",
"src/lib/ares_llist.h",
"src/lib/ares_platform.h",
"src/lib/ares_socket.h",
"src/lib/ares_ipv6.h",
"src/lib/config-dos.h",
"src/lib/bitncmp.h",
"src/lib/ares_strcasecmp.h",
"src/lib/setup_once.h",
"src/lib/ares_inet_net_pton.h",
"src/lib/str/ares_strsplit.h",
"src/lib/dsa/ares_slist.h",
"src/lib/dsa/ares_htable.h",
"src/lib/ares_data.h",
"src/lib/ares_getenv.h",
"src/lib/config-win32.h",
"src/lib/ares_strdup.h",
"src/lib/ares_iphlpapi.h",
"src/lib/ares_conn.h",
"src/lib/ares_setup.h",
"src/lib/ares_writev.h",
"src/lib/ares_nowarn.h",
"src/lib/thirdparty/apple/dnsinfo.h",
"src/lib/util/ares_threads.h",
"src/lib/util/ares_time.h",
"src/lib/util/ares_iface_ips.h",
"src/lib/util/ares_math.h",
"src/lib/util/ares_rand.h",
"src/lib/util/ares_uri.h",
"src/lib/record/ares_dns_multistring.h",
"src/lib/record/ares_dns_private.h",
],
copts = [
"-D_GNU_SOURCE",
@@ -237,9 +284,12 @@ cc_library(
"//conditions:default": [],
}),
defines = ["CARES_STATICLIB"],
includes = ["include", "."],
includes = ["include", "src/lib/include", ".", "src/lib"],
linkopts = select({
":windows": ["-defaultlib:ws2_32.lib"],
":windows": [
"-defaultlib:ws2_32.lib",
"-defaultlib:iphlpapi.lib",
],
"//conditions:default": [],
}),
linkstatic = 1,

3
third_party/cares/config_windows/ares_config.h vendored
View File

@@ -424,3 +424,6 @@
/* Type to use in place of in_addr_t when system does not provide it. */
#undef in_addr_t
/* gRPC manual edits here! */
#define HAVE_IPHLPAPI_H
#define HAVE_NETIOAPI_H

2
tools/run_tests/sanity/check_submodules.sh
View File

@@ -29,7 +29,7 @@ third_party/abseil-cpp 76bb24329e8bf5f39704eb10d21b9a80befa7c81
third_party/benchmark 12235e24652fc7f809373e7c11a5f73c5763fc4c
third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2
third_party/boringssl-with-bazel c63fadbde60a2224c22189d14c4001bbd2a3a629
third_party/cares/cares 6360e96b5cf8e5980c887ce58ef727e53d77243a
third_party/cares/cares d3a507e920e7af18a5efb7f9f1d8044ed4750013
third_party/envoy-api 4de3c74cf21a9958c1cf26d8993c55c6e0d28b49
third_party/googleapis fe8ba054ad4f7eca946c2d14a63c3f07c0b586a0
third_party/googletest 52eb8108c5bdec04579160ae17225d66034bd723