grpc 1.16.0 → 1.17.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.
Files changed (173) hide show
  1. checksums.yaml +4 -4
  2. data/Makefile +299 -133
  3. data/include/grpc/grpc.h +11 -1
  4. data/include/grpc/grpc_posix.h +0 -8
  5. data/include/grpc/impl/codegen/grpc_types.h +3 -0
  6. data/src/core/ext/filters/client_channel/client_channel.cc +336 -345
  7. data/src/core/ext/filters/client_channel/client_channel.h +6 -2
  8. data/src/core/ext/filters/client_channel/client_channel_channelz.cc +3 -1
  9. data/src/core/ext/filters/client_channel/client_channel_channelz.h +0 -7
  10. data/src/core/ext/filters/client_channel/health/health.pb.c +23 -0
  11. data/src/core/ext/filters/client_channel/health/health.pb.h +73 -0
  12. data/src/core/ext/filters/client_channel/health/health_check_client.cc +652 -0
  13. data/src/core/ext/filters/client_channel/health/health_check_client.h +173 -0
  14. data/src/core/ext/filters/client_channel/http_connect_handshaker.cc +2 -1
  15. data/src/core/ext/filters/client_channel/http_proxy.cc +1 -1
  16. data/src/core/ext/filters/client_channel/lb_policy.h +17 -14
  17. data/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +15 -11
  18. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +21 -15
  19. data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +18 -10
  20. data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +12 -9
  21. data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +19 -8
  22. data/src/core/ext/filters/client_channel/lb_policy/xds/xds.cc +1832 -0
  23. data/src/core/ext/filters/client_channel/lb_policy/xds/xds.h +36 -0
  24. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel.h +36 -0
  25. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_secure.cc +107 -0
  26. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.cc +85 -0
  27. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.h +72 -0
  28. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.cc +307 -0
  29. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.h +89 -0
  30. data/src/core/ext/filters/client_channel/lb_policy_factory.h +1 -1
  31. data/src/core/ext/filters/client_channel/lb_policy_registry.cc +5 -0
  32. data/src/core/ext/filters/client_channel/lb_policy_registry.h +4 -0
  33. data/src/core/ext/filters/client_channel/parse_address.h +1 -1
  34. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +19 -22
  35. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +41 -39
  36. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +3 -2
  37. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.cc +4 -1
  38. data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +15 -2
  39. data/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h +5 -1
  40. data/src/core/ext/filters/client_channel/resolver_factory.h +1 -1
  41. data/src/core/ext/filters/client_channel/resolver_result_parsing.cc +384 -0
  42. data/src/core/ext/filters/client_channel/resolver_result_parsing.h +146 -0
  43. data/src/core/ext/filters/client_channel/subchannel.cc +361 -103
  44. data/src/core/ext/filters/client_channel/subchannel.h +14 -8
  45. data/src/core/ext/filters/deadline/deadline_filter.cc +19 -23
  46. data/src/core/ext/filters/deadline/deadline_filter.h +9 -13
  47. data/src/core/ext/filters/http/client/http_client_filter.cc +29 -19
  48. data/src/core/ext/filters/http/client_authority_filter.cc +2 -3
  49. data/src/core/ext/filters/http/message_compress/message_compress_filter.cc +28 -16
  50. data/src/core/ext/filters/http/server/http_server_filter.cc +31 -20
  51. data/src/core/ext/filters/message_size/message_size_filter.cc +50 -45
  52. data/src/core/ext/transport/chttp2/client/chttp2_connector.cc +13 -6
  53. data/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +1 -1
  54. data/src/core/ext/transport/chttp2/server/chttp2_server.cc +58 -8
  55. data/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +1 -1
  56. data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +175 -173
  57. data/src/core/ext/transport/chttp2/transport/chttp2_transport.h +2 -1
  58. data/src/core/ext/transport/chttp2/transport/frame_data.cc +4 -10
  59. data/src/core/ext/transport/chttp2/transport/frame_data.h +10 -12
  60. data/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +1 -1
  61. data/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +28 -25
  62. data/src/core/ext/transport/chttp2/transport/incoming_metadata.cc +0 -12
  63. data/src/core/ext/transport/chttp2/transport/incoming_metadata.h +12 -9
  64. data/src/core/ext/transport/chttp2/transport/internal.h +109 -94
  65. data/src/core/ext/transport/chttp2/transport/parsing.cc +4 -2
  66. data/src/core/ext/transport/inproc/inproc_transport.cc +280 -300
  67. data/src/core/lib/channel/channel_stack.cc +5 -4
  68. data/src/core/lib/channel/channel_stack.h +4 -4
  69. data/src/core/lib/channel/channel_stack_builder.cc +14 -2
  70. data/src/core/lib/channel/channel_stack_builder.h +8 -0
  71. data/src/core/lib/channel/channel_trace.cc +6 -2
  72. data/src/core/lib/channel/channelz.cc +137 -5
  73. data/src/core/lib/channel/channelz.h +32 -6
  74. data/src/core/lib/channel/channelz_registry.cc +134 -28
  75. data/src/core/lib/channel/channelz_registry.h +25 -3
  76. data/src/core/lib/channel/context.h +4 -4
  77. data/src/core/lib/channel/handshaker.cc +7 -6
  78. data/src/core/lib/channel/handshaker.h +7 -8
  79. data/src/core/lib/channel/handshaker_factory.cc +3 -2
  80. data/src/core/lib/channel/handshaker_factory.h +2 -0
  81. data/src/core/lib/channel/handshaker_registry.cc +6 -2
  82. data/src/core/lib/channel/handshaker_registry.h +1 -0
  83. data/src/core/lib/gpr/arena.cc +84 -37
  84. data/src/core/lib/gpr/arena.h +2 -0
  85. data/src/core/lib/gpr/mpscq.h +4 -2
  86. data/src/core/lib/gprpp/inlined_vector.h +8 -0
  87. data/src/core/lib/gprpp/ref_counted.h +105 -18
  88. data/src/core/lib/gprpp/ref_counted_ptr.h +11 -0
  89. data/src/core/lib/http/httpcli_security_connector.cc +7 -4
  90. data/src/core/lib/iomgr/call_combiner.cc +2 -0
  91. data/src/core/lib/iomgr/call_combiner.h +2 -2
  92. data/src/core/lib/iomgr/closure.h +1 -0
  93. data/src/core/lib/iomgr/error.cc +16 -31
  94. data/src/core/lib/iomgr/error.h +29 -4
  95. data/src/core/lib/iomgr/error_internal.h +0 -2
  96. data/src/core/lib/iomgr/ev_epoll1_linux.cc +7 -3
  97. data/src/core/lib/iomgr/ev_posix.cc +0 -2
  98. data/src/core/lib/iomgr/polling_entity.h +4 -4
  99. data/src/core/lib/iomgr/resource_quota.cc +64 -10
  100. data/src/core/lib/iomgr/resource_quota.h +21 -6
  101. data/src/core/lib/iomgr/socket_utils_common_posix.cc +11 -5
  102. data/src/core/lib/iomgr/tcp_client_custom.cc +14 -3
  103. data/src/core/lib/iomgr/tcp_client_posix.cc +2 -0
  104. data/src/core/lib/iomgr/tcp_posix.cc +4 -2
  105. data/src/core/lib/iomgr/timer_manager.cc +1 -1
  106. data/src/core/lib/iomgr/wakeup_fd_eventfd.cc +3 -4
  107. data/src/core/lib/security/context/security_context.cc +20 -13
  108. data/src/core/lib/security/context/security_context.h +27 -19
  109. data/src/core/lib/security/credentials/alts/alts_credentials.cc +1 -1
  110. data/src/core/lib/security/credentials/credentials.h +2 -2
  111. data/src/core/lib/security/credentials/fake/fake_credentials.cc +1 -0
  112. data/src/core/lib/security/credentials/google_default/google_default_credentials.cc +39 -54
  113. data/src/core/lib/security/credentials/google_default/google_default_credentials.h +3 -2
  114. data/src/core/lib/security/credentials/local/local_credentials.cc +1 -1
  115. data/src/core/lib/security/credentials/plugin/plugin_credentials.cc +1 -2
  116. data/src/core/lib/security/credentials/ssl/ssl_credentials.h +2 -0
  117. data/src/core/lib/security/security_connector/{alts_security_connector.cc → alts/alts_security_connector.cc} +10 -9
  118. data/src/core/lib/security/security_connector/{alts_security_connector.h → alts/alts_security_connector.h} +3 -3
  119. data/src/core/lib/security/security_connector/fake/fake_security_connector.cc +310 -0
  120. data/src/core/lib/security/security_connector/fake/fake_security_connector.h +42 -0
  121. data/src/core/lib/security/security_connector/{local_security_connector.cc → local/local_security_connector.cc} +4 -3
  122. data/src/core/lib/security/security_connector/{local_security_connector.h → local/local_security_connector.h} +3 -3
  123. data/src/core/lib/security/security_connector/security_connector.cc +4 -1039
  124. data/src/core/lib/security/security_connector/security_connector.h +6 -114
  125. data/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +474 -0
  126. data/src/core/lib/security/security_connector/ssl/ssl_security_connector.h +77 -0
  127. data/src/core/lib/security/security_connector/ssl_utils.cc +345 -0
  128. data/src/core/lib/security/security_connector/ssl_utils.h +93 -0
  129. data/src/core/lib/security/transport/client_auth_filter.cc +28 -17
  130. data/src/core/lib/security/transport/secure_endpoint.cc +51 -41
  131. data/src/core/lib/security/transport/security_handshaker.cc +6 -7
  132. data/src/core/lib/security/transport/server_auth_filter.cc +39 -31
  133. data/src/core/lib/surface/call.cc +100 -80
  134. data/src/core/lib/surface/call.h +4 -0
  135. data/src/core/lib/surface/channel.cc +27 -13
  136. data/src/core/lib/surface/channel.h +4 -3
  137. data/src/core/lib/surface/completion_queue.cc +8 -1
  138. data/src/core/lib/surface/init.cc +1 -0
  139. data/src/core/lib/surface/server.cc +111 -46
  140. data/src/core/lib/surface/server.h +16 -2
  141. data/src/core/lib/surface/version.cc +2 -2
  142. data/src/core/lib/transport/error_utils.cc +4 -2
  143. data/src/core/lib/transport/metadata.cc +3 -2
  144. data/src/core/lib/transport/metadata.h +3 -2
  145. data/src/core/lib/transport/metadata_batch.cc +1 -0
  146. data/src/core/lib/transport/metadata_batch.h +4 -2
  147. data/src/core/lib/transport/static_metadata.cc +225 -221
  148. data/src/core/lib/transport/static_metadata.h +74 -71
  149. data/src/core/lib/transport/transport.h +44 -26
  150. data/src/core/{ext/filters/client_channel → lib/uri}/uri_parser.cc +1 -1
  151. data/src/core/{ext/filters/client_channel → lib/uri}/uri_parser.h +3 -3
  152. data/src/core/plugin_registry/grpc_plugin_registry.cc +4 -4
  153. data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +356 -77
  154. data/src/core/tsi/alts/handshaker/alts_handshaker_client.h +46 -36
  155. data/src/core/tsi/alts/handshaker/alts_shared_resource.cc +83 -0
  156. data/src/core/tsi/alts/handshaker/alts_shared_resource.h +73 -0
  157. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +122 -175
  158. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h +33 -22
  159. data/src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h +38 -10
  160. data/src/core/tsi/transport_security.cc +18 -1
  161. data/src/core/tsi/transport_security.h +2 -1
  162. data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +4 -2
  163. data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +6 -3
  164. data/src/ruby/lib/grpc/version.rb +1 -1
  165. data/src/ruby/spec/pb/codegen/grpc/testing/package_options.proto +28 -0
  166. data/src/ruby/spec/pb/codegen/package_option_spec.rb +2 -3
  167. metadata +58 -40
  168. data/src/core/ext/filters/client_channel/method_params.cc +0 -178
  169. data/src/core/ext/filters/client_channel/method_params.h +0 -78
  170. data/src/core/tsi/alts/handshaker/alts_tsi_event.cc +0 -75
  171. data/src/core/tsi/alts/handshaker/alts_tsi_event.h +0 -93
  172. data/src/core/tsi/alts_transport_security.cc +0 -65
  173. data/src/core/tsi/alts_transport_security.h +0 -47
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8e81ea47751ae012cb35d09709cf468cf3e63916be9b5c3d0a1ffc53d7a613f9
4
- data.tar.gz: f5d3ad08e57901e4df02d6fe76a84cbc38e83c519dac7671d21bd630733a5ae4
3
+ metadata.gz: '00470555984ddcdcc31b55d42e0bc232e979b4ff4a2ceaec478208e9d08b02c1'
4
+ data.tar.gz: 6abf8ba4e9846158bb465dd8a8d29172f24904ddebf6711ec1563e399b7c34b5
5
5
  SHA512:
6
- metadata.gz: fd21c6de3b029454d983de87ba8e594dd606dcd860f27a98172e54554def86c5a2484d671dbbbe48c3371109beb9aac17250b812138f52beaa9f21b2bcea2835
7
- data.tar.gz: fd36c00fd35c34b8ce5d980057160176e30c6af2668096b2ac3a4c099ec8618ec32e35f3596c2a7434a906fa12ec1b6330ba7111ad8981d05ee7a51ff4e12f8d
6
+ metadata.gz: b100f21a7893b6aae238ef1bf97e7543b1032ebb2016743bd4823531a449f0eaaa3563569ac677d837a39ae1ed3a70dcfff5a57700fd3019cb5b279978791f4a
7
+ data.tar.gz: c187700a6912430c1f4daac89de854f9cba4a896dcd1826f49a4693ed4d090fa79893dabcfbf7eaa4a2b4ce8259988d14bf512bca182b22685715c79e1a93aa8
data/Makefile CHANGED
@@ -437,9 +437,9 @@ E = @echo
437
437
  Q = @
438
438
  endif
439
439
 
440
- CORE_VERSION = 6.0.0
441
- CPP_VERSION = 1.16.0
442
- CSHARP_VERSION = 1.16.0
440
+ CORE_VERSION = 7.0.0-pre1
441
+ CPP_VERSION = 1.17.0-pre1
442
+ CSHARP_VERSION = 1.17.0-pre1
443
443
 
444
444
  CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
445
445
  CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
@@ -487,7 +487,7 @@ SHARED_EXT_CORE = dll
487
487
  SHARED_EXT_CPP = dll
488
488
  SHARED_EXT_CSHARP = dll
489
489
  SHARED_PREFIX =
490
- SHARED_VERSION_CORE = -6
490
+ SHARED_VERSION_CORE = -7
491
491
  SHARED_VERSION_CPP = -1
492
492
  SHARED_VERSION_CSHARP = -1
493
493
  else ifeq ($(SYSTEM),Darwin)
@@ -1039,8 +1039,8 @@ grpc_print_google_default_creds_token: $(BINDIR)/$(CONFIG)/grpc_print_google_def
1039
1039
  grpc_security_connector_test: $(BINDIR)/$(CONFIG)/grpc_security_connector_test
1040
1040
  grpc_ssl_credentials_test: $(BINDIR)/$(CONFIG)/grpc_ssl_credentials_test
1041
1041
  grpc_verify_jwt: $(BINDIR)/$(CONFIG)/grpc_verify_jwt
1042
- handshake_client: $(BINDIR)/$(CONFIG)/handshake_client
1043
- handshake_server: $(BINDIR)/$(CONFIG)/handshake_server
1042
+ handshake_client_ssl: $(BINDIR)/$(CONFIG)/handshake_client_ssl
1043
+ handshake_server_ssl: $(BINDIR)/$(CONFIG)/handshake_server_ssl
1044
1044
  handshake_server_with_readahead_handshaker: $(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker
1045
1045
  handshake_verify_peer_options: $(BINDIR)/$(CONFIG)/handshake_verify_peer_options
1046
1046
  histogram_test: $(BINDIR)/$(CONFIG)/histogram_test
@@ -1064,9 +1064,9 @@ json_test: $(BINDIR)/$(CONFIG)/json_test
1064
1064
  lame_client_test: $(BINDIR)/$(CONFIG)/lame_client_test
1065
1065
  load_file_test: $(BINDIR)/$(CONFIG)/load_file_test
1066
1066
  low_level_ping_pong_benchmark: $(BINDIR)/$(CONFIG)/low_level_ping_pong_benchmark
1067
- memory_profile_client: $(BINDIR)/$(CONFIG)/memory_profile_client
1068
- memory_profile_server: $(BINDIR)/$(CONFIG)/memory_profile_server
1069
- memory_profile_test: $(BINDIR)/$(CONFIG)/memory_profile_test
1067
+ memory_usage_client: $(BINDIR)/$(CONFIG)/memory_usage_client
1068
+ memory_usage_server: $(BINDIR)/$(CONFIG)/memory_usage_server
1069
+ memory_usage_test: $(BINDIR)/$(CONFIG)/memory_usage_test
1070
1070
  message_compress_test: $(BINDIR)/$(CONFIG)/message_compress_test
1071
1071
  minimal_stack_is_minimal_test: $(BINDIR)/$(CONFIG)/minimal_stack_is_minimal_test
1072
1072
  multiple_server_queues_test: $(BINDIR)/$(CONFIG)/multiple_server_queues_test
@@ -1164,6 +1164,7 @@ client_callback_end2end_test: $(BINDIR)/$(CONFIG)/client_callback_end2end_test
1164
1164
  client_channel_stress_test: $(BINDIR)/$(CONFIG)/client_channel_stress_test
1165
1165
  client_crash_test: $(BINDIR)/$(CONFIG)/client_crash_test
1166
1166
  client_crash_test_server: $(BINDIR)/$(CONFIG)/client_crash_test_server
1167
+ client_interceptors_end2end_test: $(BINDIR)/$(CONFIG)/client_interceptors_end2end_test
1167
1168
  client_lb_end2end_test: $(BINDIR)/$(CONFIG)/client_lb_end2end_test
1168
1169
  codegen_test_full: $(BINDIR)/$(CONFIG)/codegen_test_full
1169
1170
  codegen_test_minimal: $(BINDIR)/$(CONFIG)/codegen_test_minimal
@@ -1229,6 +1230,7 @@ server_context_test_spouse_test: $(BINDIR)/$(CONFIG)/server_context_test_spouse_
1229
1230
  server_crash_test: $(BINDIR)/$(CONFIG)/server_crash_test
1230
1231
  server_crash_test_client: $(BINDIR)/$(CONFIG)/server_crash_test_client
1231
1232
  server_early_return_test: $(BINDIR)/$(CONFIG)/server_early_return_test
1233
+ server_interceptors_end2end_test: $(BINDIR)/$(CONFIG)/server_interceptors_end2end_test
1232
1234
  server_request_call_test: $(BINDIR)/$(CONFIG)/server_request_call_test
1233
1235
  shutdown_test: $(BINDIR)/$(CONFIG)/shutdown_test
1234
1236
  slice_hash_table_test: $(BINDIR)/$(CONFIG)/slice_hash_table_test
@@ -1343,7 +1345,6 @@ h2_sockpair_nosec_test: $(BINDIR)/$(CONFIG)/h2_sockpair_nosec_test
1343
1345
  h2_sockpair+trace_nosec_test: $(BINDIR)/$(CONFIG)/h2_sockpair+trace_nosec_test
1344
1346
  h2_sockpair_1byte_nosec_test: $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_nosec_test
1345
1347
  h2_uds_nosec_test: $(BINDIR)/$(CONFIG)/h2_uds_nosec_test
1346
- inproc_nosec_test: $(BINDIR)/$(CONFIG)/inproc_nosec_test
1347
1348
  resolver_component_test_unsecure: $(BINDIR)/$(CONFIG)/resolver_component_test_unsecure
1348
1349
  resolver_component_test: $(BINDIR)/$(CONFIG)/resolver_component_test
1349
1350
  resolver_component_tests_runner_invoker_unsecure: $(BINDIR)/$(CONFIG)/resolver_component_tests_runner_invoker_unsecure
@@ -1491,8 +1492,8 @@ buildtests_c: privatelibs_c \
1491
1492
  $(BINDIR)/$(CONFIG)/grpc_jwt_verifier_test \
1492
1493
  $(BINDIR)/$(CONFIG)/grpc_security_connector_test \
1493
1494
  $(BINDIR)/$(CONFIG)/grpc_ssl_credentials_test \
1494
- $(BINDIR)/$(CONFIG)/handshake_client \
1495
- $(BINDIR)/$(CONFIG)/handshake_server \
1495
+ $(BINDIR)/$(CONFIG)/handshake_client_ssl \
1496
+ $(BINDIR)/$(CONFIG)/handshake_server_ssl \
1496
1497
  $(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker \
1497
1498
  $(BINDIR)/$(CONFIG)/handshake_verify_peer_options \
1498
1499
  $(BINDIR)/$(CONFIG)/histogram_test \
@@ -1511,9 +1512,9 @@ buildtests_c: privatelibs_c \
1511
1512
  $(BINDIR)/$(CONFIG)/json_test \
1512
1513
  $(BINDIR)/$(CONFIG)/lame_client_test \
1513
1514
  $(BINDIR)/$(CONFIG)/load_file_test \
1514
- $(BINDIR)/$(CONFIG)/memory_profile_client \
1515
- $(BINDIR)/$(CONFIG)/memory_profile_server \
1516
- $(BINDIR)/$(CONFIG)/memory_profile_test \
1515
+ $(BINDIR)/$(CONFIG)/memory_usage_client \
1516
+ $(BINDIR)/$(CONFIG)/memory_usage_server \
1517
+ $(BINDIR)/$(CONFIG)/memory_usage_test \
1517
1518
  $(BINDIR)/$(CONFIG)/message_compress_test \
1518
1519
  $(BINDIR)/$(CONFIG)/minimal_stack_is_minimal_test \
1519
1520
  $(BINDIR)/$(CONFIG)/multiple_server_queues_test \
@@ -1602,7 +1603,6 @@ buildtests_c: privatelibs_c \
1602
1603
  $(BINDIR)/$(CONFIG)/h2_sockpair+trace_nosec_test \
1603
1604
  $(BINDIR)/$(CONFIG)/h2_sockpair_1byte_nosec_test \
1604
1605
  $(BINDIR)/$(CONFIG)/h2_uds_nosec_test \
1605
- $(BINDIR)/$(CONFIG)/inproc_nosec_test \
1606
1606
  $(BINDIR)/$(CONFIG)/alts_credentials_fuzzer_one_entry \
1607
1607
  $(BINDIR)/$(CONFIG)/api_fuzzer_one_entry \
1608
1608
  $(BINDIR)/$(CONFIG)/client_fuzzer_one_entry \
@@ -1669,6 +1669,7 @@ buildtests_cxx: privatelibs_cxx \
1669
1669
  $(BINDIR)/$(CONFIG)/client_channel_stress_test \
1670
1670
  $(BINDIR)/$(CONFIG)/client_crash_test \
1671
1671
  $(BINDIR)/$(CONFIG)/client_crash_test_server \
1672
+ $(BINDIR)/$(CONFIG)/client_interceptors_end2end_test \
1672
1673
  $(BINDIR)/$(CONFIG)/client_lb_end2end_test \
1673
1674
  $(BINDIR)/$(CONFIG)/codegen_test_full \
1674
1675
  $(BINDIR)/$(CONFIG)/codegen_test_minimal \
@@ -1727,6 +1728,7 @@ buildtests_cxx: privatelibs_cxx \
1727
1728
  $(BINDIR)/$(CONFIG)/server_crash_test \
1728
1729
  $(BINDIR)/$(CONFIG)/server_crash_test_client \
1729
1730
  $(BINDIR)/$(CONFIG)/server_early_return_test \
1731
+ $(BINDIR)/$(CONFIG)/server_interceptors_end2end_test \
1730
1732
  $(BINDIR)/$(CONFIG)/server_request_call_test \
1731
1733
  $(BINDIR)/$(CONFIG)/shutdown_test \
1732
1734
  $(BINDIR)/$(CONFIG)/slice_hash_table_test \
@@ -1850,6 +1852,7 @@ buildtests_cxx: privatelibs_cxx \
1850
1852
  $(BINDIR)/$(CONFIG)/client_channel_stress_test \
1851
1853
  $(BINDIR)/$(CONFIG)/client_crash_test \
1852
1854
  $(BINDIR)/$(CONFIG)/client_crash_test_server \
1855
+ $(BINDIR)/$(CONFIG)/client_interceptors_end2end_test \
1853
1856
  $(BINDIR)/$(CONFIG)/client_lb_end2end_test \
1854
1857
  $(BINDIR)/$(CONFIG)/codegen_test_full \
1855
1858
  $(BINDIR)/$(CONFIG)/codegen_test_minimal \
@@ -1908,6 +1911,7 @@ buildtests_cxx: privatelibs_cxx \
1908
1911
  $(BINDIR)/$(CONFIG)/server_crash_test \
1909
1912
  $(BINDIR)/$(CONFIG)/server_crash_test_client \
1910
1913
  $(BINDIR)/$(CONFIG)/server_early_return_test \
1914
+ $(BINDIR)/$(CONFIG)/server_interceptors_end2end_test \
1911
1915
  $(BINDIR)/$(CONFIG)/server_request_call_test \
1912
1916
  $(BINDIR)/$(CONFIG)/shutdown_test \
1913
1917
  $(BINDIR)/$(CONFIG)/slice_hash_table_test \
@@ -2058,10 +2062,10 @@ test_c: buildtests_c
2058
2062
  $(Q) $(BINDIR)/$(CONFIG)/grpc_security_connector_test || ( echo test grpc_security_connector_test failed ; exit 1 )
2059
2063
  $(E) "[RUN] Testing grpc_ssl_credentials_test"
2060
2064
  $(Q) $(BINDIR)/$(CONFIG)/grpc_ssl_credentials_test || ( echo test grpc_ssl_credentials_test failed ; exit 1 )
2061
- $(E) "[RUN] Testing handshake_client"
2062
- $(Q) $(BINDIR)/$(CONFIG)/handshake_client || ( echo test handshake_client failed ; exit 1 )
2063
- $(E) "[RUN] Testing handshake_server"
2064
- $(Q) $(BINDIR)/$(CONFIG)/handshake_server || ( echo test handshake_server failed ; exit 1 )
2065
+ $(E) "[RUN] Testing handshake_client_ssl"
2066
+ $(Q) $(BINDIR)/$(CONFIG)/handshake_client_ssl || ( echo test handshake_client_ssl failed ; exit 1 )
2067
+ $(E) "[RUN] Testing handshake_server_ssl"
2068
+ $(Q) $(BINDIR)/$(CONFIG)/handshake_server_ssl || ( echo test handshake_server_ssl failed ; exit 1 )
2065
2069
  $(E) "[RUN] Testing handshake_server_with_readahead_handshaker"
2066
2070
  $(Q) $(BINDIR)/$(CONFIG)/handshake_server_with_readahead_handshaker || ( echo test handshake_server_with_readahead_handshaker failed ; exit 1 )
2067
2071
  $(E) "[RUN] Testing handshake_verify_peer_options"
@@ -2096,8 +2100,8 @@ test_c: buildtests_c
2096
2100
  $(Q) $(BINDIR)/$(CONFIG)/lame_client_test || ( echo test lame_client_test failed ; exit 1 )
2097
2101
  $(E) "[RUN] Testing load_file_test"
2098
2102
  $(Q) $(BINDIR)/$(CONFIG)/load_file_test || ( echo test load_file_test failed ; exit 1 )
2099
- $(E) "[RUN] Testing memory_profile_test"
2100
- $(Q) $(BINDIR)/$(CONFIG)/memory_profile_test || ( echo test memory_profile_test failed ; exit 1 )
2103
+ $(E) "[RUN] Testing memory_usage_test"
2104
+ $(Q) $(BINDIR)/$(CONFIG)/memory_usage_test || ( echo test memory_usage_test failed ; exit 1 )
2101
2105
  $(E) "[RUN] Testing message_compress_test"
2102
2106
  $(Q) $(BINDIR)/$(CONFIG)/message_compress_test || ( echo test message_compress_test failed ; exit 1 )
2103
2107
  $(E) "[RUN] Testing minimal_stack_is_minimal_test"
@@ -2308,6 +2312,8 @@ test_cxx: buildtests_cxx
2308
2312
  $(Q) $(BINDIR)/$(CONFIG)/client_channel_stress_test || ( echo test client_channel_stress_test failed ; exit 1 )
2309
2313
  $(E) "[RUN] Testing client_crash_test"
2310
2314
  $(Q) $(BINDIR)/$(CONFIG)/client_crash_test || ( echo test client_crash_test failed ; exit 1 )
2315
+ $(E) "[RUN] Testing client_interceptors_end2end_test"
2316
+ $(Q) $(BINDIR)/$(CONFIG)/client_interceptors_end2end_test || ( echo test client_interceptors_end2end_test failed ; exit 1 )
2311
2317
  $(E) "[RUN] Testing client_lb_end2end_test"
2312
2318
  $(Q) $(BINDIR)/$(CONFIG)/client_lb_end2end_test || ( echo test client_lb_end2end_test failed ; exit 1 )
2313
2319
  $(E) "[RUN] Testing codegen_test_full"
@@ -2398,6 +2404,8 @@ test_cxx: buildtests_cxx
2398
2404
  $(Q) $(BINDIR)/$(CONFIG)/server_crash_test || ( echo test server_crash_test failed ; exit 1 )
2399
2405
  $(E) "[RUN] Testing server_early_return_test"
2400
2406
  $(Q) $(BINDIR)/$(CONFIG)/server_early_return_test || ( echo test server_early_return_test failed ; exit 1 )
2407
+ $(E) "[RUN] Testing server_interceptors_end2end_test"
2408
+ $(Q) $(BINDIR)/$(CONFIG)/server_interceptors_end2end_test || ( echo test server_interceptors_end2end_test failed ; exit 1 )
2401
2409
  $(E) "[RUN] Testing server_request_call_test"
2402
2410
  $(Q) $(BINDIR)/$(CONFIG)/server_request_call_test || ( echo test server_request_call_test failed ; exit 1 )
2403
2411
  $(E) "[RUN] Testing shutdown_test"
@@ -3003,7 +3011,7 @@ install-shared_c: shared_c strip-shared_c install-pkg-config_c
3003
3011
  ifeq ($(SYSTEM),MINGW32)
3004
3012
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libaddress_sorting.a
3005
3013
  else ifneq ($(SYSTEM),Darwin)
3006
- $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libaddress_sorting.so.6
3014
+ $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libaddress_sorting.so.7
3007
3015
  $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libaddress_sorting.so
3008
3016
  endif
3009
3017
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
@@ -3012,7 +3020,7 @@ endif
3012
3020
  ifeq ($(SYSTEM),MINGW32)
3013
3021
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgpr.a
3014
3022
  else ifneq ($(SYSTEM),Darwin)
3015
- $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgpr.so.6
3023
+ $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgpr.so.7
3016
3024
  $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgpr.so
3017
3025
  endif
3018
3026
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
@@ -3021,7 +3029,7 @@ endif
3021
3029
  ifeq ($(SYSTEM),MINGW32)
3022
3030
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgrpc.a
3023
3031
  else ifneq ($(SYSTEM),Darwin)
3024
- $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc.so.6
3032
+ $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc.so.7
3025
3033
  $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc.so
3026
3034
  endif
3027
3035
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
@@ -3030,7 +3038,7 @@ endif
3030
3038
  ifeq ($(SYSTEM),MINGW32)
3031
3039
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgrpc_cronet.a
3032
3040
  else ifneq ($(SYSTEM),Darwin)
3033
- $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_cronet.so.6
3041
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_cronet.so.7
3034
3042
  $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_cronet.so
3035
3043
  endif
3036
3044
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE)"
@@ -3039,7 +3047,7 @@ endif
3039
3047
  ifeq ($(SYSTEM),MINGW32)
3040
3048
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE)-dll.a $(prefix)/lib/libgrpc_unsecure.a
3041
3049
  else ifneq ($(SYSTEM),Darwin)
3042
- $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so.6
3050
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so.7
3043
3051
  $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(prefix)/lib/libgrpc_unsecure.so
3044
3052
  endif
3045
3053
  ifneq ($(SYSTEM),MINGW32)
@@ -3056,7 +3064,7 @@ install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-con
3056
3064
  ifeq ($(SYSTEM),MINGW32)
3057
3065
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++.a
3058
3066
  else ifneq ($(SYSTEM),Darwin)
3059
- $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++.so.6
3067
+ $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++.so.1
3060
3068
  $(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++.so
3061
3069
  endif
3062
3070
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
@@ -3065,7 +3073,7 @@ endif
3065
3073
  ifeq ($(SYSTEM),MINGW32)
3066
3074
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_cronet.a
3067
3075
  else ifneq ($(SYSTEM),Darwin)
3068
- $(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_cronet.so.6
3076
+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_cronet.so.1
3069
3077
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_cronet.so
3070
3078
  endif
3071
3079
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
@@ -3074,7 +3082,7 @@ endif
3074
3082
  ifeq ($(SYSTEM),MINGW32)
3075
3083
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_error_details.a
3076
3084
  else ifneq ($(SYSTEM),Darwin)
3077
- $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_error_details.so.6
3085
+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_error_details.so.1
3078
3086
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_error_details.so
3079
3087
  endif
3080
3088
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
@@ -3083,7 +3091,7 @@ endif
3083
3091
  ifeq ($(SYSTEM),MINGW32)
3084
3092
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_reflection.a
3085
3093
  else ifneq ($(SYSTEM),Darwin)
3086
- $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_reflection.so.6
3094
+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_reflection.so.1
3087
3095
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_reflection.so
3088
3096
  endif
3089
3097
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
@@ -3092,7 +3100,7 @@ endif
3092
3100
  ifeq ($(SYSTEM),MINGW32)
3093
3101
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpc++_unsecure.a
3094
3102
  else ifneq ($(SYSTEM),Darwin)
3095
- $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_unsecure.so.6
3103
+ $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_unsecure.so.1
3096
3104
  $(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpc++_unsecure.so
3097
3105
  endif
3098
3106
  $(E) "[INSTALL] Installing $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
@@ -3101,7 +3109,7 @@ endif
3101
3109
  ifeq ($(SYSTEM),MINGW32)
3102
3110
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP)-dll.a $(prefix)/lib/libgrpcpp_channelz.a
3103
3111
  else ifneq ($(SYSTEM),Darwin)
3104
- $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpcpp_channelz.so.6
3112
+ $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpcpp_channelz.so.1
3105
3113
  $(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/lib/libgrpcpp_channelz.so
3106
3114
  endif
3107
3115
  ifneq ($(SYSTEM),MINGW32)
@@ -3118,7 +3126,7 @@ install-shared_csharp: shared_csharp strip-shared_csharp
3118
3126
  ifeq ($(SYSTEM),MINGW32)
3119
3127
  $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc_csharp_ext$(SHARED_VERSION_CSHARP)-dll.a $(prefix)/lib/libgrpc_csharp_ext.a
3120
3128
  else ifneq ($(SYSTEM),Darwin)
3121
- $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/lib/libgrpc_csharp_ext.so.6
3129
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/lib/libgrpc_csharp_ext.so.1
3122
3130
  $(Q) ln -sf $(SHARED_PREFIX)grpc_csharp_ext$(SHARED_VERSION_CSHARP).$(SHARED_EXT_CSHARP) $(prefix)/lib/libgrpc_csharp_ext.so
3123
3131
  endif
3124
3132
  ifneq ($(SYSTEM),MINGW32)
@@ -3209,8 +3217,8 @@ $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE):
3209
3217
  ifeq ($(SYSTEM),Darwin)
3210
3218
  $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3211
3219
  else
3212
- $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.6 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3213
- $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.6
3220
+ $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libaddress_sorting.so.7 -o $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBADDRESS_SORTING_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3221
+ $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so.7
3214
3222
  $(Q) ln -sf $(SHARED_PREFIX)address_sorting$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libaddress_sorting$(SHARED_VERSION_CORE).so
3215
3223
  endif
3216
3224
  endif
@@ -3404,8 +3412,8 @@ $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGPR_OB
3404
3412
  ifeq ($(SYSTEM),Darwin)
3405
3413
  $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3406
3414
  else
3407
- $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.6 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3408
- $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.6
3415
+ $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgpr.so.7 -o $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGPR_OBJS) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3416
+ $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so.7
3409
3417
  $(Q) ln -sf $(SHARED_PREFIX)gpr$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgpr$(SHARED_VERSION_CORE).so
3410
3418
  endif
3411
3419
  endif
@@ -3592,6 +3600,7 @@ LIBGRPC_SRC = \
3592
3600
  src/core/lib/transport/timeout_encoding.cc \
3593
3601
  src/core/lib/transport/transport.cc \
3594
3602
  src/core/lib/transport/transport_op_string.cc \
3603
+ src/core/lib/uri/uri_parser.cc \
3595
3604
  src/core/lib/debug/trace.cc \
3596
3605
  src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc \
3597
3606
  src/core/ext/transport/chttp2/transport/bin_decoder.cc \
@@ -3638,11 +3647,14 @@ LIBGRPC_SRC = \
3638
3647
  src/core/lib/security/credentials/oauth2/oauth2_credentials.cc \
3639
3648
  src/core/lib/security/credentials/plugin/plugin_credentials.cc \
3640
3649
  src/core/lib/security/credentials/ssl/ssl_credentials.cc \
3641
- src/core/lib/security/security_connector/alts_security_connector.cc \
3650
+ src/core/lib/security/security_connector/alts/alts_security_connector.cc \
3651
+ src/core/lib/security/security_connector/fake/fake_security_connector.cc \
3642
3652
  src/core/lib/security/security_connector/load_system_roots_fallback.cc \
3643
3653
  src/core/lib/security/security_connector/load_system_roots_linux.cc \
3644
- src/core/lib/security/security_connector/local_security_connector.cc \
3654
+ src/core/lib/security/security_connector/local/local_security_connector.cc \
3645
3655
  src/core/lib/security/security_connector/security_connector.cc \
3656
+ src/core/lib/security/security_connector/ssl/ssl_security_connector.cc \
3657
+ src/core/lib/security/security_connector/ssl_utils.cc \
3646
3658
  src/core/lib/security/transport/client_auth_filter.cc \
3647
3659
  src/core/lib/security/transport/secure_endpoint.cc \
3648
3660
  src/core/lib/security/transport/security_handshaker.cc \
@@ -3661,7 +3673,7 @@ LIBGRPC_SRC = \
3661
3673
  src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc \
3662
3674
  src/core/tsi/alts/frame_protector/frame_handler.cc \
3663
3675
  src/core/tsi/alts/handshaker/alts_handshaker_client.cc \
3664
- src/core/tsi/alts/handshaker/alts_tsi_event.cc \
3676
+ src/core/tsi/alts/handshaker/alts_shared_resource.cc \
3665
3677
  src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc \
3666
3678
  src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc \
3667
3679
  src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc \
@@ -3697,23 +3709,23 @@ LIBGRPC_SRC = \
3697
3709
  src/core/ext/filters/client_channel/client_channel_factory.cc \
3698
3710
  src/core/ext/filters/client_channel/client_channel_plugin.cc \
3699
3711
  src/core/ext/filters/client_channel/connector.cc \
3712
+ src/core/ext/filters/client_channel/health/health_check_client.cc \
3700
3713
  src/core/ext/filters/client_channel/http_connect_handshaker.cc \
3701
3714
  src/core/ext/filters/client_channel/http_proxy.cc \
3702
3715
  src/core/ext/filters/client_channel/lb_policy.cc \
3703
3716
  src/core/ext/filters/client_channel/lb_policy_factory.cc \
3704
3717
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
3705
- src/core/ext/filters/client_channel/method_params.cc \
3706
3718
  src/core/ext/filters/client_channel/parse_address.cc \
3707
3719
  src/core/ext/filters/client_channel/proxy_mapper.cc \
3708
3720
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
3709
3721
  src/core/ext/filters/client_channel/resolver.cc \
3710
3722
  src/core/ext/filters/client_channel/resolver_registry.cc \
3723
+ src/core/ext/filters/client_channel/resolver_result_parsing.cc \
3711
3724
  src/core/ext/filters/client_channel/retry_throttle.cc \
3712
3725
  src/core/ext/filters/client_channel/subchannel.cc \
3713
3726
  src/core/ext/filters/client_channel/subchannel_index.cc \
3714
- src/core/ext/filters/client_channel/uri_parser.cc \
3715
3727
  src/core/ext/filters/deadline/deadline_filter.cc \
3716
- src/core/tsi/alts_transport_security.cc \
3728
+ src/core/ext/filters/client_channel/health/health.pb.c \
3717
3729
  src/core/tsi/fake_transport_security.cc \
3718
3730
  src/core/tsi/local_transport_security.cc \
3719
3731
  src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc \
@@ -3732,10 +3744,14 @@ LIBGRPC_SRC = \
3732
3744
  src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc \
3733
3745
  src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc \
3734
3746
  src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc \
3747
+ src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
3735
3748
  src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c \
3736
3749
  src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c \
3737
3750
  src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
3738
- src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
3751
+ src/core/ext/filters/client_channel/lb_policy/xds/xds.cc \
3752
+ src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_secure.cc \
3753
+ src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.cc \
3754
+ src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.cc \
3739
3755
  src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
3740
3756
  src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
3741
3757
  src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
@@ -3831,8 +3847,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(LIBGRPC_
3831
3847
  ifeq ($(SYSTEM),Darwin)
3832
3848
  $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3833
3849
  else
3834
- $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.6 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3835
- $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.6
3850
+ $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc.so.7 -o $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
3851
+ $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so.7
3836
3852
  $(Q) ln -sf $(SHARED_PREFIX)grpc$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc$(SHARED_VERSION_CORE).so
3837
3853
  endif
3838
3854
  endif
@@ -3998,6 +4014,7 @@ LIBGRPC_CRONET_SRC = \
3998
4014
  src/core/lib/transport/timeout_encoding.cc \
3999
4015
  src/core/lib/transport/transport.cc \
4000
4016
  src/core/lib/transport/transport_op_string.cc \
4017
+ src/core/lib/uri/uri_parser.cc \
4001
4018
  src/core/lib/debug/trace.cc \
4002
4019
  src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc \
4003
4020
  src/core/ext/transport/cronet/transport/cronet_api_dummy.cc \
@@ -4037,22 +4054,26 @@ LIBGRPC_CRONET_SRC = \
4037
4054
  src/core/ext/filters/client_channel/client_channel_factory.cc \
4038
4055
  src/core/ext/filters/client_channel/client_channel_plugin.cc \
4039
4056
  src/core/ext/filters/client_channel/connector.cc \
4057
+ src/core/ext/filters/client_channel/health/health_check_client.cc \
4040
4058
  src/core/ext/filters/client_channel/http_connect_handshaker.cc \
4041
4059
  src/core/ext/filters/client_channel/http_proxy.cc \
4042
4060
  src/core/ext/filters/client_channel/lb_policy.cc \
4043
4061
  src/core/ext/filters/client_channel/lb_policy_factory.cc \
4044
4062
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
4045
- src/core/ext/filters/client_channel/method_params.cc \
4046
4063
  src/core/ext/filters/client_channel/parse_address.cc \
4047
4064
  src/core/ext/filters/client_channel/proxy_mapper.cc \
4048
4065
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
4049
4066
  src/core/ext/filters/client_channel/resolver.cc \
4050
4067
  src/core/ext/filters/client_channel/resolver_registry.cc \
4068
+ src/core/ext/filters/client_channel/resolver_result_parsing.cc \
4051
4069
  src/core/ext/filters/client_channel/retry_throttle.cc \
4052
4070
  src/core/ext/filters/client_channel/subchannel.cc \
4053
4071
  src/core/ext/filters/client_channel/subchannel_index.cc \
4054
- src/core/ext/filters/client_channel/uri_parser.cc \
4055
4072
  src/core/ext/filters/deadline/deadline_filter.cc \
4073
+ src/core/ext/filters/client_channel/health/health.pb.c \
4074
+ third_party/nanopb/pb_common.c \
4075
+ third_party/nanopb/pb_decode.c \
4076
+ third_party/nanopb/pb_encode.c \
4056
4077
  src/core/lib/http/httpcli_security_connector.cc \
4057
4078
  src/core/lib/security/context/security_context.cc \
4058
4079
  src/core/lib/security/credentials/alts/alts_credentials.cc \
@@ -4070,11 +4091,14 @@ LIBGRPC_CRONET_SRC = \
4070
4091
  src/core/lib/security/credentials/oauth2/oauth2_credentials.cc \
4071
4092
  src/core/lib/security/credentials/plugin/plugin_credentials.cc \
4072
4093
  src/core/lib/security/credentials/ssl/ssl_credentials.cc \
4073
- src/core/lib/security/security_connector/alts_security_connector.cc \
4094
+ src/core/lib/security/security_connector/alts/alts_security_connector.cc \
4095
+ src/core/lib/security/security_connector/fake/fake_security_connector.cc \
4074
4096
  src/core/lib/security/security_connector/load_system_roots_fallback.cc \
4075
4097
  src/core/lib/security/security_connector/load_system_roots_linux.cc \
4076
- src/core/lib/security/security_connector/local_security_connector.cc \
4098
+ src/core/lib/security/security_connector/local/local_security_connector.cc \
4077
4099
  src/core/lib/security/security_connector/security_connector.cc \
4100
+ src/core/lib/security/security_connector/ssl/ssl_security_connector.cc \
4101
+ src/core/lib/security/security_connector/ssl_utils.cc \
4078
4102
  src/core/lib/security/transport/client_auth_filter.cc \
4079
4103
  src/core/lib/security/transport/secure_endpoint.cc \
4080
4104
  src/core/lib/security/transport/security_handshaker.cc \
@@ -4093,7 +4117,7 @@ LIBGRPC_CRONET_SRC = \
4093
4117
  src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc \
4094
4118
  src/core/tsi/alts/frame_protector/frame_handler.cc \
4095
4119
  src/core/tsi/alts/handshaker/alts_handshaker_client.cc \
4096
- src/core/tsi/alts/handshaker/alts_tsi_event.cc \
4120
+ src/core/tsi/alts/handshaker/alts_shared_resource.cc \
4097
4121
  src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc \
4098
4122
  src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc \
4099
4123
  src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc \
@@ -4114,15 +4138,11 @@ LIBGRPC_CRONET_SRC = \
4114
4138
  src/core/tsi/alts/handshaker/altscontext.pb.c \
4115
4139
  src/core/tsi/alts/handshaker/handshaker.pb.c \
4116
4140
  src/core/tsi/alts/handshaker/transport_security_common.pb.c \
4117
- third_party/nanopb/pb_common.c \
4118
- third_party/nanopb/pb_decode.c \
4119
- third_party/nanopb/pb_encode.c \
4120
4141
  src/core/tsi/transport_security.cc \
4121
4142
  src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
4122
4143
  src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
4123
4144
  src/core/ext/transport/chttp2/client/authority.cc \
4124
4145
  src/core/ext/transport/chttp2/client/chttp2_connector.cc \
4125
- src/core/tsi/alts_transport_security.cc \
4126
4146
  src/core/tsi/fake_transport_security.cc \
4127
4147
  src/core/tsi/local_transport_security.cc \
4128
4148
  src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc \
@@ -4196,8 +4216,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $(L
4196
4216
  ifeq ($(SYSTEM),Darwin)
4197
4217
  $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
4198
4218
  else
4199
- $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_cronet.so.6 -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
4200
- $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so.6
4219
+ $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_cronet.so.7 -o $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_CRONET_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(OPENSSL_MERGE_LIBS) $(LDLIBS_SECURE) $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
4220
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so.7
4201
4221
  $(Q) ln -sf $(SHARED_PREFIX)grpc_cronet$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_cronet$(SHARED_VERSION_CORE).so
4202
4222
  endif
4203
4223
  endif
@@ -4389,6 +4409,7 @@ LIBGRPC_TEST_UTIL_SRC = \
4389
4409
  src/core/lib/transport/timeout_encoding.cc \
4390
4410
  src/core/lib/transport/transport.cc \
4391
4411
  src/core/lib/transport/transport_op_string.cc \
4412
+ src/core/lib/uri/uri_parser.cc \
4392
4413
  src/core/lib/debug/trace.cc \
4393
4414
  src/core/ext/filters/client_channel/backup_poller.cc \
4394
4415
  src/core/ext/filters/client_channel/channel_connectivity.cc \
@@ -4397,22 +4418,26 @@ LIBGRPC_TEST_UTIL_SRC = \
4397
4418
  src/core/ext/filters/client_channel/client_channel_factory.cc \
4398
4419
  src/core/ext/filters/client_channel/client_channel_plugin.cc \
4399
4420
  src/core/ext/filters/client_channel/connector.cc \
4421
+ src/core/ext/filters/client_channel/health/health_check_client.cc \
4400
4422
  src/core/ext/filters/client_channel/http_connect_handshaker.cc \
4401
4423
  src/core/ext/filters/client_channel/http_proxy.cc \
4402
4424
  src/core/ext/filters/client_channel/lb_policy.cc \
4403
4425
  src/core/ext/filters/client_channel/lb_policy_factory.cc \
4404
4426
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
4405
- src/core/ext/filters/client_channel/method_params.cc \
4406
4427
  src/core/ext/filters/client_channel/parse_address.cc \
4407
4428
  src/core/ext/filters/client_channel/proxy_mapper.cc \
4408
4429
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
4409
4430
  src/core/ext/filters/client_channel/resolver.cc \
4410
4431
  src/core/ext/filters/client_channel/resolver_registry.cc \
4432
+ src/core/ext/filters/client_channel/resolver_result_parsing.cc \
4411
4433
  src/core/ext/filters/client_channel/retry_throttle.cc \
4412
4434
  src/core/ext/filters/client_channel/subchannel.cc \
4413
4435
  src/core/ext/filters/client_channel/subchannel_index.cc \
4414
- src/core/ext/filters/client_channel/uri_parser.cc \
4415
4436
  src/core/ext/filters/deadline/deadline_filter.cc \
4437
+ src/core/ext/filters/client_channel/health/health.pb.c \
4438
+ third_party/nanopb/pb_common.c \
4439
+ third_party/nanopb/pb_decode.c \
4440
+ third_party/nanopb/pb_encode.c \
4416
4441
  src/core/ext/transport/chttp2/transport/bin_decoder.cc \
4417
4442
  src/core/ext/transport/chttp2/transport/bin_encoder.cc \
4418
4443
  src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
@@ -4689,6 +4714,7 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
4689
4714
  src/core/lib/transport/timeout_encoding.cc \
4690
4715
  src/core/lib/transport/transport.cc \
4691
4716
  src/core/lib/transport/transport_op_string.cc \
4717
+ src/core/lib/uri/uri_parser.cc \
4692
4718
  src/core/lib/debug/trace.cc \
4693
4719
  src/core/ext/filters/client_channel/backup_poller.cc \
4694
4720
  src/core/ext/filters/client_channel/channel_connectivity.cc \
@@ -4697,22 +4723,26 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
4697
4723
  src/core/ext/filters/client_channel/client_channel_factory.cc \
4698
4724
  src/core/ext/filters/client_channel/client_channel_plugin.cc \
4699
4725
  src/core/ext/filters/client_channel/connector.cc \
4726
+ src/core/ext/filters/client_channel/health/health_check_client.cc \
4700
4727
  src/core/ext/filters/client_channel/http_connect_handshaker.cc \
4701
4728
  src/core/ext/filters/client_channel/http_proxy.cc \
4702
4729
  src/core/ext/filters/client_channel/lb_policy.cc \
4703
4730
  src/core/ext/filters/client_channel/lb_policy_factory.cc \
4704
4731
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
4705
- src/core/ext/filters/client_channel/method_params.cc \
4706
4732
  src/core/ext/filters/client_channel/parse_address.cc \
4707
4733
  src/core/ext/filters/client_channel/proxy_mapper.cc \
4708
4734
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
4709
4735
  src/core/ext/filters/client_channel/resolver.cc \
4710
4736
  src/core/ext/filters/client_channel/resolver_registry.cc \
4737
+ src/core/ext/filters/client_channel/resolver_result_parsing.cc \
4711
4738
  src/core/ext/filters/client_channel/retry_throttle.cc \
4712
4739
  src/core/ext/filters/client_channel/subchannel.cc \
4713
4740
  src/core/ext/filters/client_channel/subchannel_index.cc \
4714
- src/core/ext/filters/client_channel/uri_parser.cc \
4715
4741
  src/core/ext/filters/deadline/deadline_filter.cc \
4742
+ src/core/ext/filters/client_channel/health/health.pb.c \
4743
+ third_party/nanopb/pb_common.c \
4744
+ third_party/nanopb/pb_decode.c \
4745
+ third_party/nanopb/pb_encode.c \
4716
4746
  src/core/ext/transport/chttp2/transport/bin_decoder.cc \
4717
4747
  src/core/ext/transport/chttp2/transport/bin_encoder.cc \
4718
4748
  src/core/ext/transport/chttp2/transport/chttp2_plugin.cc \
@@ -4955,6 +4985,7 @@ LIBGRPC_UNSECURE_SRC = \
4955
4985
  src/core/lib/transport/timeout_encoding.cc \
4956
4986
  src/core/lib/transport/transport.cc \
4957
4987
  src/core/lib/transport/transport_op_string.cc \
4988
+ src/core/lib/uri/uri_parser.cc \
4958
4989
  src/core/lib/debug/trace.cc \
4959
4990
  src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc \
4960
4991
  src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc \
@@ -4997,22 +5028,26 @@ LIBGRPC_UNSECURE_SRC = \
4997
5028
  src/core/ext/filters/client_channel/client_channel_factory.cc \
4998
5029
  src/core/ext/filters/client_channel/client_channel_plugin.cc \
4999
5030
  src/core/ext/filters/client_channel/connector.cc \
5031
+ src/core/ext/filters/client_channel/health/health_check_client.cc \
5000
5032
  src/core/ext/filters/client_channel/http_connect_handshaker.cc \
5001
5033
  src/core/ext/filters/client_channel/http_proxy.cc \
5002
5034
  src/core/ext/filters/client_channel/lb_policy.cc \
5003
5035
  src/core/ext/filters/client_channel/lb_policy_factory.cc \
5004
5036
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
5005
- src/core/ext/filters/client_channel/method_params.cc \
5006
5037
  src/core/ext/filters/client_channel/parse_address.cc \
5007
5038
  src/core/ext/filters/client_channel/proxy_mapper.cc \
5008
5039
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
5009
5040
  src/core/ext/filters/client_channel/resolver.cc \
5010
5041
  src/core/ext/filters/client_channel/resolver_registry.cc \
5042
+ src/core/ext/filters/client_channel/resolver_result_parsing.cc \
5011
5043
  src/core/ext/filters/client_channel/retry_throttle.cc \
5012
5044
  src/core/ext/filters/client_channel/subchannel.cc \
5013
5045
  src/core/ext/filters/client_channel/subchannel_index.cc \
5014
- src/core/ext/filters/client_channel/uri_parser.cc \
5015
5046
  src/core/ext/filters/deadline/deadline_filter.cc \
5047
+ src/core/ext/filters/client_channel/health/health.pb.c \
5048
+ third_party/nanopb/pb_common.c \
5049
+ third_party/nanopb/pb_decode.c \
5050
+ third_party/nanopb/pb_encode.c \
5016
5051
  src/core/ext/transport/inproc/inproc_plugin.cc \
5017
5052
  src/core/ext/transport/inproc/inproc_transport.cc \
5018
5053
  src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc \
@@ -5034,9 +5069,10 @@ LIBGRPC_UNSECURE_SRC = \
5034
5069
  src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c \
5035
5070
  src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c \
5036
5071
  src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
5037
- third_party/nanopb/pb_common.c \
5038
- third_party/nanopb/pb_decode.c \
5039
- third_party/nanopb/pb_encode.c \
5072
+ src/core/ext/filters/client_channel/lb_policy/xds/xds.cc \
5073
+ src/core/ext/filters/client_channel/lb_policy/xds/xds_channel.cc \
5074
+ src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.cc \
5075
+ src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.cc \
5040
5076
  src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc \
5041
5077
  src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
5042
5078
  src/core/ext/filters/census/grpc_context.cc \
@@ -5110,8 +5146,8 @@ $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE): $
5110
5146
  ifeq ($(SYSTEM),Darwin)
5111
5147
  $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
5112
5148
  else
5113
- $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.6 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
5114
- $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.6
5149
+ $(Q) $(LD) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc_unsecure.so.7 -o $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBGRPC_UNSECURE_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(ZLIB_MERGE_LIBS) $(CARES_MERGE_LIBS) $(ADDRESS_SORTING_MERGE_LIBS) $(LDLIBS)
5150
+ $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so.7
5115
5151
  $(Q) ln -sf $(SHARED_PREFIX)grpc_unsecure$(SHARED_VERSION_CORE).$(SHARED_EXT_CORE) $(LIBDIR)/$(CONFIG)/libgrpc_unsecure$(SHARED_VERSION_CORE).so
5116
5152
  endif
5117
5153
  endif
@@ -5210,6 +5246,7 @@ LIBGRPC++_SRC = \
5210
5246
  src/cpp/server/secure_server_credentials.cc \
5211
5247
  src/cpp/client/channel_cc.cc \
5212
5248
  src/cpp/client/client_context.cc \
5249
+ src/cpp/client/client_interceptor.cc \
5213
5250
  src/cpp/client/create_channel.cc \
5214
5251
  src/cpp/client/create_channel_internal.cc \
5215
5252
  src/cpp/client/create_channel_posix.cc \
@@ -5228,7 +5265,6 @@ LIBGRPC++_SRC = \
5228
5265
  src/cpp/server/create_default_thread_pool.cc \
5229
5266
  src/cpp/server/dynamic_thread_pool.cc \
5230
5267
  src/cpp/server/health/default_health_check_service.cc \
5231
- src/cpp/server/health/health.pb.c \
5232
5268
  src/cpp/server/health/health_check_service.cc \
5233
5269
  src/cpp/server/health/health_check_service_server_builder_option.cc \
5234
5270
  src/cpp/server/server_builder.cc \
@@ -5241,6 +5277,10 @@ LIBGRPC++_SRC = \
5241
5277
  src/cpp/util/status.cc \
5242
5278
  src/cpp/util/string_ref.cc \
5243
5279
  src/cpp/util/time_cc.cc \
5280
+ src/core/ext/filters/client_channel/health/health.pb.c \
5281
+ third_party/nanopb/pb_common.c \
5282
+ third_party/nanopb/pb_decode.c \
5283
+ third_party/nanopb/pb_encode.c \
5244
5284
  src/cpp/codegen/codegen_init.cc \
5245
5285
 
5246
5286
  PUBLIC_HEADERS_CXX += \
@@ -5330,6 +5370,7 @@ PUBLIC_HEADERS_CXX += \
5330
5370
  include/grpcpp/support/config.h \
5331
5371
  include/grpcpp/support/proto_buffer_reader.h \
5332
5372
  include/grpcpp/support/proto_buffer_writer.h \
5373
+ include/grpcpp/support/server_callback.h \
5333
5374
  include/grpcpp/support/slice.h \
5334
5375
  include/grpcpp/support/status.h \
5335
5376
  include/grpcpp/support/status_code_enum.h \
@@ -5424,6 +5465,8 @@ PUBLIC_HEADERS_CXX += \
5424
5465
  include/grpcpp/impl/codegen/byte_buffer.h \
5425
5466
  include/grpcpp/impl/codegen/call.h \
5426
5467
  include/grpcpp/impl/codegen/call_hook.h \
5468
+ include/grpcpp/impl/codegen/call_op_set.h \
5469
+ include/grpcpp/impl/codegen/call_op_set_interface.h \
5427
5470
  include/grpcpp/impl/codegen/callback_common.h \
5428
5471
  include/grpcpp/impl/codegen/channel_interface.h \
5429
5472
  include/grpcpp/impl/codegen/client_callback.h \
@@ -5436,14 +5479,18 @@ PUBLIC_HEADERS_CXX += \
5436
5479
  include/grpcpp/impl/codegen/core_codegen_interface.h \
5437
5480
  include/grpcpp/impl/codegen/create_auth_context.h \
5438
5481
  include/grpcpp/impl/codegen/grpc_library.h \
5482
+ include/grpcpp/impl/codegen/intercepted_channel.h \
5439
5483
  include/grpcpp/impl/codegen/interceptor.h \
5484
+ include/grpcpp/impl/codegen/interceptor_common.h \
5440
5485
  include/grpcpp/impl/codegen/metadata_map.h \
5441
5486
  include/grpcpp/impl/codegen/method_handler_impl.h \
5442
5487
  include/grpcpp/impl/codegen/rpc_method.h \
5443
5488
  include/grpcpp/impl/codegen/rpc_service_method.h \
5444
5489
  include/grpcpp/impl/codegen/security/auth_context.h \
5445
5490
  include/grpcpp/impl/codegen/serialization_traits.h \
5491
+ include/grpcpp/impl/codegen/server_callback.h \
5446
5492
  include/grpcpp/impl/codegen/server_context.h \
5493
+ include/grpcpp/impl/codegen/server_interceptor.h \
5447
5494
  include/grpcpp/impl/codegen/server_interface.h \
5448
5495
  include/grpcpp/impl/codegen/service_type.h \
5449
5496
  include/grpcpp/impl/codegen/slice.h \
@@ -5581,6 +5628,7 @@ LIBGRPC++_CRONET_SRC = \
5581
5628
  src/cpp/server/insecure_server_credentials.cc \
5582
5629
  src/cpp/client/channel_cc.cc \
5583
5630
  src/cpp/client/client_context.cc \
5631
+ src/cpp/client/client_interceptor.cc \
5584
5632
  src/cpp/client/create_channel.cc \
5585
5633
  src/cpp/client/create_channel_internal.cc \
5586
5634
  src/cpp/client/create_channel_posix.cc \
@@ -5599,7 +5647,6 @@ LIBGRPC++_CRONET_SRC = \
5599
5647
  src/cpp/server/create_default_thread_pool.cc \
5600
5648
  src/cpp/server/dynamic_thread_pool.cc \
5601
5649
  src/cpp/server/health/default_health_check_service.cc \
5602
- src/cpp/server/health/health.pb.c \
5603
5650
  src/cpp/server/health/health_check_service.cc \
5604
5651
  src/cpp/server/health/health_check_service_server_builder_option.cc \
5605
5652
  src/cpp/server/server_builder.cc \
@@ -5612,6 +5659,10 @@ LIBGRPC++_CRONET_SRC = \
5612
5659
  src/cpp/util/status.cc \
5613
5660
  src/cpp/util/string_ref.cc \
5614
5661
  src/cpp/util/time_cc.cc \
5662
+ src/core/ext/filters/client_channel/health/health.pb.c \
5663
+ third_party/nanopb/pb_common.c \
5664
+ third_party/nanopb/pb_decode.c \
5665
+ third_party/nanopb/pb_encode.c \
5615
5666
  src/cpp/codegen/codegen_init.cc \
5616
5667
  src/core/ext/transport/chttp2/client/insecure/channel_create.cc \
5617
5668
  src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc \
@@ -5789,6 +5840,7 @@ LIBGRPC++_CRONET_SRC = \
5789
5840
  src/core/lib/transport/timeout_encoding.cc \
5790
5841
  src/core/lib/transport/transport.cc \
5791
5842
  src/core/lib/transport/transport_op_string.cc \
5843
+ src/core/lib/uri/uri_parser.cc \
5792
5844
  src/core/lib/debug/trace.cc \
5793
5845
  src/core/ext/transport/chttp2/alpn/alpn.cc \
5794
5846
  src/core/ext/filters/http/client/http_client_filter.cc \
@@ -5802,21 +5854,21 @@ LIBGRPC++_CRONET_SRC = \
5802
5854
  src/core/ext/filters/client_channel/client_channel_factory.cc \
5803
5855
  src/core/ext/filters/client_channel/client_channel_plugin.cc \
5804
5856
  src/core/ext/filters/client_channel/connector.cc \
5857
+ src/core/ext/filters/client_channel/health/health_check_client.cc \
5805
5858
  src/core/ext/filters/client_channel/http_connect_handshaker.cc \
5806
5859
  src/core/ext/filters/client_channel/http_proxy.cc \
5807
5860
  src/core/ext/filters/client_channel/lb_policy.cc \
5808
5861
  src/core/ext/filters/client_channel/lb_policy_factory.cc \
5809
5862
  src/core/ext/filters/client_channel/lb_policy_registry.cc \
5810
- src/core/ext/filters/client_channel/method_params.cc \
5811
5863
  src/core/ext/filters/client_channel/parse_address.cc \
5812
5864
  src/core/ext/filters/client_channel/proxy_mapper.cc \
5813
5865
  src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
5814
5866
  src/core/ext/filters/client_channel/resolver.cc \
5815
5867
  src/core/ext/filters/client_channel/resolver_registry.cc \
5868
+ src/core/ext/filters/client_channel/resolver_result_parsing.cc \
5816
5869
  src/core/ext/filters/client_channel/retry_throttle.cc \
5817
5870
  src/core/ext/filters/client_channel/subchannel.cc \
5818
5871
  src/core/ext/filters/client_channel/subchannel_index.cc \
5819
- src/core/ext/filters/client_channel/uri_parser.cc \
5820
5872
  src/core/ext/filters/deadline/deadline_filter.cc \
5821
5873
  src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc \
5822
5874
  src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc \
@@ -5910,6 +5962,7 @@ PUBLIC_HEADERS_CXX += \
5910
5962
  include/grpcpp/support/config.h \
5911
5963
  include/grpcpp/support/proto_buffer_reader.h \
5912
5964
  include/grpcpp/support/proto_buffer_writer.h \
5965
+ include/grpcpp/support/server_callback.h \
5913
5966
  include/grpcpp/support/slice.h \
5914
5967
  include/grpcpp/support/status.h \
5915
5968
  include/grpcpp/support/status_code_enum.h \
@@ -6004,6 +6057,8 @@ PUBLIC_HEADERS_CXX += \
6004
6057
  include/grpcpp/impl/codegen/byte_buffer.h \
6005
6058
  include/grpcpp/impl/codegen/call.h \
6006
6059
  include/grpcpp/impl/codegen/call_hook.h \
6060
+ include/grpcpp/impl/codegen/call_op_set.h \
6061
+ include/grpcpp/impl/codegen/call_op_set_interface.h \
6007
6062
  include/grpcpp/impl/codegen/callback_common.h \
6008
6063
  include/grpcpp/impl/codegen/channel_interface.h \
6009
6064
  include/grpcpp/impl/codegen/client_callback.h \
@@ -6016,14 +6071,18 @@ PUBLIC_HEADERS_CXX += \
6016
6071
  include/grpcpp/impl/codegen/core_codegen_interface.h \
6017
6072
  include/grpcpp/impl/codegen/create_auth_context.h \
6018
6073
  include/grpcpp/impl/codegen/grpc_library.h \
6074
+ include/grpcpp/impl/codegen/intercepted_channel.h \
6019
6075
  include/grpcpp/impl/codegen/interceptor.h \
6076
+ include/grpcpp/impl/codegen/interceptor_common.h \
6020
6077
  include/grpcpp/impl/codegen/metadata_map.h \
6021
6078
  include/grpcpp/impl/codegen/method_handler_impl.h \
6022
6079
  include/grpcpp/impl/codegen/rpc_method.h \
6023
6080
  include/grpcpp/impl/codegen/rpc_service_method.h \
6024
6081
  include/grpcpp/impl/codegen/security/auth_context.h \
6025
6082
  include/grpcpp/impl/codegen/serialization_traits.h \
6083
+ include/grpcpp/impl/codegen/server_callback.h \
6026
6084
  include/grpcpp/impl/codegen/server_context.h \
6085
+ include/grpcpp/impl/codegen/server_interceptor.h \
6027
6086
  include/grpcpp/impl/codegen/server_interface.h \
6028
6087
  include/grpcpp/impl/codegen/service_type.h \
6029
6088
  include/grpcpp/impl/codegen/slice.h \
@@ -6398,6 +6457,8 @@ PUBLIC_HEADERS_CXX += \
6398
6457
  include/grpcpp/impl/codegen/byte_buffer.h \
6399
6458
  include/grpcpp/impl/codegen/call.h \
6400
6459
  include/grpcpp/impl/codegen/call_hook.h \
6460
+ include/grpcpp/impl/codegen/call_op_set.h \
6461
+ include/grpcpp/impl/codegen/call_op_set_interface.h \
6401
6462
  include/grpcpp/impl/codegen/callback_common.h \
6402
6463
  include/grpcpp/impl/codegen/channel_interface.h \
6403
6464
  include/grpcpp/impl/codegen/client_callback.h \
@@ -6410,14 +6471,18 @@ PUBLIC_HEADERS_CXX += \
6410
6471
  include/grpcpp/impl/codegen/core_codegen_interface.h \
6411
6472
  include/grpcpp/impl/codegen/create_auth_context.h \
6412
6473
  include/grpcpp/impl/codegen/grpc_library.h \
6474
+ include/grpcpp/impl/codegen/intercepted_channel.h \
6413
6475
  include/grpcpp/impl/codegen/interceptor.h \
6476
+ include/grpcpp/impl/codegen/interceptor_common.h \
6414
6477
  include/grpcpp/impl/codegen/metadata_map.h \
6415
6478
  include/grpcpp/impl/codegen/method_handler_impl.h \
6416
6479
  include/grpcpp/impl/codegen/rpc_method.h \
6417
6480
  include/grpcpp/impl/codegen/rpc_service_method.h \
6418
6481
  include/grpcpp/impl/codegen/security/auth_context.h \
6419
6482
  include/grpcpp/impl/codegen/serialization_traits.h \
6483
+ include/grpcpp/impl/codegen/server_callback.h \
6420
6484
  include/grpcpp/impl/codegen/server_context.h \
6485
+ include/grpcpp/impl/codegen/server_interceptor.h \
6421
6486
  include/grpcpp/impl/codegen/server_interface.h \
6422
6487
  include/grpcpp/impl/codegen/service_type.h \
6423
6488
  include/grpcpp/impl/codegen/slice.h \
@@ -6556,6 +6621,8 @@ PUBLIC_HEADERS_CXX += \
6556
6621
  include/grpcpp/impl/codegen/byte_buffer.h \
6557
6622
  include/grpcpp/impl/codegen/call.h \
6558
6623
  include/grpcpp/impl/codegen/call_hook.h \
6624
+ include/grpcpp/impl/codegen/call_op_set.h \
6625
+ include/grpcpp/impl/codegen/call_op_set_interface.h \
6559
6626
  include/grpcpp/impl/codegen/callback_common.h \
6560
6627
  include/grpcpp/impl/codegen/channel_interface.h \
6561
6628
  include/grpcpp/impl/codegen/client_callback.h \
@@ -6568,14 +6635,18 @@ PUBLIC_HEADERS_CXX += \
6568
6635
  include/grpcpp/impl/codegen/core_codegen_interface.h \
6569
6636
  include/grpcpp/impl/codegen/create_auth_context.h \
6570
6637
  include/grpcpp/impl/codegen/grpc_library.h \
6638
+ include/grpcpp/impl/codegen/intercepted_channel.h \
6571
6639
  include/grpcpp/impl/codegen/interceptor.h \
6640
+ include/grpcpp/impl/codegen/interceptor_common.h \
6572
6641
  include/grpcpp/impl/codegen/metadata_map.h \
6573
6642
  include/grpcpp/impl/codegen/method_handler_impl.h \
6574
6643
  include/grpcpp/impl/codegen/rpc_method.h \
6575
6644
  include/grpcpp/impl/codegen/rpc_service_method.h \
6576
6645
  include/grpcpp/impl/codegen/security/auth_context.h \
6577
6646
  include/grpcpp/impl/codegen/serialization_traits.h \
6647
+ include/grpcpp/impl/codegen/server_callback.h \
6578
6648
  include/grpcpp/impl/codegen/server_context.h \
6649
+ include/grpcpp/impl/codegen/server_interceptor.h \
6579
6650
  include/grpcpp/impl/codegen/server_interface.h \
6580
6651
  include/grpcpp/impl/codegen/service_type.h \
6581
6652
  include/grpcpp/impl/codegen/slice.h \
@@ -6669,6 +6740,7 @@ LIBGRPC++_UNSECURE_SRC = \
6669
6740
  src/cpp/server/insecure_server_credentials.cc \
6670
6741
  src/cpp/client/channel_cc.cc \
6671
6742
  src/cpp/client/client_context.cc \
6743
+ src/cpp/client/client_interceptor.cc \
6672
6744
  src/cpp/client/create_channel.cc \
6673
6745
  src/cpp/client/create_channel_internal.cc \
6674
6746
  src/cpp/client/create_channel_posix.cc \
@@ -6687,7 +6759,6 @@ LIBGRPC++_UNSECURE_SRC = \
6687
6759
  src/cpp/server/create_default_thread_pool.cc \
6688
6760
  src/cpp/server/dynamic_thread_pool.cc \
6689
6761
  src/cpp/server/health/default_health_check_service.cc \
6690
- src/cpp/server/health/health.pb.c \
6691
6762
  src/cpp/server/health/health_check_service.cc \
6692
6763
  src/cpp/server/health/health_check_service_server_builder_option.cc \
6693
6764
  src/cpp/server/server_builder.cc \
@@ -6700,6 +6771,10 @@ LIBGRPC++_UNSECURE_SRC = \
6700
6771
  src/cpp/util/status.cc \
6701
6772
  src/cpp/util/string_ref.cc \
6702
6773
  src/cpp/util/time_cc.cc \
6774
+ src/core/ext/filters/client_channel/health/health.pb.c \
6775
+ third_party/nanopb/pb_common.c \
6776
+ third_party/nanopb/pb_decode.c \
6777
+ third_party/nanopb/pb_encode.c \
6703
6778
  src/cpp/codegen/codegen_init.cc \
6704
6779
 
6705
6780
  PUBLIC_HEADERS_CXX += \
@@ -6789,6 +6864,7 @@ PUBLIC_HEADERS_CXX += \
6789
6864
  include/grpcpp/support/config.h \
6790
6865
  include/grpcpp/support/proto_buffer_reader.h \
6791
6866
  include/grpcpp/support/proto_buffer_writer.h \
6867
+ include/grpcpp/support/server_callback.h \
6792
6868
  include/grpcpp/support/slice.h \
6793
6869
  include/grpcpp/support/status.h \
6794
6870
  include/grpcpp/support/status_code_enum.h \
@@ -6883,6 +6959,8 @@ PUBLIC_HEADERS_CXX += \
6883
6959
  include/grpcpp/impl/codegen/byte_buffer.h \
6884
6960
  include/grpcpp/impl/codegen/call.h \
6885
6961
  include/grpcpp/impl/codegen/call_hook.h \
6962
+ include/grpcpp/impl/codegen/call_op_set.h \
6963
+ include/grpcpp/impl/codegen/call_op_set_interface.h \
6886
6964
  include/grpcpp/impl/codegen/callback_common.h \
6887
6965
  include/grpcpp/impl/codegen/channel_interface.h \
6888
6966
  include/grpcpp/impl/codegen/client_callback.h \
@@ -6895,14 +6973,18 @@ PUBLIC_HEADERS_CXX += \
6895
6973
  include/grpcpp/impl/codegen/core_codegen_interface.h \
6896
6974
  include/grpcpp/impl/codegen/create_auth_context.h \
6897
6975
  include/grpcpp/impl/codegen/grpc_library.h \
6976
+ include/grpcpp/impl/codegen/intercepted_channel.h \
6898
6977
  include/grpcpp/impl/codegen/interceptor.h \
6978
+ include/grpcpp/impl/codegen/interceptor_common.h \
6899
6979
  include/grpcpp/impl/codegen/metadata_map.h \
6900
6980
  include/grpcpp/impl/codegen/method_handler_impl.h \
6901
6981
  include/grpcpp/impl/codegen/rpc_method.h \
6902
6982
  include/grpcpp/impl/codegen/rpc_service_method.h \
6903
6983
  include/grpcpp/impl/codegen/security/auth_context.h \
6904
6984
  include/grpcpp/impl/codegen/serialization_traits.h \
6985
+ include/grpcpp/impl/codegen/server_callback.h \
6905
6986
  include/grpcpp/impl/codegen/server_context.h \
6987
+ include/grpcpp/impl/codegen/server_interceptor.h \
6906
6988
  include/grpcpp/impl/codegen/server_interface.h \
6907
6989
  include/grpcpp/impl/codegen/service_type.h \
6908
6990
  include/grpcpp/impl/codegen/slice.h \
@@ -7510,6 +7592,7 @@ LIBQPS_SRC = \
7510
7592
  $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc \
7511
7593
  test/cpp/qps/benchmark_config.cc \
7512
7594
  test/cpp/qps/client_async.cc \
7595
+ test/cpp/qps/client_callback.cc \
7513
7596
  test/cpp/qps/client_sync.cc \
7514
7597
  test/cpp/qps/driver.cc \
7515
7598
  test/cpp/qps/parse_json.cc \
@@ -7517,6 +7600,7 @@ LIBQPS_SRC = \
7517
7600
  test/cpp/qps/qps_worker.cc \
7518
7601
  test/cpp/qps/report.cc \
7519
7602
  test/cpp/qps/server_async.cc \
7603
+ test/cpp/qps/server_callback.cc \
7520
7604
  test/cpp/qps/server_sync.cc \
7521
7605
  test/cpp/qps/usage_timer.cc \
7522
7606
 
@@ -7566,6 +7650,7 @@ endif
7566
7650
  endif
7567
7651
  $(OBJDIR)/$(CONFIG)/test/cpp/qps/benchmark_config.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc
7568
7652
  $(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc
7653
+ $(OBJDIR)/$(CONFIG)/test/cpp/qps/client_callback.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc
7569
7654
  $(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc
7570
7655
  $(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc
7571
7656
  $(OBJDIR)/$(CONFIG)/test/cpp/qps/parse_json.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc
@@ -7573,6 +7658,7 @@ $(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_server_builder.o: $(GENDIR)/src/proto/grpc/
7573
7658
  $(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc
7574
7659
  $(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc
7575
7660
  $(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc
7661
+ $(OBJDIR)/$(CONFIG)/test/cpp/qps/server_callback.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc
7576
7662
  $(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc
7577
7663
  $(OBJDIR)/$(CONFIG)/test/cpp/qps/usage_timer.o: $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.pb.cc $(GENDIR)/src/proto/grpc/testing/benchmark_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.pb.cc $(GENDIR)/src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.pb.cc $(GENDIR)/src/proto/grpc/testing/worker_service.grpc.pb.cc
7578
7664
 
@@ -12668,57 +12754,57 @@ endif
12668
12754
  endif
12669
12755
 
12670
12756
 
12671
- HANDSHAKE_CLIENT_SRC = \
12757
+ HANDSHAKE_CLIENT_SSL_SRC = \
12672
12758
  test/core/handshake/client_ssl.cc \
12673
12759
 
12674
- HANDSHAKE_CLIENT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HANDSHAKE_CLIENT_SRC))))
12760
+ HANDSHAKE_CLIENT_SSL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HANDSHAKE_CLIENT_SSL_SRC))))
12675
12761
  ifeq ($(NO_SECURE),true)
12676
12762
 
12677
12763
  # You can't build secure targets if you don't have OpenSSL.
12678
12764
 
12679
- $(BINDIR)/$(CONFIG)/handshake_client: openssl_dep_error
12765
+ $(BINDIR)/$(CONFIG)/handshake_client_ssl: openssl_dep_error
12680
12766
 
12681
12767
  else
12682
12768
 
12683
12769
 
12684
12770
 
12685
- $(BINDIR)/$(CONFIG)/handshake_client: $(HANDSHAKE_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
12771
+ $(BINDIR)/$(CONFIG)/handshake_client_ssl: $(HANDSHAKE_CLIENT_SSL_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
12686
12772
  $(E) "[LD] Linking $@"
12687
12773
  $(Q) mkdir -p `dirname $@`
12688
- $(Q) $(LD) $(LDFLAGS) $(HANDSHAKE_CLIENT_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)/handshake_client
12774
+ $(Q) $(LD) $(LDFLAGS) $(HANDSHAKE_CLIENT_SSL_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)/handshake_client_ssl
12689
12775
 
12690
12776
  endif
12691
12777
 
12692
12778
  $(OBJDIR)/$(CONFIG)/test/core/handshake/client_ssl.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
12693
12779
 
12694
- deps_handshake_client: $(HANDSHAKE_CLIENT_OBJS:.o=.dep)
12780
+ deps_handshake_client_ssl: $(HANDSHAKE_CLIENT_SSL_OBJS:.o=.dep)
12695
12781
 
12696
12782
  ifneq ($(NO_SECURE),true)
12697
12783
  ifneq ($(NO_DEPS),true)
12698
- -include $(HANDSHAKE_CLIENT_OBJS:.o=.dep)
12784
+ -include $(HANDSHAKE_CLIENT_SSL_OBJS:.o=.dep)
12699
12785
  endif
12700
12786
  endif
12701
12787
 
12702
12788
 
12703
- HANDSHAKE_SERVER_SRC = \
12789
+ HANDSHAKE_SERVER_SSL_SRC = \
12704
12790
  test/core/handshake/server_ssl.cc \
12705
12791
  test/core/handshake/server_ssl_common.cc \
12706
12792
 
12707
- HANDSHAKE_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HANDSHAKE_SERVER_SRC))))
12793
+ HANDSHAKE_SERVER_SSL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(HANDSHAKE_SERVER_SSL_SRC))))
12708
12794
  ifeq ($(NO_SECURE),true)
