diff --git a/Package.swift b/Package.swift index 386c3b36540..c2cc9bfac6d 100644 --- a/Package.swift +++ b/Package.swift @@ -1085,7 +1085,6 @@ let package = Package( "src/core/lib/event_engine/handle_containers.h", "src/core/lib/event_engine/memory_allocator.cc", "src/core/lib/event_engine/memory_allocator_factory.h", - "src/core/lib/event_engine/nameser.h", "src/core/lib/event_engine/poller.h", "src/core/lib/event_engine/posix.h", "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index f9c22f9c7b2..5ae25305e81 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -696,7 +696,6 @@ libs: - src/core/lib/event_engine/grpc_polled_fd.h - src/core/lib/event_engine/handle_containers.h - src/core/lib/event_engine/memory_allocator_factory.h - - src/core/lib/event_engine/nameser.h - src/core/lib/event_engine/poller.h - src/core/lib/event_engine/posix.h - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h @@ -2107,7 +2106,6 @@ libs: - src/core/lib/event_engine/grpc_polled_fd.h - src/core/lib/event_engine/handle_containers.h - src/core/lib/event_engine/memory_allocator_factory.h - - src/core/lib/event_engine/nameser.h - src/core/lib/event_engine/poller.h - src/core/lib/event_engine/posix.h - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h @@ -4120,7 +4118,6 @@ libs: - src/core/lib/event_engine/grpc_polled_fd.h - src/core/lib/event_engine/handle_containers.h - src/core/lib/event_engine/memory_allocator_factory.h - - src/core/lib/event_engine/nameser.h - src/core/lib/event_engine/poller.h - src/core/lib/event_engine/posix.h - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h @@ -15636,7 +15633,6 @@ targets: - src/core/lib/event_engine/grpc_polled_fd.h - src/core/lib/event_engine/handle_containers.h - src/core/lib/event_engine/memory_allocator_factory.h - - src/core/lib/event_engine/nameser.h - src/core/lib/event_engine/poller.h - src/core/lib/event_engine/posix.h - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index a2c4378cc9d..66701102fc0 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -767,7 +767,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/grpc_polled_fd.h', 'src/core/lib/event_engine/handle_containers.h', 'src/core/lib/event_engine/memory_allocator_factory.h', - 'src/core/lib/event_engine/nameser.h', 'src/core/lib/event_engine/poller.h', 'src/core/lib/event_engine/posix.h', 'src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h', @@ -1835,7 +1834,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/grpc_polled_fd.h', 'src/core/lib/event_engine/handle_containers.h', 'src/core/lib/event_engine/memory_allocator_factory.h', - 'src/core/lib/event_engine/nameser.h', 'src/core/lib/event_engine/poller.h', 'src/core/lib/event_engine/posix.h', 'src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 10a71ac0751..cb23b297197 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1186,7 +1186,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/handle_containers.h', 'src/core/lib/event_engine/memory_allocator.cc', 'src/core/lib/event_engine/memory_allocator_factory.h', - 'src/core/lib/event_engine/nameser.h', 'src/core/lib/event_engine/poller.h', 'src/core/lib/event_engine/posix.h', 'src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc', @@ -2587,7 +2586,6 @@ Pod::Spec.new do |s| 'src/core/lib/event_engine/grpc_polled_fd.h', 'src/core/lib/event_engine/handle_containers.h', 'src/core/lib/event_engine/memory_allocator_factory.h', - 'src/core/lib/event_engine/nameser.h', 'src/core/lib/event_engine/poller.h', 'src/core/lib/event_engine/posix.h', 'src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h', diff --git a/grpc.gemspec b/grpc.gemspec index b37dbe8c127..41ab905785a 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1091,7 +1091,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/event_engine/handle_containers.h ) s.files += %w( src/core/lib/event_engine/memory_allocator.cc ) s.files += %w( src/core/lib/event_engine/memory_allocator_factory.h ) - s.files += %w( src/core/lib/event_engine/nameser.h ) s.files += %w( src/core/lib/event_engine/poller.h ) s.files += %w( src/core/lib/event_engine/posix.h ) s.files += %w( src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc ) diff --git a/package.xml b/package.xml index 811227b9438..654ff0c29cb 100644 --- a/package.xml +++ b/package.xml @@ -1073,7 +1073,6 @@ - diff --git a/src/core/BUILD b/src/core/BUILD index 777eb1e1ea1..8e64a89e95a 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -2394,7 +2394,6 @@ grpc_cc_library( hdrs = [ "lib/event_engine/ares_resolver.h", "lib/event_engine/grpc_polled_fd.h", - "lib/event_engine/nameser.h", "lib/event_engine/posix_engine/grpc_polled_fd_posix.h", ], external_deps = [ diff --git a/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc index c137ef34f1e..2f26a9fcf1c 100644 --- a/src/core/lib/event_engine/ares_resolver.cc +++ b/src/core/lib/event_engine/ares_resolver.cc @@ -33,17 +33,7 @@ #if GRPC_ARES == 1 -#include - -#include - -#if ARES_VERSION >= 0x011200 -// c-ares 1.18.0 or later starts to provide ares_nameser.h as a public header. #include -#else -#include "src/core/lib/event_engine/nameser.h" // IWYU pragma: keep -#endif - #include #include diff --git a/src/core/lib/event_engine/nameser.h b/src/core/lib/event_engine/nameser.h deleted file mode 100644 index c73a91622d5..00000000000 --- a/src/core/lib/event_engine/nameser.h +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright 2023 The gRPC Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_NAMESER_H -#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_NAMESER_H - -#include - -#include "src/core/lib/iomgr/port.h" - -#ifdef GRPC_HAVE_ARPA_NAMESER - -#include // IWYU pragma: keep - -#else // GRPC_HAVE_ARPA_NAMESER - -typedef enum __ns_class { - ns_c_invalid = 0, // Cookie. - ns_c_in = 1, // Internet. - ns_c_2 = 2, // unallocated/unsupported. - ns_c_chaos = 3, // MIT Chaos-net. - ns_c_hs = 4, // MIT Hesiod. - // Query class values which do not appear in resource records - ns_c_none = 254, // for prereq. sections in update requests - ns_c_any = 255, // Wildcard match. - ns_c_max = 65536 -} ns_class; - -typedef enum __ns_type { - ns_t_invalid = 0, // Cookie. - ns_t_a = 1, // Host address. - ns_t_ns = 2, // Authoritative server. - ns_t_md = 3, // Mail destination. - ns_t_mf = 4, // Mail forwarder. - ns_t_cname = 5, // Canonical name. - ns_t_soa = 6, // Start of authority zone. - ns_t_mb = 7, // Mailbox domain name. - ns_t_mg = 8, // Mail group member. - ns_t_mr = 9, // Mail rename name. - ns_t_null = 10, // Null resource record. - ns_t_wks = 11, // Well known service. - ns_t_ptr = 12, // Domain name pointer. - ns_t_hinfo = 13, // Host information. - ns_t_minfo = 14, // Mailbox information. - ns_t_mx = 15, // Mail routing information. - ns_t_txt = 16, // Text strings. - ns_t_rp = 17, // Responsible person. - ns_t_afsdb = 18, // AFS cell database. - ns_t_x25 = 19, // X_25 calling address. - ns_t_isdn = 20, // ISDN calling address. - ns_t_rt = 21, // Router. - ns_t_nsap = 22, // NSAP address. - ns_t_nsap_ptr = 23, // Reverse NSAP lookup (deprecated). - ns_t_sig = 24, // Security signature. - ns_t_key = 25, // Security key. - ns_t_px = 26, // X.400 mail mapping. - ns_t_gpos = 27, // Geographical position (withdrawn). - ns_t_aaaa = 28, // Ip6 Address. - ns_t_loc = 29, // Location Information. - ns_t_nxt = 30, // Next domain (security). - ns_t_eid = 31, // Endpoint identifier. - ns_t_nimloc = 32, // Nimrod Locator. - ns_t_srv = 33, // Server Selection. - ns_t_atma = 34, // ATM Address - ns_t_naptr = 35, // Naming Authority PoinTeR - ns_t_kx = 36, // Key Exchange - ns_t_cert = 37, // Certification record - ns_t_a6 = 38, // IPv6 address (deprecates AAAA) - ns_t_dname = 39, // Non-terminal DNAME (for IPv6) - ns_t_sink = 40, // Kitchen sink (experimentatl) - ns_t_opt = 41, // EDNS0 option (meta-RR) - ns_t_apl = 42, // Address prefix list (RFC3123) - ns_t_ds = 43, // Delegation Signer (RFC4034) - ns_t_sshfp = 44, // SSH Key Fingerprint (RFC4255) - ns_t_rrsig = 46, // Resource Record Signature (RFC4034) - ns_t_nsec = 47, // Next Secure (RFC4034) - ns_t_dnskey = 48, // DNS Public Key (RFC4034) - ns_t_tkey = 249, // Transaction key - ns_t_tsig = 250, // Transaction signature. - ns_t_ixfr = 251, // Incremental zone transfer. - ns_t_axfr = 252, // Transfer zone of authority. - ns_t_mailb = 253, // Transfer mailbox records. - ns_t_maila = 254, // Transfer mail agent records. - ns_t_any = 255, // Wildcard match. - ns_t_zxfr = 256, // BIND-specific, nonstandard. - ns_t_max = 65536 -} ns_type; - -#endif // GRPC_HAVE_ARPA_NAMESER - -#endif // GRPC_SRC_CORE_LIB_EVENT_ENGINE_NAMESER_H diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index dd65e91e131..c27cf5780a0 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2088,7 +2088,6 @@ src/core/lib/event_engine/grpc_polled_fd.h \ src/core/lib/event_engine/handle_containers.h \ src/core/lib/event_engine/memory_allocator.cc \ src/core/lib/event_engine/memory_allocator_factory.h \ -src/core/lib/event_engine/nameser.h \ src/core/lib/event_engine/poller.h \ src/core/lib/event_engine/posix.h \ src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 5a4c9d4f1c1..76f0add5f73 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1866,7 +1866,6 @@ src/core/lib/event_engine/grpc_polled_fd.h \ src/core/lib/event_engine/handle_containers.h \ src/core/lib/event_engine/memory_allocator.cc \ src/core/lib/event_engine/memory_allocator_factory.h \ -src/core/lib/event_engine/nameser.h \ src/core/lib/event_engine/poller.h \ src/core/lib/event_engine/posix.h \ src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc \