grpc 1.74.1 → 1.75.0.pre1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Makefile +83 -41
- data/include/grpc/credentials.h +7 -1
- data/src/core/call/client_call.cc +4 -4
- data/src/core/call/filter_fusion.h +1230 -0
- data/src/core/call/metadata.cc +22 -0
- data/src/core/call/metadata.h +24 -2
- data/src/core/channelz/channelz.cc +10 -17
- data/src/core/channelz/channelz.h +58 -19
- data/src/core/channelz/channelz_registry.cc +0 -162
- data/src/core/channelz/channelz_registry.h +14 -7
- data/src/core/channelz/property_list.cc +19 -23
- data/src/core/channelz/property_list.h +3 -1
- data/src/core/channelz/v2tov1/convert.cc +683 -0
- data/src/core/channelz/v2tov1/convert.h +58 -0
- data/src/core/channelz/v2tov1/legacy_api.cc +425 -0
- data/src/core/channelz/v2tov1/legacy_api.h +32 -0
- data/src/core/channelz/v2tov1/property_list.cc +118 -0
- data/src/core/channelz/v2tov1/property_list.h +52 -0
- data/src/core/client_channel/client_channel_filter.cc +5 -4
- data/src/core/client_channel/client_channel_filter.h +2 -2
- data/src/core/client_channel/client_channel_internal.h +2 -1
- data/src/core/client_channel/load_balanced_call_destination.cc +6 -5
- data/src/core/client_channel/subchannel.cc +14 -6
- data/src/core/client_channel/subchannel.h +2 -0
- data/src/core/config/core_configuration.cc +3 -1
- data/src/core/config/core_configuration.h +12 -0
- data/src/core/credentials/transport/alts/alts_credentials.cc +5 -0
- data/src/core/credentials/transport/alts/check_gcp_environment_windows.cc +2 -0
- data/src/core/credentials/transport/channel_creds_registry_init.cc +3 -1
- data/src/core/credentials/transport/ssl/ssl_credentials.cc +1 -1
- data/src/core/credentials/transport/ssl/ssl_security_connector.cc +8 -3
- data/src/core/credentials/transport/tls/grpc_tls_certificate_distributor.cc +29 -24
- data/src/core/credentials/transport/tls/grpc_tls_certificate_distributor.h +19 -8
- data/src/core/credentials/transport/tls/grpc_tls_certificate_provider.cc +96 -54
- data/src/core/credentials/transport/tls/grpc_tls_certificate_provider.h +15 -2
- data/src/core/credentials/transport/tls/spiffe_utils.cc +371 -0
- data/src/core/credentials/transport/tls/spiffe_utils.h +171 -0
- data/src/core/credentials/transport/tls/ssl_utils.cc +11 -10
- data/src/core/credentials/transport/tls/ssl_utils.h +4 -2
- data/src/core/credentials/transport/tls/tls_credentials.cc +2 -0
- data/src/core/credentials/transport/tls/tls_security_connector.cc +11 -26
- data/src/core/credentials/transport/tls/tls_security_connector.h +12 -12
- data/src/core/ext/filters/backend_metrics/backend_metric_filter.cc +1 -2
- data/src/core/ext/filters/http/client/http_client_filter.cc +3 -6
- data/src/core/ext/filters/http/client_authority_filter.cc +1 -2
- data/src/core/ext/filters/http/message_compress/compression_filter.cc +8 -8
- data/src/core/ext/filters/http/server/http_server_filter.cc +3 -6
- data/src/core/ext/filters/message_size/message_size_filter.cc +4 -4
- data/src/core/ext/filters/rbac/rbac_filter.cc +1 -1
- data/src/core/ext/filters/stateful_session/stateful_session_filter.cc +3 -5
- data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +3 -2
- data/src/core/ext/transport/chttp2/transport/flow_control.cc +1 -0
- data/src/core/ext/transport/chttp2/transport/flow_control.h +1 -0
- data/src/core/ext/transport/chttp2/transport/frame.cc +89 -6
- data/src/core/ext/transport/chttp2/transport/frame.h +38 -0
- data/src/core/ext/transport/chttp2/transport/header_assembler.h +5 -14
- data/src/core/ext/transport/chttp2/transport/hpack_parser.h +4 -1
- data/src/core/ext/transport/chttp2/transport/http2_client_transport.cc +294 -78
- data/src/core/ext/transport/chttp2/transport/http2_client_transport.h +128 -9
- data/src/core/ext/transport/chttp2/transport/http2_settings.cc +11 -38
- data/src/core/ext/transport/chttp2/transport/http2_settings.h +52 -35
- data/src/core/ext/transport/chttp2/transport/http2_settings_manager.cc +61 -0
- data/src/core/ext/transport/chttp2/transport/http2_settings_manager.h +142 -0
- data/src/core/ext/transport/chttp2/transport/http2_transport.cc +81 -3
- data/src/core/ext/transport/chttp2/transport/http2_transport.h +12 -1
- data/src/core/ext/transport/chttp2/transport/message_assembler.h +2 -2
- data/src/core/ext/transport/chttp2/transport/parsing.cc +2 -1
- data/src/core/ext/transport/chttp2/transport/ping_promise.cc +2 -1
- data/src/core/ext/transport/chttp2/transport/ping_promise.h +22 -5
- data/src/core/ext/transport/chttp2/transport/stream_data_queue.h +607 -0
- data/src/core/ext/transport/chttp2/transport/writable_streams.h +254 -0
- data/src/core/ext/transport/chttp2/transport/writing.cc +6 -4
- data/src/core/ext/upb-gen/src/proto/grpc/channelz/channelz.upb.h +4959 -0
- data/src/core/ext/upb-gen/src/proto/grpc/channelz/channelz.upb_minitable.c +1111 -0
- data/src/core/ext/upb-gen/src/proto/grpc/channelz/channelz.upb_minitable.h +108 -0
- data/src/core/ext/upb-gen/src/proto/grpc/channelz/v2/property_list.upb.h +142 -54
- data/src/core/ext/upb-gen/src/proto/grpc/channelz/v2/property_list.upb_minitable.c +18 -14
- data/src/core/ext/upb-gen/src/proto/grpc/channelz/v2/property_list.upb_minitable.h +2 -2
- data/src/core/ext/upbdefs-gen/src/proto/grpc/channelz/channelz.upbdefs.c +716 -0
- data/src/core/ext/upbdefs-gen/src/proto/grpc/channelz/channelz.upbdefs.h +227 -0
- data/src/core/ext/upbdefs-gen/src/proto/grpc/channelz/v2/property_list.upbdefs.c +86 -88
- data/src/core/ext/upbdefs-gen/src/proto/grpc/channelz/v2/property_list.upbdefs.h +2 -2
- data/src/core/filter/auth/auth_filters.h +2 -2
- data/src/core/filter/fused_filters.cc +154 -0
- data/src/core/handshaker/security/legacy_secure_endpoint.cc +1 -1
- data/src/core/handshaker/security/pipelined_secure_endpoint.cc +965 -0
- data/src/core/handshaker/security/secure_endpoint.cc +28 -13
- data/src/core/handshaker/security/secure_endpoint.h +8 -0
- data/src/core/lib/channel/promise_based_filter.cc +15 -25
- data/src/core/lib/channel/promise_based_filter.h +6 -5
- data/src/core/lib/event_engine/ares_resolver.h +3 -1
- data/src/core/lib/event_engine/cf_engine/cf_engine.cc +9 -5
- data/src/core/lib/event_engine/cf_engine/cf_engine.h +2 -1
- data/src/core/lib/event_engine/cf_engine/cfsocket_listener.cc +263 -0
- data/src/core/lib/event_engine/cf_engine/cfsocket_listener.h +107 -0
- data/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc +31 -3
- data/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h +12 -0
- data/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc +12 -10
- data/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h +6 -4
- data/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc +15 -14
- data/src/core/lib/event_engine/posix_engine/ev_poll_posix.h +7 -5
- data/src/core/lib/event_engine/posix_engine/event_poller.h +0 -8
- data/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc +11 -5
- data/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h +3 -2
- data/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h +1 -0
- data/src/core/lib/event_engine/posix_engine/lockfree_event.cc +4 -4
- data/src/core/lib/event_engine/posix_engine/lockfree_event.h +3 -4
- data/src/core/lib/event_engine/posix_engine/posix_endpoint.cc +2 -2
- data/src/core/lib/event_engine/posix_engine/posix_engine.cc +188 -199
- data/src/core/lib/event_engine/posix_engine/posix_engine.h +30 -45
- data/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc +1 -1
- data/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h +1 -1
- data/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc +2 -1
- data/src/core/lib/experiments/experiments.cc +120 -6
- data/src/core/lib/experiments/experiments.h +46 -3
- data/src/core/lib/iomgr/combiner.cc +1 -1
- data/src/core/lib/iomgr/exec_ctx.h +3 -9
- data/src/core/lib/iomgr/socket_mutator.cc +1 -1
- data/src/core/lib/iomgr/socket_utils_posix.cc +1 -1
- data/src/core/lib/iomgr/socket_utils_posix.h +1 -1
- data/src/core/lib/iomgr/tcp_client_posix.cc +1 -1
- data/src/core/lib/iomgr/tcp_posix.cc +3 -3
- data/src/core/lib/promise/activity.h +2 -2
- data/src/core/lib/promise/mpsc.cc +8 -8
- data/src/core/lib/promise/party.cc +7 -7
- data/src/core/lib/promise/party.h +4 -4
- data/src/core/lib/promise/poll.h +10 -0
- data/src/core/lib/resource_quota/memory_quota.cc +90 -3
- data/src/core/lib/resource_quota/memory_quota.h +20 -9
- data/src/core/lib/resource_quota/periodic_update.cc +14 -0
- data/src/core/lib/resource_quota/periodic_update.h +8 -0
- data/src/core/lib/resource_quota/resource_quota.cc +15 -4
- data/src/core/lib/resource_quota/resource_quota.h +3 -0
- data/src/core/lib/security/authorization/grpc_server_authz_filter.cc +1 -2
- data/src/core/lib/surface/call.cc +5 -5
- data/src/core/lib/surface/call.h +6 -5
- data/src/core/lib/surface/completion_queue.cc +2 -4
- data/src/core/lib/surface/filter_stack_call.cc +1 -1
- data/src/core/lib/surface/version.cc +2 -2
- data/src/core/lib/transport/promise_endpoint.cc +2 -2
- data/src/core/lib/transport/promise_endpoint.h +3 -3
- data/src/core/load_balancing/endpoint_list.cc +29 -2
- data/src/core/load_balancing/grpclb/client_load_reporting_filter.cc +3 -3
- data/src/core/load_balancing/grpclb/client_load_reporting_filter.h +1 -1
- data/src/core/load_balancing/pick_first/pick_first.cc +12 -5
- data/src/core/load_balancing/xds/xds_cluster_impl.cc +5 -3
- data/src/core/net/socket_mutator.cc +19 -0
- data/src/core/net/socket_mutator.h +25 -0
- data/src/core/plugin_registry/grpc_plugin_registry.cc +6 -0
- data/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h +6 -1
- data/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +2 -1
- data/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc +8 -5
- data/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h +2 -1
- data/src/core/resolver/xds/xds_dependency_manager.cc +1 -1
- data/src/core/server/server.cc +1 -1
- data/src/core/server/server_call_tracer_filter.cc +0 -66
- data/src/core/server/server_call_tracer_filter.h +64 -0
- data/src/core/server/server_config_selector_filter.cc +1 -1
- data/src/core/service_config/service_config_channel_arg_filter.cc +3 -60
- data/src/core/service_config/service_config_channel_arg_filter.h +82 -0
- data/src/core/telemetry/call_tracer.cc +20 -14
- data/src/core/telemetry/call_tracer.h +22 -17
- data/src/core/telemetry/metrics.h +8 -8
- data/src/core/telemetry/stats_data.cc +151 -151
- data/src/core/telemetry/stats_data.h +87 -87
- data/src/core/transport/auth_context.cc +20 -0
- data/src/core/transport/auth_context.h +4 -0
- data/src/core/transport/auth_context_comparator_registry.h +69 -0
- data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +2 -3
- data/src/core/tsi/ssl_transport_security.cc +202 -32
- data/src/core/tsi/ssl_transport_security.h +19 -10
- data/src/core/tsi/ssl_transport_security_utils.cc +21 -0
- data/src/core/tsi/ssl_transport_security_utils.h +4 -0
- data/src/core/util/http_client/httpcli_security_connector.cc +3 -1
- data/src/core/util/latent_see.cc +178 -146
- data/src/core/util/latent_see.h +245 -188
- data/src/core/util/single_set_ptr.h +5 -2
- data/src/core/util/useful.h +91 -0
- data/src/core/util/windows/directory_reader.cc +1 -0
- data/src/core/util/windows/thd.cc +1 -3
- data/src/core/util/work_serializer.cc +1 -1
- data/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc +32 -5
- data/src/core/xds/grpc/file_watcher_certificate_provider_factory.h +5 -0
- data/src/core/xds/grpc/xds_certificate_provider.cc +5 -6
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +1 -1
- data/src/ruby/lib/grpc/version.rb +1 -1
- data/third_party/cares/cares/include/ares.h +925 -460
- data/third_party/cares/cares/include/ares_dns.h +86 -71
- data/third_party/cares/cares/include/ares_dns_record.h +1118 -0
- data/third_party/cares/cares/include/ares_nameser.h +215 -189
- data/third_party/cares/cares/include/ares_version.h +37 -14
- data/third_party/cares/cares/src/lib/ares_addrinfo2hostent.c +305 -0
- data/third_party/cares/cares/src/lib/ares_addrinfo_localhost.c +245 -0
- data/third_party/cares/cares/src/lib/ares_android.c +216 -164
- data/third_party/cares/cares/src/lib/ares_android.h +25 -14
- data/third_party/cares/cares/src/lib/ares_cancel.c +68 -44
- data/third_party/cares/cares/src/lib/ares_close_sockets.c +137 -0
- data/third_party/cares/cares/src/lib/ares_conn.c +511 -0
- data/third_party/cares/cares/src/lib/ares_conn.h +196 -0
- data/third_party/cares/cares/src/lib/ares_cookie.c +461 -0
- data/third_party/cares/cares/src/lib/ares_data.c +93 -181
- data/third_party/cares/cares/src/lib/ares_data.h +50 -39
- data/third_party/cares/cares/src/lib/ares_destroy.c +127 -89
- data/third_party/cares/cares/src/lib/ares_free_hostent.c +35 -24
- data/third_party/cares/cares/src/lib/ares_free_string.c +24 -16
- data/third_party/cares/cares/src/lib/ares_freeaddrinfo.c +45 -38
- data/third_party/cares/cares/src/lib/ares_getaddrinfo.c +549 -663
- data/third_party/cares/cares/src/lib/ares_getenv.c +25 -15
- data/third_party/cares/cares/src/lib/ares_getenv.h +26 -18
- data/third_party/cares/cares/src/lib/ares_gethostbyaddr.c +163 -221
- data/third_party/cares/cares/src/lib/ares_gethostbyname.c +222 -223
- data/third_party/cares/cares/src/lib/ares_getnameinfo.c +328 -338
- data/third_party/cares/cares/src/lib/ares_hosts_file.c +952 -0
- data/third_party/cares/cares/src/lib/ares_inet_net_pton.h +25 -19
- data/third_party/cares/cares/src/lib/ares_init.c +425 -2091
- data/third_party/cares/cares/src/lib/ares_ipv6.h +63 -33
- data/third_party/cares/cares/src/lib/ares_library_init.c +110 -54
- data/third_party/cares/cares/src/lib/ares_metrics.c +261 -0
- data/third_party/cares/cares/src/lib/ares_options.c +418 -332
- data/third_party/cares/cares/src/lib/ares_parse_into_addrinfo.c +179 -0
- data/third_party/cares/cares/src/lib/ares_private.h +558 -356
- data/third_party/cares/cares/src/lib/ares_process.c +1224 -1369
- data/third_party/cares/cares/src/lib/ares_qcache.c +430 -0
- data/third_party/cares/cares/src/lib/ares_query.c +126 -121
- data/third_party/cares/cares/src/lib/ares_search.c +564 -262
- data/third_party/cares/cares/src/lib/ares_send.c +264 -93
- data/third_party/cares/cares/src/lib/ares_set_socket_functions.c +588 -0
- data/third_party/cares/cares/src/lib/ares_setup.h +115 -111
- data/third_party/cares/cares/src/lib/ares_socket.c +425 -0
- data/third_party/cares/cares/src/lib/ares_socket.h +163 -0
- data/third_party/cares/cares/src/lib/ares_sortaddrinfo.c +447 -0
- data/third_party/cares/cares/src/lib/ares_strerror.c +83 -48
- data/third_party/cares/cares/src/lib/ares_sysconfig.c +639 -0
- data/third_party/cares/cares/src/lib/ares_sysconfig_files.c +839 -0
- data/third_party/cares/cares/src/lib/ares_sysconfig_mac.c +373 -0
- data/third_party/cares/cares/src/lib/ares_sysconfig_win.c +621 -0
- data/third_party/cares/cares/src/lib/ares_timeout.c +136 -73
- data/third_party/cares/cares/src/lib/ares_update_servers.c +1362 -0
- data/third_party/cares/cares/src/lib/ares_version.c +29 -4
- data/third_party/cares/cares/src/lib/config-dos.h +88 -89
- data/third_party/cares/cares/src/lib/config-win32.h +122 -77
- data/third_party/cares/cares/src/lib/dsa/ares_array.c +394 -0
- data/third_party/cares/cares/src/lib/dsa/ares_htable.c +447 -0
- data/third_party/cares/cares/src/lib/dsa/ares_htable.h +174 -0
- data/third_party/cares/cares/src/lib/dsa/ares_htable_asvp.c +224 -0
- data/third_party/cares/cares/src/lib/dsa/ares_htable_dict.c +228 -0
- data/third_party/cares/cares/src/lib/dsa/ares_htable_strvp.c +210 -0
- data/third_party/cares/cares/src/lib/dsa/ares_htable_szvp.c +188 -0
- data/third_party/cares/cares/src/lib/dsa/ares_htable_vpstr.c +186 -0
- data/third_party/cares/cares/src/lib/dsa/ares_htable_vpvp.c +194 -0
- data/third_party/cares/cares/src/lib/dsa/ares_llist.c +382 -0
- data/third_party/cares/cares/src/lib/dsa/ares_slist.c +479 -0
- data/third_party/cares/cares/src/lib/dsa/ares_slist.h +207 -0
- data/third_party/cares/cares/src/lib/event/ares_event.h +191 -0
- data/third_party/cares/cares/src/lib/event/ares_event_configchg.c +743 -0
- data/third_party/cares/cares/src/lib/event/ares_event_epoll.c +192 -0
- data/third_party/cares/cares/src/lib/event/ares_event_kqueue.c +248 -0
- data/third_party/cares/cares/src/lib/event/ares_event_poll.c +140 -0
- data/third_party/cares/cares/src/lib/event/ares_event_select.c +159 -0
- data/third_party/cares/cares/src/lib/event/ares_event_thread.c +567 -0
- data/third_party/cares/cares/src/lib/event/ares_event_wake_pipe.c +166 -0
- data/third_party/cares/cares/src/lib/event/ares_event_win32.c +978 -0
- data/third_party/cares/cares/src/lib/event/ares_event_win32.h +161 -0
- data/third_party/cares/cares/src/lib/include/ares_array.h +276 -0
- data/third_party/cares/cares/src/lib/include/ares_buf.h +732 -0
- data/third_party/cares/cares/src/lib/include/ares_htable_asvp.h +130 -0
- data/third_party/cares/cares/src/lib/include/ares_htable_dict.h +123 -0
- data/third_party/cares/cares/src/lib/include/ares_htable_strvp.h +130 -0
- data/third_party/cares/cares/src/lib/include/ares_htable_szvp.h +118 -0
- data/third_party/cares/cares/src/lib/include/ares_htable_vpstr.h +111 -0
- data/third_party/cares/cares/src/lib/include/ares_htable_vpvp.h +128 -0
- data/third_party/cares/cares/src/lib/include/ares_llist.h +239 -0
- data/third_party/cares/cares/src/lib/include/ares_mem.h +38 -0
- data/third_party/cares/cares/src/lib/include/ares_str.h +244 -0
- data/third_party/cares/cares/src/lib/inet_net_pton.c +202 -157
- data/third_party/cares/cares/src/lib/inet_ntop.c +87 -69
- data/third_party/cares/cares/src/lib/legacy/ares_create_query.c +78 -0
- data/third_party/cares/cares/src/lib/legacy/ares_expand_name.c +99 -0
- data/third_party/cares/cares/src/lib/legacy/ares_expand_string.c +107 -0
- data/third_party/cares/cares/src/lib/legacy/ares_fds.c +80 -0
- data/third_party/cares/cares/src/lib/legacy/ares_getsock.c +85 -0
- data/third_party/cares/cares/src/lib/legacy/ares_parse_a_reply.c +107 -0
- data/third_party/cares/cares/src/lib/legacy/ares_parse_aaaa_reply.c +109 -0
- data/third_party/cares/cares/src/lib/legacy/ares_parse_caa_reply.c +137 -0
- data/third_party/cares/cares/src/lib/legacy/ares_parse_mx_reply.c +110 -0
- data/third_party/cares/cares/src/lib/legacy/ares_parse_naptr_reply.c +132 -0
- data/third_party/cares/cares/src/lib/legacy/ares_parse_ns_reply.c +154 -0
- data/third_party/cares/cares/src/lib/legacy/ares_parse_ptr_reply.c +213 -0
- data/third_party/cares/cares/src/lib/legacy/ares_parse_soa_reply.c +115 -0
- data/third_party/cares/cares/src/lib/legacy/ares_parse_srv_reply.c +114 -0
- data/third_party/cares/cares/src/lib/legacy/ares_parse_txt_reply.c +144 -0
- data/third_party/cares/cares/src/lib/legacy/ares_parse_uri_reply.c +113 -0
- data/third_party/cares/cares/src/lib/record/ares_dns_mapping.c +982 -0
- data/third_party/cares/cares/src/lib/record/ares_dns_multistring.c +307 -0
- data/third_party/cares/cares/src/lib/record/ares_dns_multistring.h +72 -0
- data/third_party/cares/cares/src/lib/record/ares_dns_name.c +673 -0
- data/third_party/cares/cares/src/lib/record/ares_dns_parse.c +1329 -0
- data/third_party/cares/cares/src/lib/record/ares_dns_private.h +273 -0
- data/third_party/cares/cares/src/lib/record/ares_dns_record.c +1661 -0
- data/third_party/cares/cares/src/lib/record/ares_dns_write.c +1229 -0
- data/third_party/cares/cares/src/lib/str/ares_buf.c +1498 -0
- data/third_party/cares/cares/src/lib/str/ares_str.c +508 -0
- data/third_party/cares/cares/src/lib/str/ares_strsplit.c +90 -0
- data/third_party/cares/cares/src/lib/str/ares_strsplit.h +51 -0
- data/third_party/cares/cares/src/lib/thirdparty/apple/dnsinfo.h +122 -0
- data/third_party/cares/cares/src/lib/util/ares_iface_ips.c +628 -0
- data/third_party/cares/cares/src/lib/util/ares_iface_ips.h +139 -0
- data/third_party/cares/cares/src/lib/util/ares_math.c +158 -0
- data/third_party/cares/cares/src/lib/util/ares_math.h +45 -0
- data/third_party/cares/cares/src/lib/util/ares_rand.c +389 -0
- data/third_party/cares/cares/src/lib/util/ares_rand.h +36 -0
- data/third_party/cares/cares/src/lib/util/ares_threads.c +614 -0
- data/third_party/cares/cares/src/lib/util/ares_threads.h +60 -0
- data/third_party/cares/cares/src/lib/util/ares_time.h +48 -0
- data/third_party/cares/cares/src/lib/util/ares_timeval.c +95 -0
- data/third_party/cares/cares/src/lib/util/ares_uri.c +1626 -0
- data/third_party/cares/cares/src/lib/util/ares_uri.h +252 -0
- data/third_party/cares/cares/src/lib/windows_port.c +16 -9
- metadata +121 -49
- data/src/core/util/ring_buffer.h +0 -122
- data/third_party/cares/cares/include/ares_rules.h +0 -125
- data/third_party/cares/cares/src/lib/ares__addrinfo2hostent.c +0 -266
- data/third_party/cares/cares/src/lib/ares__addrinfo_localhost.c +0 -240
- data/third_party/cares/cares/src/lib/ares__close_sockets.c +0 -61
- data/third_party/cares/cares/src/lib/ares__get_hostent.c +0 -260
- data/third_party/cares/cares/src/lib/ares__parse_into_addrinfo.c +0 -229
- data/third_party/cares/cares/src/lib/ares__read_line.c +0 -73
- data/third_party/cares/cares/src/lib/ares__readaddrinfo.c +0 -258
- data/third_party/cares/cares/src/lib/ares__sortaddrinfo.c +0 -507
- data/third_party/cares/cares/src/lib/ares__timeval.c +0 -111
- data/third_party/cares/cares/src/lib/ares_create_query.c +0 -197
- data/third_party/cares/cares/src/lib/ares_expand_name.c +0 -311
- data/third_party/cares/cares/src/lib/ares_expand_string.c +0 -67
- data/third_party/cares/cares/src/lib/ares_fds.c +0 -59
- data/third_party/cares/cares/src/lib/ares_getsock.c +0 -66
- data/third_party/cares/cares/src/lib/ares_iphlpapi.h +0 -221
- data/third_party/cares/cares/src/lib/ares_llist.c +0 -63
- data/third_party/cares/cares/src/lib/ares_llist.h +0 -39
- data/third_party/cares/cares/src/lib/ares_mkquery.c +0 -24
- data/third_party/cares/cares/src/lib/ares_nowarn.c +0 -260
- data/third_party/cares/cares/src/lib/ares_nowarn.h +0 -61
- data/third_party/cares/cares/src/lib/ares_parse_a_reply.c +0 -90
- data/third_party/cares/cares/src/lib/ares_parse_aaaa_reply.c +0 -92
- data/third_party/cares/cares/src/lib/ares_parse_caa_reply.c +0 -199
- data/third_party/cares/cares/src/lib/ares_parse_mx_reply.c +0 -164
- data/third_party/cares/cares/src/lib/ares_parse_naptr_reply.c +0 -183
- data/third_party/cares/cares/src/lib/ares_parse_ns_reply.c +0 -177
- data/third_party/cares/cares/src/lib/ares_parse_ptr_reply.c +0 -228
- data/third_party/cares/cares/src/lib/ares_parse_soa_reply.c +0 -179
- data/third_party/cares/cares/src/lib/ares_parse_srv_reply.c +0 -168
- data/third_party/cares/cares/src/lib/ares_parse_txt_reply.c +0 -214
- data/third_party/cares/cares/src/lib/ares_parse_uri_reply.c +0 -184
- data/third_party/cares/cares/src/lib/ares_platform.c +0 -11042
- data/third_party/cares/cares/src/lib/ares_platform.h +0 -43
- data/third_party/cares/cares/src/lib/ares_rand.c +0 -279
- data/third_party/cares/cares/src/lib/ares_strcasecmp.c +0 -66
- data/third_party/cares/cares/src/lib/ares_strcasecmp.h +0 -30
- data/third_party/cares/cares/src/lib/ares_strdup.c +0 -42
- data/third_party/cares/cares/src/lib/ares_strdup.h +0 -24
- data/third_party/cares/cares/src/lib/ares_strsplit.c +0 -94
- data/third_party/cares/cares/src/lib/ares_strsplit.h +0 -42
- data/third_party/cares/cares/src/lib/ares_writev.c +0 -79
- data/third_party/cares/cares/src/lib/ares_writev.h +0 -36
- data/third_party/cares/cares/src/lib/bitncmp.c +0 -59
- data/third_party/cares/cares/src/lib/bitncmp.h +0 -26
- data/third_party/cares/cares/src/lib/setup_once.h +0 -554
- data/third_party/cares/cares/src/tools/ares_getopt.h +0 -53
@@ -0,0 +1,743 @@
|
|
1
|
+
/* MIT License
|
2
|
+
*
|
3
|
+
* Copyright (c) 2024 Brad House
|
4
|
+
*
|
5
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
6
|
+
* of this software and associated documentation files (the "Software"), to deal
|
7
|
+
* in the Software without restriction, including without limitation the rights
|
8
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
9
|
+
* copies of the Software, and to permit persons to whom the Software is
|
10
|
+
* furnished to do so, subject to the following conditions:
|
11
|
+
*
|
12
|
+
* The above copyright notice and this permission notice (including the next
|
13
|
+
* paragraph) shall be included in all copies or substantial portions of the
|
14
|
+
* Software.
|
15
|
+
*
|
16
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
17
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
18
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
19
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
20
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
21
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
22
|
+
* SOFTWARE.
|
23
|
+
*
|
24
|
+
* SPDX-License-Identifier: MIT
|
25
|
+
*/
|
26
|
+
#include "ares_private.h"
|
27
|
+
#include "ares_event.h"
|
28
|
+
|
29
|
+
#if defined(__ANDROID__) && defined(CARES_THREADS)
|
30
|
+
|
31
|
+
ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
|
32
|
+
ares_event_thread_t *e)
|
33
|
+
{
|
34
|
+
(void)configchg;
|
35
|
+
(void)e;
|
36
|
+
/* No ability */
|
37
|
+
return ARES_ENOTIMP;
|
38
|
+
}
|
39
|
+
|
40
|
+
void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
|
41
|
+
{
|
42
|
+
/* No-op */
|
43
|
+
(void)configchg;
|
44
|
+
}
|
45
|
+
|
46
|
+
#elif defined(__linux__) && defined(CARES_THREADS)
|
47
|
+
|
48
|
+
# include <sys/inotify.h>
|
49
|
+
|
50
|
+
struct ares_event_configchg {
|
51
|
+
int inotify_fd;
|
52
|
+
ares_event_thread_t *e;
|
53
|
+
};
|
54
|
+
|
55
|
+
void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
|
56
|
+
{
|
57
|
+
if (configchg == NULL) {
|
58
|
+
return; /* LCOV_EXCL_LINE: DefensiveCoding */
|
59
|
+
}
|
60
|
+
|
61
|
+
/* Tell event system to stop monitoring for changes. This will cause the
|
62
|
+
* cleanup to be called */
|
63
|
+
ares_event_update(NULL, configchg->e, ARES_EVENT_FLAG_NONE, NULL,
|
64
|
+
configchg->inotify_fd, NULL, NULL, NULL);
|
65
|
+
}
|
66
|
+
|
67
|
+
static void ares_event_configchg_free(void *data)
|
68
|
+
{
|
69
|
+
ares_event_configchg_t *configchg = data;
|
70
|
+
if (configchg == NULL) {
|
71
|
+
return; /* LCOV_EXCL_LINE: DefensiveCoding */
|
72
|
+
}
|
73
|
+
|
74
|
+
if (configchg->inotify_fd >= 0) {
|
75
|
+
close(configchg->inotify_fd);
|
76
|
+
configchg->inotify_fd = -1;
|
77
|
+
}
|
78
|
+
|
79
|
+
ares_free(configchg);
|
80
|
+
}
|
81
|
+
|
82
|
+
static void ares_event_configchg_cb(ares_event_thread_t *e, ares_socket_t fd,
|
83
|
+
void *data, ares_event_flags_t flags)
|
84
|
+
{
|
85
|
+
const ares_event_configchg_t *configchg = data;
|
86
|
+
|
87
|
+
/* Some systems cannot read integer variables if they are not
|
88
|
+
* properly aligned. On other systems, incorrect alignment may
|
89
|
+
* decrease performance. Hence, the buffer used for reading from
|
90
|
+
* the inotify file descriptor should have the same alignment as
|
91
|
+
* struct inotify_event. */
|
92
|
+
unsigned char buf[4096]
|
93
|
+
__attribute__((aligned(__alignof__(struct inotify_event))));
|
94
|
+
const struct inotify_event *event;
|
95
|
+
ssize_t len;
|
96
|
+
ares_bool_t triggered = ARES_FALSE;
|
97
|
+
|
98
|
+
(void)fd;
|
99
|
+
(void)flags;
|
100
|
+
|
101
|
+
while (1) {
|
102
|
+
const unsigned char *ptr;
|
103
|
+
|
104
|
+
len = read(configchg->inotify_fd, buf, sizeof(buf));
|
105
|
+
if (len <= 0) {
|
106
|
+
break;
|
107
|
+
}
|
108
|
+
|
109
|
+
/* Loop over all events in the buffer. Says kernel will check the buffer
|
110
|
+
* size provided, so I assume it won't ever return partial events. */
|
111
|
+
for (ptr = buf; ptr < buf + len;
|
112
|
+
ptr += sizeof(struct inotify_event) + event->len) {
|
113
|
+
event = (const struct inotify_event *)((const void *)ptr);
|
114
|
+
|
115
|
+
if (event->len == 0 || ares_strlen(event->name) == 0) {
|
116
|
+
continue;
|
117
|
+
}
|
118
|
+
|
119
|
+
if (ares_strcaseeq(event->name, "resolv.conf") ||
|
120
|
+
ares_strcaseeq(event->name, "nsswitch.conf")) {
|
121
|
+
triggered = ARES_TRUE;
|
122
|
+
}
|
123
|
+
}
|
124
|
+
}
|
125
|
+
|
126
|
+
/* Only process after all events are read. No need to process more often as
|
127
|
+
* we don't want to reload the config back to back */
|
128
|
+
if (triggered) {
|
129
|
+
ares_reinit(e->channel);
|
130
|
+
}
|
131
|
+
}
|
132
|
+
|
133
|
+
ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
|
134
|
+
ares_event_thread_t *e)
|
135
|
+
{
|
136
|
+
ares_status_t status = ARES_SUCCESS;
|
137
|
+
ares_event_configchg_t *c;
|
138
|
+
|
139
|
+
(void)e;
|
140
|
+
|
141
|
+
/* Not used by this implementation */
|
142
|
+
*configchg = NULL;
|
143
|
+
|
144
|
+
c = ares_malloc_zero(sizeof(*c));
|
145
|
+
if (c == NULL) {
|
146
|
+
return ARES_ENOMEM; /* LCOV_EXCL_LINE: OutOfMemory */
|
147
|
+
}
|
148
|
+
|
149
|
+
c->e = e;
|
150
|
+
c->inotify_fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
|
151
|
+
if (c->inotify_fd == -1) {
|
152
|
+
status = ARES_ESERVFAIL; /* LCOV_EXCL_LINE: UntestablePath */
|
153
|
+
goto done; /* LCOV_EXCL_LINE: UntestablePath */
|
154
|
+
}
|
155
|
+
|
156
|
+
/* We need to monitor /etc/resolv.conf, /etc/nsswitch.conf */
|
157
|
+
if (inotify_add_watch(c->inotify_fd, "/etc",
|
158
|
+
IN_CREATE | IN_MODIFY | IN_MOVED_TO | IN_ONLYDIR) ==
|
159
|
+
-1) {
|
160
|
+
status = ARES_ESERVFAIL; /* LCOV_EXCL_LINE: UntestablePath */
|
161
|
+
goto done; /* LCOV_EXCL_LINE: UntestablePath */
|
162
|
+
}
|
163
|
+
|
164
|
+
status =
|
165
|
+
ares_event_update(NULL, e, ARES_EVENT_FLAG_READ, ares_event_configchg_cb,
|
166
|
+
c->inotify_fd, c, ares_event_configchg_free, NULL);
|
167
|
+
|
168
|
+
done:
|
169
|
+
if (status != ARES_SUCCESS) {
|
170
|
+
ares_event_configchg_free(c);
|
171
|
+
} else {
|
172
|
+
*configchg = c;
|
173
|
+
}
|
174
|
+
return status;
|
175
|
+
}
|
176
|
+
|
177
|
+
#elif defined(USE_WINSOCK) && defined(CARES_THREADS)
|
178
|
+
|
179
|
+
# include <winsock2.h>
|
180
|
+
# include <iphlpapi.h>
|
181
|
+
# include <stdio.h>
|
182
|
+
# include <windows.h>
|
183
|
+
|
184
|
+
struct ares_event_configchg {
|
185
|
+
HANDLE ifchg_hnd;
|
186
|
+
HKEY regip4;
|
187
|
+
HANDLE regip4_event;
|
188
|
+
HANDLE regip4_wait;
|
189
|
+
HKEY regip6;
|
190
|
+
HANDLE regip6_event;
|
191
|
+
HANDLE regip6_wait;
|
192
|
+
ares_event_thread_t *e;
|
193
|
+
};
|
194
|
+
|
195
|
+
void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
|
196
|
+
{
|
197
|
+
if (configchg == NULL) {
|
198
|
+
return;
|
199
|
+
}
|
200
|
+
|
201
|
+
# ifdef HAVE_NOTIFYIPINTERFACECHANGE
|
202
|
+
if (configchg->ifchg_hnd != NULL) {
|
203
|
+
CancelMibChangeNotify2(configchg->ifchg_hnd);
|
204
|
+
configchg->ifchg_hnd = NULL;
|
205
|
+
}
|
206
|
+
# endif
|
207
|
+
|
208
|
+
# ifdef HAVE_REGISTERWAITFORSINGLEOBJECT
|
209
|
+
if (configchg->regip4_wait != NULL) {
|
210
|
+
UnregisterWait(configchg->regip4_wait);
|
211
|
+
configchg->regip4_wait = NULL;
|
212
|
+
}
|
213
|
+
|
214
|
+
if (configchg->regip6_wait != NULL) {
|
215
|
+
UnregisterWait(configchg->regip6_wait);
|
216
|
+
configchg->regip6_wait = NULL;
|
217
|
+
}
|
218
|
+
|
219
|
+
if (configchg->regip4 != NULL) {
|
220
|
+
RegCloseKey(configchg->regip4);
|
221
|
+
configchg->regip4 = NULL;
|
222
|
+
}
|
223
|
+
|
224
|
+
if (configchg->regip6 != NULL) {
|
225
|
+
RegCloseKey(configchg->regip6);
|
226
|
+
configchg->regip6 = NULL;
|
227
|
+
}
|
228
|
+
|
229
|
+
if (configchg->regip4_event != NULL) {
|
230
|
+
CloseHandle(configchg->regip4_event);
|
231
|
+
configchg->regip4_event = NULL;
|
232
|
+
}
|
233
|
+
|
234
|
+
if (configchg->regip6_event != NULL) {
|
235
|
+
CloseHandle(configchg->regip6_event);
|
236
|
+
configchg->regip6_event = NULL;
|
237
|
+
}
|
238
|
+
# endif
|
239
|
+
|
240
|
+
ares_free(configchg);
|
241
|
+
}
|
242
|
+
|
243
|
+
|
244
|
+
# ifdef HAVE_NOTIFYIPINTERFACECHANGE
|
245
|
+
static void NETIOAPI_API_
|
246
|
+
ares_event_configchg_ip_cb(PVOID CallerContext, PMIB_IPINTERFACE_ROW Row,
|
247
|
+
MIB_NOTIFICATION_TYPE NotificationType)
|
248
|
+
{
|
249
|
+
ares_event_configchg_t *configchg = CallerContext;
|
250
|
+
(void)Row;
|
251
|
+
(void)NotificationType;
|
252
|
+
ares_reinit(configchg->e->channel);
|
253
|
+
}
|
254
|
+
# endif
|
255
|
+
|
256
|
+
static ares_bool_t
|
257
|
+
ares_event_configchg_regnotify(ares_event_configchg_t *configchg)
|
258
|
+
{
|
259
|
+
# ifdef HAVE_REGISTERWAITFORSINGLEOBJECT
|
260
|
+
# if defined(__WATCOMC__) && !defined(REG_NOTIFY_THREAD_AGNOSTIC)
|
261
|
+
# define REG_NOTIFY_THREAD_AGNOSTIC 0x10000000L
|
262
|
+
# endif
|
263
|
+
DWORD flags = REG_NOTIFY_CHANGE_NAME | REG_NOTIFY_CHANGE_LAST_SET |
|
264
|
+
REG_NOTIFY_THREAD_AGNOSTIC;
|
265
|
+
|
266
|
+
if (RegNotifyChangeKeyValue(configchg->regip4, TRUE, flags,
|
267
|
+
configchg->regip4_event, TRUE) != ERROR_SUCCESS) {
|
268
|
+
return ARES_FALSE;
|
269
|
+
}
|
270
|
+
|
271
|
+
if (RegNotifyChangeKeyValue(configchg->regip6, TRUE, flags,
|
272
|
+
configchg->regip6_event, TRUE) != ERROR_SUCCESS) {
|
273
|
+
return ARES_FALSE;
|
274
|
+
}
|
275
|
+
# else
|
276
|
+
(void)configchg;
|
277
|
+
# endif
|
278
|
+
return ARES_TRUE;
|
279
|
+
}
|
280
|
+
|
281
|
+
static VOID CALLBACK ares_event_configchg_reg_cb(PVOID lpParameter,
|
282
|
+
BOOLEAN TimerOrWaitFired)
|
283
|
+
{
|
284
|
+
ares_event_configchg_t *configchg = lpParameter;
|
285
|
+
(void)TimerOrWaitFired;
|
286
|
+
|
287
|
+
ares_reinit(configchg->e->channel);
|
288
|
+
|
289
|
+
/* Re-arm, as its single-shot. However, we don't know which one needs to
|
290
|
+
* be re-armed, so we just do both */
|
291
|
+
ares_event_configchg_regnotify(configchg);
|
292
|
+
}
|
293
|
+
|
294
|
+
ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
|
295
|
+
ares_event_thread_t *e)
|
296
|
+
{
|
297
|
+
ares_status_t status = ARES_SUCCESS;
|
298
|
+
ares_event_configchg_t *c = NULL;
|
299
|
+
|
300
|
+
c = ares_malloc_zero(sizeof(**configchg));
|
301
|
+
if (c == NULL) {
|
302
|
+
return ARES_ENOMEM;
|
303
|
+
}
|
304
|
+
|
305
|
+
c->e = e;
|
306
|
+
|
307
|
+
# ifdef HAVE_NOTIFYIPINTERFACECHANGE
|
308
|
+
/* NOTE: If a user goes into the control panel and changes the network
|
309
|
+
* adapter DNS addresses manually, this will NOT trigger a notification.
|
310
|
+
* We've also tried listening on NotifyUnicastIpAddressChange(), but
|
311
|
+
* that didn't get triggered either.
|
312
|
+
*/
|
313
|
+
if (NotifyIpInterfaceChange(AF_UNSPEC, ares_event_configchg_ip_cb, c, FALSE,
|
314
|
+
&c->ifchg_hnd) != NO_ERROR) {
|
315
|
+
status = ARES_ESERVFAIL;
|
316
|
+
goto done;
|
317
|
+
}
|
318
|
+
# endif
|
319
|
+
|
320
|
+
# ifdef HAVE_REGISTERWAITFORSINGLEOBJECT
|
321
|
+
/* Monitor HKLM\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters\Interfaces
|
322
|
+
* and HKLM\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces
|
323
|
+
* for changes via RegNotifyChangeKeyValue() */
|
324
|
+
if (RegOpenKeyExW(
|
325
|
+
HKEY_LOCAL_MACHINE,
|
326
|
+
L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces",
|
327
|
+
0, KEY_NOTIFY, &c->regip4) != ERROR_SUCCESS) {
|
328
|
+
status = ARES_ESERVFAIL;
|
329
|
+
goto done;
|
330
|
+
}
|
331
|
+
|
332
|
+
if (RegOpenKeyExW(
|
333
|
+
HKEY_LOCAL_MACHINE,
|
334
|
+
L"SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters\\Interfaces",
|
335
|
+
0, KEY_NOTIFY, &c->regip6) != ERROR_SUCCESS) {
|
336
|
+
status = ARES_ESERVFAIL;
|
337
|
+
goto done;
|
338
|
+
}
|
339
|
+
|
340
|
+
c->regip4_event = CreateEvent(NULL, TRUE, FALSE, NULL);
|
341
|
+
if (c->regip4_event == NULL) {
|
342
|
+
status = ARES_ESERVFAIL;
|
343
|
+
goto done;
|
344
|
+
}
|
345
|
+
|
346
|
+
c->regip6_event = CreateEvent(NULL, TRUE, FALSE, NULL);
|
347
|
+
if (c->regip6_event == NULL) {
|
348
|
+
status = ARES_ESERVFAIL;
|
349
|
+
goto done;
|
350
|
+
}
|
351
|
+
|
352
|
+
if (!RegisterWaitForSingleObject(&c->regip4_wait, c->regip4_event,
|
353
|
+
ares_event_configchg_reg_cb, c, INFINITE,
|
354
|
+
WT_EXECUTEDEFAULT)) {
|
355
|
+
status = ARES_ESERVFAIL;
|
356
|
+
goto done;
|
357
|
+
}
|
358
|
+
|
359
|
+
if (!RegisterWaitForSingleObject(&c->regip6_wait, c->regip6_event,
|
360
|
+
ares_event_configchg_reg_cb, c, INFINITE,
|
361
|
+
WT_EXECUTEDEFAULT)) {
|
362
|
+
status = ARES_ESERVFAIL;
|
363
|
+
goto done;
|
364
|
+
}
|
365
|
+
# endif
|
366
|
+
|
367
|
+
if (!ares_event_configchg_regnotify(c)) {
|
368
|
+
status = ARES_ESERVFAIL;
|
369
|
+
goto done;
|
370
|
+
}
|
371
|
+
|
372
|
+
done:
|
373
|
+
if (status != ARES_SUCCESS) {
|
374
|
+
ares_event_configchg_destroy(c);
|
375
|
+
} else {
|
376
|
+
*configchg = c;
|
377
|
+
}
|
378
|
+
|
379
|
+
return status;
|
380
|
+
}
|
381
|
+
|
382
|
+
#elif defined(__APPLE__) && defined(CARES_THREADS)
|
383
|
+
|
384
|
+
# include <sys/types.h>
|
385
|
+
# include <unistd.h>
|
386
|
+
# include <notify.h>
|
387
|
+
# include <dlfcn.h>
|
388
|
+
# include <fcntl.h>
|
389
|
+
|
390
|
+
struct ares_event_configchg {
|
391
|
+
int fd;
|
392
|
+
int token;
|
393
|
+
};
|
394
|
+
|
395
|
+
void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
|
396
|
+
{
|
397
|
+
(void)configchg;
|
398
|
+
|
399
|
+
/* Cleanup happens automatically */
|
400
|
+
}
|
401
|
+
|
402
|
+
static void ares_event_configchg_free(void *data)
|
403
|
+
{
|
404
|
+
ares_event_configchg_t *configchg = data;
|
405
|
+
if (configchg == NULL) {
|
406
|
+
return;
|
407
|
+
}
|
408
|
+
|
409
|
+
if (configchg->fd >= 0) {
|
410
|
+
notify_cancel(configchg->token);
|
411
|
+
/* automatically closes fd */
|
412
|
+
configchg->fd = -1;
|
413
|
+
}
|
414
|
+
|
415
|
+
ares_free(configchg);
|
416
|
+
}
|
417
|
+
|
418
|
+
static void ares_event_configchg_cb(ares_event_thread_t *e, ares_socket_t fd,
|
419
|
+
void *data, ares_event_flags_t flags)
|
420
|
+
{
|
421
|
+
ares_event_configchg_t *configchg = data;
|
422
|
+
ares_bool_t triggered = ARES_FALSE;
|
423
|
+
|
424
|
+
(void)fd;
|
425
|
+
(void)flags;
|
426
|
+
|
427
|
+
while (1) {
|
428
|
+
int t = 0;
|
429
|
+
ssize_t len;
|
430
|
+
|
431
|
+
len = read(configchg->fd, &t, sizeof(t));
|
432
|
+
|
433
|
+
if (len < (ssize_t)sizeof(t)) {
|
434
|
+
break;
|
435
|
+
}
|
436
|
+
|
437
|
+
/* Token is read in network byte order (yeah, docs don't mention this) */
|
438
|
+
t = (int)ntohl(t);
|
439
|
+
|
440
|
+
if (t != configchg->token) {
|
441
|
+
continue;
|
442
|
+
}
|
443
|
+
|
444
|
+
triggered = ARES_TRUE;
|
445
|
+
}
|
446
|
+
|
447
|
+
/* Only process after all events are read. No need to process more often as
|
448
|
+
* we don't want to reload the config back to back */
|
449
|
+
if (triggered) {
|
450
|
+
ares_reinit(e->channel);
|
451
|
+
}
|
452
|
+
}
|
453
|
+
|
454
|
+
ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
|
455
|
+
ares_event_thread_t *e)
|
456
|
+
{
|
457
|
+
ares_status_t status = ARES_SUCCESS;
|
458
|
+
void *handle = NULL;
|
459
|
+
const char *(*pdns_configuration_notify_key)(void) = NULL;
|
460
|
+
const char *notify_key = NULL;
|
461
|
+
int flags;
|
462
|
+
size_t i;
|
463
|
+
const char *searchlibs[] = {
|
464
|
+
"/usr/lib/libSystem.dylib",
|
465
|
+
"/System/Library/Frameworks/SystemConfiguration.framework/"
|
466
|
+
"SystemConfiguration",
|
467
|
+
NULL
|
468
|
+
};
|
469
|
+
|
470
|
+
*configchg = ares_malloc_zero(sizeof(**configchg));
|
471
|
+
if (*configchg == NULL) {
|
472
|
+
return ARES_ENOMEM;
|
473
|
+
}
|
474
|
+
|
475
|
+
/* Load symbol as it isn't normally public */
|
476
|
+
for (i = 0; searchlibs[i] != NULL; i++) {
|
477
|
+
handle = dlopen(searchlibs[i], RTLD_LAZY);
|
478
|
+
if (handle == NULL) {
|
479
|
+
/* Fail, loop! */
|
480
|
+
continue;
|
481
|
+
}
|
482
|
+
|
483
|
+
pdns_configuration_notify_key =
|
484
|
+
(const char *(*)(void))dlsym(handle, "dns_configuration_notify_key");
|
485
|
+
if (pdns_configuration_notify_key != NULL) {
|
486
|
+
break;
|
487
|
+
}
|
488
|
+
|
489
|
+
/* Fail, loop! */
|
490
|
+
dlclose(handle);
|
491
|
+
handle = NULL;
|
492
|
+
}
|
493
|
+
|
494
|
+
if (pdns_configuration_notify_key == NULL) {
|
495
|
+
status = ARES_ESERVFAIL;
|
496
|
+
goto done;
|
497
|
+
}
|
498
|
+
|
499
|
+
notify_key = pdns_configuration_notify_key();
|
500
|
+
if (notify_key == NULL) {
|
501
|
+
status = ARES_ESERVFAIL;
|
502
|
+
goto done;
|
503
|
+
}
|
504
|
+
|
505
|
+
if (notify_register_file_descriptor(notify_key, &(*configchg)->fd, 0,
|
506
|
+
&(*configchg)->token) !=
|
507
|
+
NOTIFY_STATUS_OK) {
|
508
|
+
status = ARES_ESERVFAIL;
|
509
|
+
goto done;
|
510
|
+
}
|
511
|
+
|
512
|
+
/* Set file descriptor to non-blocking */
|
513
|
+
flags = fcntl((*configchg)->fd, F_GETFL, 0);
|
514
|
+
fcntl((*configchg)->fd, F_SETFL, flags | O_NONBLOCK);
|
515
|
+
|
516
|
+
/* Register file descriptor with event subsystem */
|
517
|
+
status = ares_event_update(NULL, e, ARES_EVENT_FLAG_READ,
|
518
|
+
ares_event_configchg_cb, (*configchg)->fd,
|
519
|
+
*configchg, ares_event_configchg_free, NULL);
|
520
|
+
|
521
|
+
done:
|
522
|
+
if (status != ARES_SUCCESS) {
|
523
|
+
ares_event_configchg_free(*configchg);
|
524
|
+
*configchg = NULL;
|
525
|
+
}
|
526
|
+
|
527
|
+
if (handle) {
|
528
|
+
dlclose(handle);
|
529
|
+
}
|
530
|
+
|
531
|
+
return status;
|
532
|
+
}
|
533
|
+
|
534
|
+
#elif defined(HAVE_STAT) && !defined(_WIN32) && defined(CARES_THREADS)
|
535
|
+
# ifdef HAVE_SYS_TYPES_H
|
536
|
+
# include <sys/types.h>
|
537
|
+
# endif
|
538
|
+
# ifdef HAVE_SYS_STAT_H
|
539
|
+
# include <sys/stat.h>
|
540
|
+
# endif
|
541
|
+
|
542
|
+
typedef struct {
|
543
|
+
size_t size;
|
544
|
+
time_t mtime;
|
545
|
+
} fileinfo_t;
|
546
|
+
|
547
|
+
struct ares_event_configchg {
|
548
|
+
ares_bool_t isup;
|
549
|
+
ares_thread_t *thread;
|
550
|
+
ares_htable_strvp_t *filestat;
|
551
|
+
ares_thread_mutex_t *lock;
|
552
|
+
ares_thread_cond_t *wake;
|
553
|
+
const char *resolvconf_path;
|
554
|
+
ares_event_thread_t *e;
|
555
|
+
};
|
556
|
+
|
557
|
+
static ares_status_t config_change_check(ares_htable_strvp_t *filestat,
|
558
|
+
const char *resolvconf_path)
|
559
|
+
{
|
560
|
+
size_t i;
|
561
|
+
const char *configfiles[16];
|
562
|
+
ares_bool_t changed = ARES_FALSE;
|
563
|
+
size_t cnt = 0;
|
564
|
+
|
565
|
+
memset(configfiles, 0, sizeof(configfiles));
|
566
|
+
|
567
|
+
configfiles[cnt++] = resolvconf_path;
|
568
|
+
configfiles[cnt++] = "/etc/nsswitch.conf";
|
569
|
+
#ifdef _AIX
|
570
|
+
configfiles[cnt++] = "/etc/netsvc.conf";
|
571
|
+
#endif
|
572
|
+
#ifdef __osf /* Tru64 */
|
573
|
+
configfiles[cnt++] = "/etc/svc.conf";
|
574
|
+
#endif
|
575
|
+
#ifdef __QNX__
|
576
|
+
configfiles[cnt++] = "/etc/net.cfg";
|
577
|
+
#endif
|
578
|
+
configfiles[cnt++] = NULL;
|
579
|
+
|
580
|
+
for (i = 0; configfiles[i] != NULL; i++) {
|
581
|
+
fileinfo_t *fi = ares_htable_strvp_get_direct(filestat, configfiles[i]);
|
582
|
+
struct stat st;
|
583
|
+
|
584
|
+
if (stat(configfiles[i], &st) == 0) {
|
585
|
+
if (fi == NULL) {
|
586
|
+
fi = ares_malloc_zero(sizeof(*fi));
|
587
|
+
if (fi == NULL) {
|
588
|
+
return ARES_ENOMEM;
|
589
|
+
}
|
590
|
+
if (!ares_htable_strvp_insert(filestat, configfiles[i], fi)) {
|
591
|
+
ares_free(fi);
|
592
|
+
return ARES_ENOMEM;
|
593
|
+
}
|
594
|
+
}
|
595
|
+
if (fi->size != (size_t)st.st_size || fi->mtime != (time_t)st.st_mtime) {
|
596
|
+
changed = ARES_TRUE;
|
597
|
+
}
|
598
|
+
fi->size = (size_t)st.st_size;
|
599
|
+
fi->mtime = (time_t)st.st_mtime;
|
600
|
+
} else if (fi != NULL) {
|
601
|
+
/* File no longer exists, remove */
|
602
|
+
ares_htable_strvp_remove(filestat, configfiles[i]);
|
603
|
+
changed = ARES_TRUE;
|
604
|
+
}
|
605
|
+
}
|
606
|
+
|
607
|
+
if (changed) {
|
608
|
+
return ARES_SUCCESS;
|
609
|
+
}
|
610
|
+
return ARES_ENOTFOUND;
|
611
|
+
}
|
612
|
+
|
613
|
+
static void *ares_event_configchg_thread(void *arg)
|
614
|
+
{
|
615
|
+
ares_event_configchg_t *c = arg;
|
616
|
+
|
617
|
+
ares_thread_mutex_lock(c->lock);
|
618
|
+
while (c->isup) {
|
619
|
+
ares_status_t status;
|
620
|
+
|
621
|
+
if (ares_thread_cond_timedwait(c->wake, c->lock, 30000) != ARES_ETIMEOUT) {
|
622
|
+
continue;
|
623
|
+
}
|
624
|
+
|
625
|
+
/* make sure status didn't change even though we got a timeout */
|
626
|
+
if (!c->isup) {
|
627
|
+
break;
|
628
|
+
}
|
629
|
+
|
630
|
+
status = config_change_check(c->filestat, c->resolvconf_path);
|
631
|
+
if (status == ARES_SUCCESS) {
|
632
|
+
ares_reinit(c->e->channel);
|
633
|
+
}
|
634
|
+
}
|
635
|
+
|
636
|
+
ares_thread_mutex_unlock(c->lock);
|
637
|
+
return NULL;
|
638
|
+
}
|
639
|
+
|
640
|
+
ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
|
641
|
+
ares_event_thread_t *e)
|
642
|
+
{
|
643
|
+
ares_status_t status = ARES_SUCCESS;
|
644
|
+
ares_event_configchg_t *c = NULL;
|
645
|
+
|
646
|
+
*configchg = NULL;
|
647
|
+
|
648
|
+
c = ares_malloc_zero(sizeof(*c));
|
649
|
+
if (c == NULL) {
|
650
|
+
status = ARES_ENOMEM;
|
651
|
+
goto done;
|
652
|
+
}
|
653
|
+
|
654
|
+
c->e = e;
|
655
|
+
|
656
|
+
c->filestat = ares_htable_strvp_create(ares_free);
|
657
|
+
if (c->filestat == NULL) {
|
658
|
+
status = ARES_ENOMEM;
|
659
|
+
goto done;
|
660
|
+
}
|
661
|
+
|
662
|
+
c->wake = ares_thread_cond_create();
|
663
|
+
if (c->wake == NULL) {
|
664
|
+
status = ARES_ENOMEM;
|
665
|
+
goto done;
|
666
|
+
}
|
667
|
+
|
668
|
+
c->lock = ares_thread_mutex_create();
|
669
|
+
if (c->lock == NULL) {
|
670
|
+
status = ARES_ENOMEM;
|
671
|
+
goto done;
|
672
|
+
}
|
673
|
+
|
674
|
+
c->resolvconf_path = c->e->channel->resolvconf_path;
|
675
|
+
if (c->resolvconf_path == NULL) {
|
676
|
+
c->resolvconf_path = PATH_RESOLV_CONF;
|
677
|
+
}
|
678
|
+
|
679
|
+
status = config_change_check(c->filestat, c->resolvconf_path);
|
680
|
+
if (status == ARES_ENOMEM) {
|
681
|
+
goto done;
|
682
|
+
}
|
683
|
+
|
684
|
+
c->isup = ARES_TRUE;
|
685
|
+
status = ares_thread_create(&c->thread, ares_event_configchg_thread, c);
|
686
|
+
|
687
|
+
done:
|
688
|
+
if (status != ARES_SUCCESS) {
|
689
|
+
ares_event_configchg_destroy(c);
|
690
|
+
} else {
|
691
|
+
*configchg = c;
|
692
|
+
}
|
693
|
+
return status;
|
694
|
+
}
|
695
|
+
|
696
|
+
void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
|
697
|
+
{
|
698
|
+
if (configchg == NULL) {
|
699
|
+
return;
|
700
|
+
}
|
701
|
+
|
702
|
+
if (configchg->lock) {
|
703
|
+
ares_thread_mutex_lock(configchg->lock);
|
704
|
+
}
|
705
|
+
|
706
|
+
configchg->isup = ARES_FALSE;
|
707
|
+
if (configchg->wake) {
|
708
|
+
ares_thread_cond_signal(configchg->wake);
|
709
|
+
}
|
710
|
+
|
711
|
+
if (configchg->lock) {
|
712
|
+
ares_thread_mutex_unlock(configchg->lock);
|
713
|
+
}
|
714
|
+
|
715
|
+
if (configchg->thread) {
|
716
|
+
void *rv = NULL;
|
717
|
+
ares_thread_join(configchg->thread, &rv);
|
718
|
+
}
|
719
|
+
|
720
|
+
ares_thread_mutex_destroy(configchg->lock);
|
721
|
+
ares_thread_cond_destroy(configchg->wake);
|
722
|
+
ares_htable_strvp_destroy(configchg->filestat);
|
723
|
+
ares_free(configchg);
|
724
|
+
}
|
725
|
+
|
726
|
+
#else
|
727
|
+
|
728
|
+
ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
|
729
|
+
ares_event_thread_t *e)
|
730
|
+
{
|
731
|
+
(void)configchg;
|
732
|
+
(void)e;
|
733
|
+
/* No ability */
|
734
|
+
return ARES_ENOTIMP;
|
735
|
+
}
|
736
|
+
|
737
|
+
void ares_event_configchg_destroy(ares_event_configchg_t *configchg)
|
738
|
+
{
|
739
|
+
/* No-op */
|
740
|
+
(void)configchg;
|
741
|
+
}
|
742
|
+
|
743
|
+
#endif
|