12709
12795
 
12710
12796
  # You can't build secure targets if you don't have OpenSSL.
12711
12797
 
12712
- $(BINDIR)/$(CONFIG)/handshake_server: openssl_dep_error
12798
+ $(BINDIR)/$(CONFIG)/handshake_server_ssl: openssl_dep_error
12713
12799
 
12714
12800
  else
12715
12801
 
12716
12802
 
12717
12803
 
12718
- $(BINDIR)/$(CONFIG)/handshake_server: $(HANDSHAKE_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
12804
+ $(BINDIR)/$(CONFIG)/handshake_server_ssl: $(HANDSHAKE_SERVER_SSL_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
12719
12805
  $(E) "[LD] Linking $@"
12720
12806
  $(Q) mkdir -p `dirname $@`
12721
- $(Q) $(LD) $(LDFLAGS) $(HANDSHAKE_SERVER_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)/handshake_server
12807
+ $(Q) $(LD) $(LDFLAGS) $(HANDSHAKE_SERVER_SSL_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)/handshake_server_ssl
12722
12808
 
12723
12809
  endif
12724
12810
 
@@ -12726,11 +12812,11 @@ $(OBJDIR)/$(CONFIG)/test/core/handshake/server_ssl.o: $(LIBDIR)/$(CONFIG)/libgr
12726
12812
 
12727
12813
  $(OBJDIR)/$(CONFIG)/test/core/handshake/server_ssl_common.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
12728
12814
 
12729
- deps_handshake_server: $(HANDSHAKE_SERVER_OBJS:.o=.dep)
12815
+ deps_handshake_server_ssl: $(HANDSHAKE_SERVER_SSL_OBJS:.o=.dep)
12730
12816
 
12731
12817
  ifneq ($(NO_SECURE),true)
12732
12818
  ifneq ($(NO_DEPS),true)
12733
- -include $(HANDSHAKE_SERVER_OBJS:.o=.dep)
12819
+ -include $(HANDSHAKE_SERVER_SSL_OBJS:.o=.dep)
12734
12820
  endif
12735
12821
  endif
12736
12822
 
@@ -13474,98 +13560,98 @@ endif
13474
13560
  endif
13475
13561
 
13476
13562
 
13477
- MEMORY_PROFILE_CLIENT_SRC = \
13563
+ MEMORY_USAGE_CLIENT_SRC = \
13478
13564
  test/core/memory_usage/client.cc \
13479
13565
 
13480
- MEMORY_PROFILE_CLIENT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_PROFILE_CLIENT_SRC))))
13566
+ MEMORY_USAGE_CLIENT_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_USAGE_CLIENT_SRC))))
13481
13567
  ifeq ($(NO_SECURE),true)
