Skip to content

Commit ae8d3ef

Browse files
apolcynapolcyn
authored
Merge pull request grpc#15797 from apolcyn/windows_compile_and_sort
Enable c-ares address sorting on windows
2 parents e41215e + 1b1d5e5 commit ae8d3ef

31 files changed

Lines changed: 577 additions & 73 deletions

‎BUILD‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,7 +1433,10 @@ grpc_cc_library(
14331433
"src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc",
14341434
"src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc",
14351435
"src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc",
1436+
"src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc",
14361437
"src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc",
1438+
"src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc",
1439+
"src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc",
14371440
"src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc",
14381441
],
14391442
hdrs = [

‎CMakeLists.txt‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ add_dependencies(buildtests_c grpc_completion_queue_test)
298298
add_dependencies(buildtests_c grpc_completion_queue_threading_test)
299299
add_dependencies(buildtests_c grpc_credentials_test)
300300
add_dependencies(buildtests_c grpc_fetch_oauth2)
301+
add_dependencies(buildtests_c grpc_ipv6_loopback_available_test)
301302
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
302303
add_dependencies(buildtests_c grpc_json_token_test)
303304
endif()
@@ -671,12 +672,8 @@ endif()
671672
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
672673
add_dependencies(buildtests_cxx resolver_component_tests_runner_invoker)
673674
endif()
674-
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
675675
add_dependencies(buildtests_cxx address_sorting_test_unsecure)
676-
endif()
677-
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
678676
add_dependencies(buildtests_cxx address_sorting_test)
679-
endif()
680677
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
681678
add_dependencies(buildtests_cxx cancel_ares_query_test)
682679
endif()
@@ -1236,8 +1233,11 @@ add_library(grpc
12361233
src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
12371234
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc
12381235
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
1236+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
12391237
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
12401238
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc
1239+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
1240+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
12411241
src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
12421242
src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
12431243
src/cpp/ext/filters/census/grpc_context.cc
@@ -2538,8 +2538,11 @@ add_library(grpc_unsecure
25382538
src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
25392539
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc
25402540
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
2541+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
25412542
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
25422543
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc
2544+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
2545+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
25432546
src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
25442547
src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
25452548
src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
@@ -7323,6 +7326,35 @@ target_link_libraries(grpc_fetch_oauth2
73237326
gpr
73247327
)
73257328

7329+
endif (gRPC_BUILD_TESTS)
7330+
if (gRPC_BUILD_TESTS)
7331+
7332+
add_executable(grpc_ipv6_loopback_available_test
7333+
test/core/iomgr/grpc_ipv6_loopback_available_test.cc
7334+
)
7335+
7336+
7337+
target_include_directories(grpc_ipv6_loopback_available_test
7338+
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
7339+
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
7340+
PRIVATE ${_gRPC_SSL_INCLUDE_DIR}
7341+
PRIVATE ${_gRPC_PROTOBUF_INCLUDE_DIR}
7342+
PRIVATE ${_gRPC_ZLIB_INCLUDE_DIR}
7343+
PRIVATE ${_gRPC_BENCHMARK_INCLUDE_DIR}
7344+
PRIVATE ${_gRPC_CARES_INCLUDE_DIR}
7345+
PRIVATE ${_gRPC_GFLAGS_INCLUDE_DIR}
7346+
PRIVATE ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
7347+
PRIVATE ${_gRPC_NANOPB_INCLUDE_DIR}
7348+
)
7349+
7350+
target_link_libraries(grpc_ipv6_loopback_available_test
7351+
${_gRPC_ALLTARGETS_LIBRARIES}
7352+
grpc_test_util
7353+
grpc
7354+
gpr_test_util
7355+
gpr
7356+
)
7357+
73267358
endif (gRPC_BUILD_TESTS)
73277359
if (gRPC_BUILD_TESTS)
73287360
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
@@ -16351,7 +16383,6 @@ target_link_libraries(resolver_component_tests_runner_invoker
1635116383
endif()
1635216384
endif (gRPC_BUILD_TESTS)
1635316385
if (gRPC_BUILD_TESTS)
16354-
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
1635516386

1635616387
add_executable(address_sorting_test_unsecure
1635716388
test/cpp/naming/address_sorting_test.cc
@@ -16391,10 +16422,8 @@ target_link_libraries(address_sorting_test_unsecure
1639116422
${_gRPC_GFLAGS_LIBRARIES}
1639216423
)
1639316424

16394-
endif()
1639516425
endif (gRPC_BUILD_TESTS)
1639616426
if (gRPC_BUILD_TESTS)
16397-
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
1639816427

1639916428
add_executable(address_sorting_test
1640016429
test/cpp/naming/address_sorting_test.cc
@@ -16434,7 +16463,6 @@ target_link_libraries(address_sorting_test
1643416463
${_gRPC_GFLAGS_LIBRARIES}
1643516464
)
1643616465

16437-
endif()
1643816466
endif (gRPC_BUILD_TESTS)
1643916467
if (gRPC_BUILD_TESTS)
1644016468
if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)

‎Makefile‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,7 @@ grpc_completion_queue_threading_test: $(BINDIR)/$(CONFIG)/grpc_completion_queue_
10221022
grpc_create_jwt: $(BINDIR)/$(CONFIG)/grpc_create_jwt
10231023
grpc_credentials_test: $(BINDIR)/$(CONFIG)/grpc_credentials_test
10241024
grpc_fetch_oauth2: $(BINDIR)/$(CONFIG)/grpc_fetch_oauth2
1025+
grpc_ipv6_loopback_available_test: $(BINDIR)/$(CONFIG)/grpc_ipv6_loopback_available_test
10251026
grpc_json_token_test: $(BINDIR)/$(CONFIG)/grpc_json_token_test
10261027
grpc_jwt_verifier_test: $(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test
10271028
grpc_print_google_default_creds_token: $(BINDIR)/$(CONFIG)/grpc_print_google_default_creds_token
@@ -1472,6 +1473,7 @@ buildtests_c: privatelibs_c \
14721473
$(BINDIR)/$(CONFIG)/grpc_completion_queue_threading_test \
14731474
$(BINDIR)/$(CONFIG)/grpc_credentials_test \
14741475
$(BINDIR)/$(CONFIG)/grpc_fetch_oauth2 \
1476+
$(BINDIR)/$(CONFIG)/grpc_ipv6_loopback_available_test \
14751477
$(BINDIR)/$(CONFIG)/grpc_json_token_test \
14761478
$(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test \
14771479
$(BINDIR)/$(CONFIG)/grpc_security_connector_test \
@@ -2028,6 +2030,8 @@ test_c: buildtests_c
20282030
$(Q) $(BINDIR)/$(CONFIG)/grpc_completion_queue_threading_test || ( echo test grpc_completion_queue_threading_test failed ; exit 1 )
20292031
$(E) "[RUN] Testing grpc_credentials_test"
20302032
$(Q) $(BINDIR)/$(CONFIG)/grpc_credentials_test || ( echo test grpc_credentials_test failed ; exit 1 )
2033+
$(E) "[RUN] Testing grpc_ipv6_loopback_available_test"
2034+
$(Q) $(BINDIR)/$(CONFIG)/grpc_ipv6_loopback_available_test || ( echo test grpc_ipv6_loopback_available_test failed ; exit 1 )
20312035
$(E) "[RUN] Testing grpc_json_token_test"
20322036
$(Q) $(BINDIR)/$(CONFIG)/grpc_json_token_test || ( echo test grpc_json_token_test failed ; exit 1 )
20332037
$(E) "[RUN] Testing grpc_jwt_verifier_test"
@@ -3704,8 +3708,11 @@ LIBGRPC_SRC = \
37043708
src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
37053709
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc \
37063710
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
3711+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
37073712
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
37083713
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc \
3714+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
3715+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
37093716
src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
37103717
src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
37113718
src/cpp/ext/filters/census/grpc_context.cc \
@@ -4972,8 +4979,11 @@ LIBGRPC_UNSECURE_SRC = \
49724979
src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
49734980
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc \
49744981
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
4982+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
49754983
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
49764984
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc \
4985+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
4986+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
49774987
src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
49784988
src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
49794989
src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
@@ -12365,6 +12375,38 @@ endif
1236512375
endif
1236612376

1236712377

12378+
GRPC_IPV6_LOOPBACK_AVAILABLE_TEST_SRC = \
12379+
test/core/iomgr/grpc_ipv6_loopback_available_test.cc \
12380+
12381+
GRPC_IPV6_LOOPBACK_AVAILABLE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPC_IPV6_LOOPBACK_AVAILABLE_TEST_SRC))))
12382+
ifeq ($(NO_SECURE),true)
12383+
12384+
# You can't build secure targets if you don't have OpenSSL.
12385+
12386+
$(BINDIR)/$(CONFIG)/grpc_ipv6_loopback_available_test: openssl_dep_error
12387+
12388+
else
12389+
12390+
12391+
12392+
$(BINDIR)/$(CONFIG)/grpc_ipv6_loopback_available_test: $(GRPC_IPV6_LOOPBACK_AVAILABLE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
12393+
$(E) "[LD] Linking $@"
12394+
$(Q) mkdir -p `dirname $@`
12395+
$(Q) $(LD) $(LDFLAGS) $(GRPC_IPV6_LOOPBACK_AVAILABLE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/grpc_ipv6_loopback_available_test
12396+
12397+
endif
12398+
12399+
$(OBJDIR)/$(CONFIG)/test/core/iomgr/grpc_ipv6_loopback_available_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
12400+
12401+
deps_grpc_ipv6_loopback_available_test: $(GRPC_IPV6_LOOPBACK_AVAILABLE_TEST_OBJS:.o=.dep)
12402+
12403+
ifneq ($(NO_SECURE),true)
12404+
ifneq ($(NO_DEPS),true)
12405+
-include $(GRPC_IPV6_LOOPBACK_AVAILABLE_TEST_OBJS:.o=.dep)
12406+
endif
12407+
endif
12408+
12409+
1236812410
GRPC_JSON_TOKEN_TEST_SRC = \
1236912411
test/core/security/json_token_test.cc \
1237012412

‎build.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -740,8 +740,11 @@ filegroups:
740740
- src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
741741
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc
742742
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
743+
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
743744
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc
744745
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc
746+
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc
747+
- src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc
745748
plugin: grpc_resolver_dns_ares
746749
uses:
747750
- grpc_base
@@ -2730,6 +2733,18 @@ targets:
27302733
- grpc
27312734
- gpr_test_util
27322735
- gpr
2736+
- name: grpc_ipv6_loopback_available_test
2737+
build: test
2738+
language: c
2739+
src:
2740+
- test/core/iomgr/grpc_ipv6_loopback_available_test.cc
2741+
deps:
2742+
- grpc_test_util
2743+
- grpc
2744+
- gpr_test_util
2745+
- gpr
2746+
exclude_iomgrs:
2747+
- uv
27332748
- name: grpc_json_token_test
27342749
build: test
27352750
language: c

‎config.m4‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,11 @@ if test "$PHP_GRPC" != "no"; then
380380
src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
381381
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc \
382382
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
383+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
383384
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc \
384385
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc \
386+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc \
387+
src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc \
385388
src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
386389
src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
387390
src/cpp/ext/filters/census/grpc_context.cc \

‎config.w32‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,11 @@ if (PHP_GRPC != "no") {
355355
"src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\dns_resolver_ares.cc " +
356356
"src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_ev_driver.cc " +
357357
"src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_ev_driver_posix.cc " +
358+
"src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_ev_driver_windows.cc " +
358359
"src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_wrapper.cc " +
359360
"src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_wrapper_fallback.cc " +
361+
"src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_wrapper_posix.cc " +
362+
"src\\core\\ext\\filters\\client_channel\\resolver\\dns\\c_ares\\grpc_ares_wrapper_windows.cc " +
360363
"src\\core\\ext\\filters\\client_channel\\resolver\\dns\\native\\dns_resolver.cc " +
361364
"src\\core\\ext\\filters\\client_channel\\resolver\\sockaddr\\sockaddr_resolver.cc " +
362365
"src\\cpp\\ext\\filters\\census\\grpc_context.cc " +

‎gRPC-Core.podspec‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -802,8 +802,11 @@ Pod::Spec.new do |s|
802802
'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
803803
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc',
804804
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
805+
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
805806
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc',
806807
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc',
808+
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
809+
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
807810
'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc',
808811
'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
809812
'src/cpp/ext/filters/census/grpc_context.cc',

‎grpc.gemspec‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,8 +742,11 @@ Gem::Specification.new do |s|
742742
s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc )
743743
s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc )
744744
s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc )
745+
s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc )
745746
s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc )
746747
s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc )
748+
s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc )
749+
s.files += %w( src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc )
747750
s.files += %w( src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc )
748751
s.files += %w( src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc )
749752
s.files += %w( src/cpp/ext/filters/census/grpc_context.cc )

‎grpc.gyp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,11 @@
572572
'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
573573
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc',
574574
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
575+
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
575576
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc',
576577
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc',
578+
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
579+
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
577580
'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc',
578581
'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
579582
'src/cpp/ext/filters/census/grpc_context.cc',
@@ -1287,8 +1290,11 @@
12871290
'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
12881291
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc',
12891292
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
1293+
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
12901294
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc',
12911295
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc',
1296+
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_posix.cc',
1297+
'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc',
12921298
'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc',
12931299
'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
12941300
'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',

‎include/grpc/impl/codegen/port_platform.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,12 +420,8 @@ typedef unsigned __int64 uint64_t;
420420
#define GPR_MAX_ALIGNMENT 16
421421

422422
#ifndef GRPC_ARES
423-
#ifdef GPR_WINDOWS
424-
#define GRPC_ARES 0
425-
#else
426423
#define GRPC_ARES 1
427424
#endif
428-
#endif
429425

430426
#ifndef GRPC_MUST_USE_RESULT
431427
#if defined(__GNUC__) && !defined(__MINGW32__)

0 commit comments

Comments
 (0)