13482
13568
 
13483
13569
  # You can't build secure targets if you don't have OpenSSL.
13484
13570
 
13485
- $(BINDIR)/$(CONFIG)/memory_profile_client: openssl_dep_error
13571
+ $(BINDIR)/$(CONFIG)/memory_usage_client: openssl_dep_error
13486
13572
 
13487
13573
  else
13488
13574
 
13489
13575
 
13490
13576
 
13491
- $(BINDIR)/$(CONFIG)/memory_profile_client: $(MEMORY_PROFILE_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
13577
+ $(BINDIR)/$(CONFIG)/memory_usage_client: $(MEMORY_USAGE_CLIENT_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
13492
13578
  $(E) "[LD] Linking $@"
13493
13579
  $(Q) mkdir -p `dirname $@`
13494
- $(Q) $(LD) $(LDFLAGS) $(MEMORY_PROFILE_CLIENT_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)/memory_profile_client
13580
+ $(Q) $(LD) $(LDFLAGS) $(MEMORY_USAGE_CLIENT_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)/memory_usage_client
13495
13581
 
13496
13582
  endif
13497
13583
 
13498
13584
  $(OBJDIR)/$(CONFIG)/test/core/memory_usage/client.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
13499
13585
 
13500
- deps_memory_profile_client: $(MEMORY_PROFILE_CLIENT_OBJS:.o=.dep)
13586
+ deps_memory_usage_client: $(MEMORY_USAGE_CLIENT_OBJS:.o=.dep)
13501
13587
 
13502
13588
  ifneq ($(NO_SECURE),true)
13503
13589
  ifneq ($(NO_DEPS),true)
13504
- -include $(MEMORY_PROFILE_CLIENT_OBJS:.o=.dep)
13590
+ -include $(MEMORY_USAGE_CLIENT_OBJS:.o=.dep)
13505
13591
  endif
13506
13592
  endif
13507
13593
 
13508
13594
 
13509
- MEMORY_PROFILE_SERVER_SRC = \
13595
+ MEMORY_USAGE_SERVER_SRC = \
13510
13596
  test/core/memory_usage/server.cc \
13511
13597
 
13512
- MEMORY_PROFILE_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_PROFILE_SERVER_SRC))))
13598
+ MEMORY_USAGE_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_USAGE_SERVER_SRC))))
13513
13599
  ifeq ($(NO_SECURE),true)
13514
13600
 
13515
13601
  # You can't build secure targets if you don't have OpenSSL.
13516
13602
 
13517
- $(BINDIR)/$(CONFIG)/memory_profile_server: openssl_dep_error
13603
+ $(BINDIR)/$(CONFIG)/memory_usage_server: openssl_dep_error
13518
13604
 
13519
13605
  else
13520
13606
 
13521
13607
 
13522
13608
 
13523
- $(BINDIR)/$(CONFIG)/memory_profile_server: $(MEMORY_PROFILE_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
13609
+ $(BINDIR)/$(CONFIG)/memory_usage_server: $(MEMORY_USAGE_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
13524
13610
  $(E) "[LD] Linking $@"
13525
13611
  $(Q) mkdir -p `dirname $@`
13526
- $(Q) $(LD) $(LDFLAGS) $(MEMORY_PROFILE_SERVER_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)/memory_profile_server
13612
+ $(Q) $(LD) $(LDFLAGS) $(MEMORY_USAGE_SERVER_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)/memory_usage_server
13527
13613
 
13528
13614
  endif
13529
13615
 
13530
13616
  $(OBJDIR)/$(CONFIG)/test/core/memory_usage/server.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
13531
13617
 
13532
- deps_memory_profile_server: $(MEMORY_PROFILE_SERVER_OBJS:.o=.dep)
13618
+ deps_memory_usage_server: $(MEMORY_USAGE_SERVER_OBJS:.o=.dep)
13533
13619
 
13534
13620
  ifneq ($(NO_SECURE),true)
13535
13621
  ifneq ($(NO_DEPS),true)
13536
- -include $(MEMORY_PROFILE_SERVER_OBJS:.o=.dep)
13622
+ -include $(MEMORY_USAGE_SERVER_OBJS:.o=.dep)
13537
13623
  endif
13538
13624
  endif
13539
13625
 
13540
13626
 
13541
- MEMORY_PROFILE_TEST_SRC = \
13627
+ MEMORY_USAGE_TEST_SRC = \
13542
13628
  test/core/memory_usage/memory_usage_test.cc \
13543
13629
 
13544
- MEMORY_PROFILE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_PROFILE_TEST_SRC))))
13630
+ MEMORY_USAGE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_USAGE_TEST_SRC))))
13545
13631
  ifeq ($(NO_SECURE),true)
13546
13632
 
13547
13633
  # You can't build secure targets if you don't have OpenSSL.
13548
13634
 
13549
- $(BINDIR)/$(CONFIG)/memory_profile_test: openssl_dep_error
13635
+ $(BINDIR)/$(CONFIG)/memory_usage_test: openssl_dep_error
13550
13636
 
13551
13637
  else
13552
13638
 
13553
13639
 
13554
13640
 
13555
- $(BINDIR)/$(CONFIG)/memory_profile_test: $(MEMORY_PROFILE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
13641
+ $(BINDIR)/$(CONFIG)/memory_usage_test: $(MEMORY_USAGE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
13556
13642
  $(E) "[LD] Linking $@"
13557
13643
  $(Q) mkdir -p `dirname $@`
13558
- $(Q) $(LD) $(LDFLAGS) $(MEMORY_PROFILE_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)/memory_profile_test
13644
+ $(Q) $(LD) $(LDFLAGS) $(MEMORY_USAGE_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)/memory_usage_test
13559
13645
 
13560
13646
  endif
13561
13647
 
13562
13648
  $(OBJDIR)/$(CONFIG)/test/core/memory_usage/memory_usage_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
13563
13649
 
13564
- deps_memory_profile_test: $(MEMORY_PROFILE_TEST_OBJS:.o=.dep)
13650
+ deps_memory_usage_test: $(MEMORY_USAGE_TEST_OBJS:.o=.dep)
13565
13651
 
13566
13652
  ifneq ($(NO_SECURE),true)
13567
13653
  ifneq ($(NO_DEPS),true)
13568
- -include $(MEMORY_PROFILE_TEST_OBJS:.o=.dep)
13654
+ -include $(MEMORY_USAGE_TEST_OBJS:.o=.dep)
13569
13655
  endif
13570
13656
  endif
13571
13657
 
@@ -17239,6 +17325,52 @@ endif
17239
17325
  endif
17240
17326
 
17241
17327
 
17328
+ CLIENT_INTERCEPTORS_END2END_TEST_SRC = \
17329
+ test/cpp/end2end/client_interceptors_end2end_test.cc \
17330
+ test/cpp/end2end/interceptors_util.cc \
17331
+
17332
+ CLIENT_INTERCEPTORS_END2END_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CLIENT_INTERCEPTORS_END2END_TEST_SRC))))
17333
+ ifeq ($(NO_SECURE),true)
17334
+
17335
+ # You can't build secure targets if you don't have OpenSSL.
17336
+
17337
+ $(BINDIR)/$(CONFIG)/client_interceptors_end2end_test: openssl_dep_error
17338
+
17339
+ else
17340
+
17341
+
17342
+
17343
+
17344
+ ifeq ($(NO_PROTOBUF),true)
17345
+
17346
+ # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+.
17347
+
17348
+ $(BINDIR)/$(CONFIG)/client_interceptors_end2end_test: protobuf_dep_error
17349
+
17350
+ else
17351
+
17352
+ $(BINDIR)/$(CONFIG)/client_interceptors_end2end_test: $(PROTOBUF_DEP) $(CLIENT_INTERCEPTORS_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
17353
+ $(E) "[LD] Linking $@"
17354
+ $(Q) mkdir -p `dirname $@`
17355
+ $(Q) $(LDXX) $(LDFLAGS) $(CLIENT_INTERCEPTORS_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/client_interceptors_end2end_test
17356
+
17357
+ endif
17358
+
17359
+ endif
17360
+
17361
+ $(OBJDIR)/$(CONFIG)/test/cpp/end2end/client_interceptors_end2end_test.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
17362
+
17363
+ $(OBJDIR)/$(CONFIG)/test/cpp/end2end/interceptors_util.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
17364
+
17365
+ deps_client_interceptors_end2end_test: $(CLIENT_INTERCEPTORS_END2END_TEST_OBJS:.o=.dep)
17366
+
17367
+ ifneq ($(NO_SECURE),true)
17368
+ ifneq ($(NO_DEPS),true)
17369
+ -include $(CLIENT_INTERCEPTORS_END2END_TEST_OBJS:.o=.dep)
17370
+ endif
17371
+ endif
17372
+
17373
+
17242
17374
  CLIENT_LB_END2END_TEST_SRC = \
17243
17375
  test/cpp/end2end/client_lb_end2end_test.cc \
17244
17376
 
@@ -17633,6 +17765,7 @@ endif
17633
17765
 
17634
17766
  END2END_TEST_SRC = \
17635
17767
  test/cpp/end2end/end2end_test.cc \
17768
+ test/cpp/end2end/interceptors_util.cc \
17636
17769
 
17637
17770
  END2END_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(END2END_TEST_SRC))))
17638
17771
  ifeq ($(NO_SECURE),true)
@@ -17665,6 +17798,8 @@ endif
17665
17798
 
17666
17799
  $(OBJDIR)/$(CONFIG)/test/cpp/end2end/end2end_test.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
17667
17800
 
17801
+ $(OBJDIR)/$(CONFIG)/test/cpp/end2end/interceptors_util.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
17802
+
17668
17803
  deps_end2end_test: $(END2END_TEST_OBJS:.o=.dep)
17669
17804
 
17670
17805
  ifneq ($(NO_SECURE),true)
@@ -20024,6 +20159,52 @@ endif
20024
20159
  endif
20025
20160
 
20026
20161
 
20162
+ SERVER_INTERCEPTORS_END2END_TEST_SRC = \
20163
+ test/cpp/end2end/interceptors_util.cc \
20164
+ test/cpp/end2end/server_interceptors_end2end_test.cc \
20165
+
20166
+ SERVER_INTERCEPTORS_END2END_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(SERVER_INTERCEPTORS_END2END_TEST_SRC))))
20167
+ ifeq ($(NO_SECURE),true)
20168
+
20169
+ # You can't build secure targets if you don't have OpenSSL.
20170
+
20171
+ $(BINDIR)/$(CONFIG)/server_interceptors_end2end_test: openssl_dep_error
20172
+
20173
+ else
20174
+
20175
+
20176
+
20177
+
20178
+ ifeq ($(NO_PROTOBUF),true)
20179
+
20180
+ # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.5.0+.
20181
+
20182
+ $(BINDIR)/$(CONFIG)/server_interceptors_end2end_test: protobuf_dep_error
20183
+
20184
+ else
20185
+
20186
+ $(BINDIR)/$(CONFIG)/server_interceptors_end2end_test: $(PROTOBUF_DEP) $(SERVER_INTERCEPTORS_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
20187
+ $(E) "[LD] Linking $@"
20188
+ $(Q) mkdir -p `dirname $@`
20189
+ $(Q) $(LDXX) $(LDFLAGS) $(SERVER_INTERCEPTORS_END2END_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/server_interceptors_end2end_test
20190
+
20191
+ endif
20192
+
20193
+ endif
20194
+
20195
+ $(OBJDIR)/$(CONFIG)/test/cpp/end2end/interceptors_util.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
20196
+
20197
+ $(OBJDIR)/$(CONFIG)/test/cpp/end2end/server_interceptors_end2end_test.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
20198
+
20199
+ deps_server_interceptors_end2end_test: $(SERVER_INTERCEPTORS_END2END_TEST_OBJS:.o=.dep)
20200
+
20201
+ ifneq ($(NO_SECURE),true)
20202
+ ifneq ($(NO_DEPS),true)
20203
+ -include $(SERVER_INTERCEPTORS_END2END_TEST_OBJS:.o=.dep)
20204
+ endif
20205
+ endif
20206
+
20207
+
20027
20208
  SERVER_REQUEST_CALL_TEST_SRC = \
20028
20209
  $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc \
20029
20210
  $(GENDIR)/src/proto/grpc/testing/echo.pb.cc $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc \
@@ -23982,26 +24163,6 @@ ifneq ($(NO_DEPS),true)
23982
24163
  endif
23983
24164
 
23984
24165
 
23985
- INPROC_NOSEC_TEST_SRC = \
23986
- test/core/end2end/fixtures/inproc.cc \
23987
-
23988
- INPROC_NOSEC_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(INPROC_NOSEC_TEST_SRC))))
23989
-
23990
-
23991
- $(BINDIR)/$(CONFIG)/inproc_nosec_test: $(INPROC_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
23992
- $(E) "[LD] Linking $@"
23993
- $(Q) mkdir -p `dirname $@`
23994
- $(Q) $(LD) $(LDFLAGS) $(INPROC_NOSEC_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) -o $(BINDIR)/$(CONFIG)/inproc_nosec_test
23995
-
23996
- $(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/inproc.o: $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libgrpc_unsecure.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
23997
-
23998
- deps_inproc_nosec_test: $(INPROC_NOSEC_TEST_OBJS:.o=.dep)
23999
-
24000
- ifneq ($(NO_DEPS),true)
24001
- -include $(INPROC_NOSEC_TEST_OBJS:.o=.dep)
24002
- endif
24003
-
24004
-
24005
24166
  RESOLVER_COMPONENT_TEST_UNSECURE_SRC = \
24006
24167
  test/cpp/naming/resolver_component_test.cc \
24007
24168
 
@@ -24802,6 +24963,7 @@ ifneq ($(OPENSSL_DEP),)
24802
24963
  # installing headers to their final destination on the drive. We need this
24803
24964
  # otherwise parallel compilation will fail if a source is compiled first.
24804
24965
  src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc: $(OPENSSL_DEP)
24966
+ src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_secure.cc: $(OPENSSL_DEP)
24805
24967
  src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc: $(OPENSSL_DEP)
24806
24968
  src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc: $(OPENSSL_DEP)
24807
24969
  src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc: $(OPENSSL_DEP)
@@ -24831,11 +24993,14 @@ src/core/lib/security/credentials/local/local_credentials.cc: $(OPENSSL_DEP)
24831
24993
  src/core/lib/security/credentials/oauth2/oauth2_credentials.cc: $(OPENSSL_DEP)
24832
24994
  src/core/lib/security/credentials/plugin/plugin_credentials.cc: $(OPENSSL_DEP)
24833
24995
  src/core/lib/security/credentials/ssl/ssl_credentials.cc: $(OPENSSL_DEP)
24834
- src/core/lib/security/security_connector/alts_security_connector.cc: $(OPENSSL_DEP)
24996
+ src/core/lib/security/security_connector/alts/alts_security_connector.cc: $(OPENSSL_DEP)
24997
+ src/core/lib/security/security_connector/fake/fake_security_connector.cc: $(OPENSSL_DEP)
24835
24998
  src/core/lib/security/security_connector/load_system_roots_fallback.cc: $(OPENSSL_DEP)
24836
24999
  src/core/lib/security/security_connector/load_system_roots_linux.cc: $(OPENSSL_DEP)
24837
- src/core/lib/security/security_connector/local_security_connector.cc: $(OPENSSL_DEP)
25000
+ src/core/lib/security/security_connector/local/local_security_connector.cc: $(OPENSSL_DEP)
24838
25001
  src/core/lib/security/security_connector/security_connector.cc: $(OPENSSL_DEP)
25002
+ src/core/lib/security/security_connector/ssl/ssl_security_connector.cc: $(OPENSSL_DEP)
25003
+ src/core/lib/security/security_connector/ssl_utils.cc: $(OPENSSL_DEP)
24839
25004
  src/core/lib/security/transport/client_auth_filter.cc: $(OPENSSL_DEP)
24840
25005
  src/core/lib/security/transport/secure_endpoint.cc: $(OPENSSL_DEP)
24841
25006
  src/core/lib/security/transport/security_handshaker.cc: $(OPENSSL_DEP)
@@ -24858,7 +25023,7 @@ src/core/tsi/alts/frame_protector/frame_handler.cc: $(OPENSSL_DEP)
24858
25023
  src/core/tsi/alts/handshaker/alts_handshaker_client.cc: $(OPENSSL_DEP)
24859
25024
  src/core/tsi/alts/handshaker/alts_handshaker_service_api.cc: $(OPENSSL_DEP)
24860
25025
  src/core/tsi/alts/handshaker/alts_handshaker_service_api_util.cc: $(OPENSSL_DEP)
24861
- src/core/tsi/alts/handshaker/alts_tsi_event.cc: $(OPENSSL_DEP)
25026
+ src/core/tsi/alts/handshaker/alts_shared_resource.cc: $(OPENSSL_DEP)
24862
25027
  src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc: $(OPENSSL_DEP)
24863
25028
  src/core/tsi/alts/handshaker/alts_tsi_utils.cc: $(OPENSSL_DEP)
24864
25029
  src/core/tsi/alts/handshaker/altscontext.pb.c: $(OPENSSL_DEP)
@@ -24870,7 +25035,6 @@ src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_p
24870
25035
  src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc: $(OPENSSL_DEP)
24871
25036
  src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc: $(OPENSSL_DEP)
24872
25037
  src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc: $(OPENSSL_DEP)
24873
- src/core/tsi/alts_transport_security.cc: $(OPENSSL_DEP)
24874
25038
  src/core/tsi/fake_transport_security.cc: $(OPENSSL_DEP)
24875
25039
  src/core/tsi/local_transport_security.cc: $(OPENSSL_DEP)
24876
25040
  src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc: $(OPENSSL_DEP)
@@ -24917,6 +25081,7 @@ test/cpp/interop/server_helper.cc: $(OPENSSL_DEP)
24917
25081
  test/cpp/microbenchmarks/helpers.cc: $(OPENSSL_DEP)
24918
25082
  test/cpp/qps/benchmark_config.cc: $(OPENSSL_DEP)
24919
25083
  test/cpp/qps/client_async.cc: $(OPENSSL_DEP)
25084
+ test/cpp/qps/client_callback.cc: $(OPENSSL_DEP)
24920
25085
  test/cpp/qps/client_sync.cc: $(OPENSSL_DEP)
24921
25086
  test/cpp/qps/driver.cc: $(OPENSSL_DEP)
24922
25087
  test/cpp/qps/parse_json.cc: $(OPENSSL_DEP)
@@ -24924,6 +25089,7 @@ test/cpp/qps/qps_server_builder.cc: $(OPENSSL_DEP)
24924
25089
  test/cpp/qps/qps_worker.cc: $(OPENSSL_DEP)
24925
25090
  test/cpp/qps/report.cc: $(OPENSSL_DEP)
24926
25091
  test/cpp/qps/server_async.cc: $(OPENSSL_DEP)
25092
+ test/cpp/qps/server_callback.cc: $(OPENSSL_DEP)
24927
25093
  test/cpp/qps/server_sync.cc: $(OPENSSL_DEP)
24928
25094
  test/cpp/qps/usage_timer.cc: $(OPENSSL_DEP)
24929
25095
  test/cpp/util/byte_buffer_proto_helper.cc: $(OPENSSL_DEP)