grpc 1.24.0 → 1.25.0.pre1

data/src/core/lib/transport/static_metadata.h

@@ -36,7 +36,7 @@
 static_assert(
     std::is_trivially_destructible<grpc_core::StaticMetadataSlice>::value,
     "grpc_core::StaticMetadataSlice must be trivially destructible.");
-#define GRPC_STATIC_MDSTR_COUNT 109
+#define GRPC_STATIC_MDSTR_COUNT 108
 
 void grpc_init_static_metadata_ctx(void);
 void grpc_destroy_static_metadata_ctx(void);
@@ -132,157 +132,154 @@ inline const grpc_core::StaticMetadataSlice* grpc_static_slice_table() {
 /* "/envoy.service.load_stats.v2.LoadReportingService/StreamLoadStats" */
 #define GRPC_MDSTR_SLASH_ENVOY_DOT_SERVICE_DOT_LOAD_STATS_DOT_V2_DOT_LOADREPORTINGSERVICE_SLASH_STREAMLOADSTATS \
   (grpc_static_slice_table()[35])
-/* "/envoy.api.v2.EndpointDiscoveryService/StreamEndpoints" */
-#define GRPC_MDSTR_SLASH_ENVOY_DOT_API_DOT_V2_DOT_ENDPOINTDISCOVERYSERVICE_SLASH_STREAMENDPOINTS \
-  (grpc_static_slice_table()[36])
 /* "/grpc.health.v1.Health/Watch" */
 #define GRPC_MDSTR_SLASH_GRPC_DOT_HEALTH_DOT_V1_DOT_HEALTH_SLASH_WATCH \
-  (grpc_static_slice_table()[37])
+  (grpc_static_slice_table()[36])
 /* "/envoy.service.discovery.v2.AggregatedDiscoveryService/StreamAggregatedResources"
  */
 #define GRPC_MDSTR_SLASH_ENVOY_DOT_SERVICE_DOT_DISCOVERY_DOT_V2_DOT_AGGREGATEDDISCOVERYSERVICE_SLASH_STREAMAGGREGATEDRESOURCES \
-  (grpc_static_slice_table()[38])
+  (grpc_static_slice_table()[37])
 /* "deflate" */
-#define GRPC_MDSTR_DEFLATE (grpc_static_slice_table()[39])
+#define GRPC_MDSTR_DEFLATE (grpc_static_slice_table()[38])
 /* "gzip" */
-#define GRPC_MDSTR_GZIP (grpc_static_slice_table()[40])
+#define GRPC_MDSTR_GZIP (grpc_static_slice_table()[39])
 /* "stream/gzip" */
-#define GRPC_MDSTR_STREAM_SLASH_GZIP (grpc_static_slice_table()[41])
+#define GRPC_MDSTR_STREAM_SLASH_GZIP (grpc_static_slice_table()[40])
 /* "GET" */
-#define GRPC_MDSTR_GET (grpc_static_slice_table()[42])
+#define GRPC_MDSTR_GET (grpc_static_slice_table()[41])
 /* "POST" */
-#define GRPC_MDSTR_POST (grpc_static_slice_table()[43])
+#define GRPC_MDSTR_POST (grpc_static_slice_table()[42])
 /* "/" */
-#define GRPC_MDSTR_SLASH (grpc_static_slice_table()[44])
+#define GRPC_MDSTR_SLASH (grpc_static_slice_table()[43])
 /* "/index.html" */
-#define GRPC_MDSTR_SLASH_INDEX_DOT_HTML (grpc_static_slice_table()[45])
+#define GRPC_MDSTR_SLASH_INDEX_DOT_HTML (grpc_static_slice_table()[44])
 /* "http" */
-#define GRPC_MDSTR_HTTP (grpc_static_slice_table()[46])
+#define GRPC_MDSTR_HTTP (grpc_static_slice_table()[45])
 /* "https" */
-#define GRPC_MDSTR_HTTPS (grpc_static_slice_table()[47])
+#define GRPC_MDSTR_HTTPS (grpc_static_slice_table()[46])
 /* "200" */
-#define GRPC_MDSTR_200 (grpc_static_slice_table()[48])
+#define GRPC_MDSTR_200 (grpc_static_slice_table()[47])
 /* "204" */
-#define GRPC_MDSTR_204 (grpc_static_slice_table()[49])
+#define GRPC_MDSTR_204 (grpc_static_slice_table()[48])
 /* "206" */
-#define GRPC_MDSTR_206 (grpc_static_slice_table()[50])
+#define GRPC_MDSTR_206 (grpc_static_slice_table()[49])
 /* "304" */
-#define GRPC_MDSTR_304 (grpc_static_slice_table()[51])
+#define GRPC_MDSTR_304 (grpc_static_slice_table()[50])
 /* "400" */
-#define GRPC_MDSTR_400 (grpc_static_slice_table()[52])
+#define GRPC_MDSTR_400 (grpc_static_slice_table()[51])
 /* "404" */
-#define GRPC_MDSTR_404 (grpc_static_slice_table()[53])
+#define GRPC_MDSTR_404 (grpc_static_slice_table()[52])
 /* "500" */
-#define GRPC_MDSTR_500 (grpc_static_slice_table()[54])
+#define GRPC_MDSTR_500 (grpc_static_slice_table()[53])
 /* "accept-charset" */
-#define GRPC_MDSTR_ACCEPT_CHARSET (grpc_static_slice_table()[55])
+#define GRPC_MDSTR_ACCEPT_CHARSET (grpc_static_slice_table()[54])
 /* "gzip, deflate" */
-#define GRPC_MDSTR_GZIP_COMMA_DEFLATE (grpc_static_slice_table()[56])
+#define GRPC_MDSTR_GZIP_COMMA_DEFLATE (grpc_static_slice_table()[55])
 /* "accept-language" */
-#define GRPC_MDSTR_ACCEPT_LANGUAGE (grpc_static_slice_table()[57])
+#define GRPC_MDSTR_ACCEPT_LANGUAGE (grpc_static_slice_table()[56])
 /* "accept-ranges" */
-#define GRPC_MDSTR_ACCEPT_RANGES (grpc_static_slice_table()[58])
+#define GRPC_MDSTR_ACCEPT_RANGES (grpc_static_slice_table()[57])
 /* "accept" */
-#define GRPC_MDSTR_ACCEPT (grpc_static_slice_table()[59])
+#define GRPC_MDSTR_ACCEPT (grpc_static_slice_table()[58])
 /* "access-control-allow-origin" */
-#define GRPC_MDSTR_ACCESS_CONTROL_ALLOW_ORIGIN (grpc_static_slice_table()[60])
+#define GRPC_MDSTR_ACCESS_CONTROL_ALLOW_ORIGIN (grpc_static_slice_table()[59])
 /* "age" */
-#define GRPC_MDSTR_AGE (grpc_static_slice_table()[61])
+#define GRPC_MDSTR_AGE (grpc_static_slice_table()[60])
 /* "allow" */
-#define GRPC_MDSTR_ALLOW (grpc_static_slice_table()[62])
+#define GRPC_MDSTR_ALLOW (grpc_static_slice_table()[61])
 /* "authorization" */
-#define GRPC_MDSTR_AUTHORIZATION (grpc_static_slice_table()[63])
+#define GRPC_MDSTR_AUTHORIZATION (grpc_static_slice_table()[62])
 /* "cache-control" */
-#define GRPC_MDSTR_CACHE_CONTROL (grpc_static_slice_table()[64])
+#define GRPC_MDSTR_CACHE_CONTROL (grpc_static_slice_table()[63])
 /* "content-disposition" */
-#define GRPC_MDSTR_CONTENT_DISPOSITION (grpc_static_slice_table()[65])
+#define GRPC_MDSTR_CONTENT_DISPOSITION (grpc_static_slice_table()[64])
 /* "content-language" */
-#define GRPC_MDSTR_CONTENT_LANGUAGE (grpc_static_slice_table()[66])
+#define GRPC_MDSTR_CONTENT_LANGUAGE (grpc_static_slice_table()[65])
 /* "content-length" */
-#define GRPC_MDSTR_CONTENT_LENGTH (grpc_static_slice_table()[67])
+#define GRPC_MDSTR_CONTENT_LENGTH (grpc_static_slice_table()[66])
 /* "content-location" */
-#define GRPC_MDSTR_CONTENT_LOCATION (grpc_static_slice_table()[68])
+#define GRPC_MDSTR_CONTENT_LOCATION (grpc_static_slice_table()[67])
 /* "content-range" */
-#define GRPC_MDSTR_CONTENT_RANGE (grpc_static_slice_table()[69])
+#define GRPC_MDSTR_CONTENT_RANGE (grpc_static_slice_table()[68])
 /* "cookie" */
-#define GRPC_MDSTR_COOKIE (grpc_static_slice_table()[70])
+#define GRPC_MDSTR_COOKIE (grpc_static_slice_table()[69])
 /* "date" */
-#define GRPC_MDSTR_DATE (grpc_static_slice_table()[71])
+#define GRPC_MDSTR_DATE (grpc_static_slice_table()[70])
 /* "etag" */
-#define GRPC_MDSTR_ETAG (grpc_static_slice_table()[72])
+#define GRPC_MDSTR_ETAG (grpc_static_slice_table()[71])
 /* "expect" */
-#define GRPC_MDSTR_EXPECT (grpc_static_slice_table()[73])
+#define GRPC_MDSTR_EXPECT (grpc_static_slice_table()[72])
 /* "expires" */
-#define GRPC_MDSTR_EXPIRES (grpc_static_slice_table()[74])
+#define GRPC_MDSTR_EXPIRES (grpc_static_slice_table()[73])
 /* "from" */
-#define GRPC_MDSTR_FROM (grpc_static_slice_table()[75])
+#define GRPC_MDSTR_FROM (grpc_static_slice_table()[74])
 /* "if-match" */
-#define GRPC_MDSTR_IF_MATCH (grpc_static_slice_table()[76])
+#define GRPC_MDSTR_IF_MATCH (grpc_static_slice_table()[75])
 /* "if-modified-since" */
-#define GRPC_MDSTR_IF_MODIFIED_SINCE (grpc_static_slice_table()[77])
+#define GRPC_MDSTR_IF_MODIFIED_SINCE (grpc_static_slice_table()[76])
 /* "if-none-match" */
-#define GRPC_MDSTR_IF_NONE_MATCH (grpc_static_slice_table()[78])
+#define GRPC_MDSTR_IF_NONE_MATCH (grpc_static_slice_table()[77])
 /* "if-range" */
-#define GRPC_MDSTR_IF_RANGE (grpc_static_slice_table()[79])
+#define GRPC_MDSTR_IF_RANGE (grpc_static_slice_table()[78])
 /* "if-unmodified-since" */
-#define GRPC_MDSTR_IF_UNMODIFIED_SINCE (grpc_static_slice_table()[80])
+#define GRPC_MDSTR_IF_UNMODIFIED_SINCE (grpc_static_slice_table()[79])
 /* "last-modified" */
-#define GRPC_MDSTR_LAST_MODIFIED (grpc_static_slice_table()[81])
+#define GRPC_MDSTR_LAST_MODIFIED (grpc_static_slice_table()[80])
 /* "link" */
-#define GRPC_MDSTR_LINK (grpc_static_slice_table()[82])
+#define GRPC_MDSTR_LINK (grpc_static_slice_table()[81])
 /* "location" */
-#define GRPC_MDSTR_LOCATION (grpc_static_slice_table()[83])
+#define GRPC_MDSTR_LOCATION (grpc_static_slice_table()[82])
 /* "max-forwards" */
-#define GRPC_MDSTR_MAX_FORWARDS (grpc_static_slice_table()[84])
+#define GRPC_MDSTR_MAX_FORWARDS (grpc_static_slice_table()[83])
 /* "proxy-authenticate" */
-#define GRPC_MDSTR_PROXY_AUTHENTICATE (grpc_static_slice_table()[85])
+#define GRPC_MDSTR_PROXY_AUTHENTICATE (grpc_static_slice_table()[84])
 /* "proxy-authorization" */
-#define GRPC_MDSTR_PROXY_AUTHORIZATION (grpc_static_slice_table()[86])
+#define GRPC_MDSTR_PROXY_AUTHORIZATION (grpc_static_slice_table()[85])
 /* "range" */
-#define GRPC_MDSTR_RANGE (grpc_static_slice_table()[87])
+#define GRPC_MDSTR_RANGE (grpc_static_slice_table()[86])
 /* "referer" */
-#define GRPC_MDSTR_REFERER (grpc_static_slice_table()[88])
+#define GRPC_MDSTR_REFERER (grpc_static_slice_table()[87])
 /* "refresh" */
-#define GRPC_MDSTR_REFRESH (grpc_static_slice_table()[89])
+#define GRPC_MDSTR_REFRESH (grpc_static_slice_table()[88])
 /* "retry-after" */
-#define GRPC_MDSTR_RETRY_AFTER (grpc_static_slice_table()[90])
+#define GRPC_MDSTR_RETRY_AFTER (grpc_static_slice_table()[89])
 /* "server" */
-#define GRPC_MDSTR_SERVER (grpc_static_slice_table()[91])
+#define GRPC_MDSTR_SERVER (grpc_static_slice_table()[90])
 /* "set-cookie" */
-#define GRPC_MDSTR_SET_COOKIE (grpc_static_slice_table()[92])
+#define GRPC_MDSTR_SET_COOKIE (grpc_static_slice_table()[91])
 /* "strict-transport-security" */
-#define GRPC_MDSTR_STRICT_TRANSPORT_SECURITY (grpc_static_slice_table()[93])
+#define GRPC_MDSTR_STRICT_TRANSPORT_SECURITY (grpc_static_slice_table()[92])
 /* "transfer-encoding" */
-#define GRPC_MDSTR_TRANSFER_ENCODING (grpc_static_slice_table()[94])
+#define GRPC_MDSTR_TRANSFER_ENCODING (grpc_static_slice_table()[93])
 /* "vary" */
-#define GRPC_MDSTR_VARY (grpc_static_slice_table()[95])
+#define GRPC_MDSTR_VARY (grpc_static_slice_table()[94])
 /* "via" */
-#define GRPC_MDSTR_VIA (grpc_static_slice_table()[96])
+#define GRPC_MDSTR_VIA (grpc_static_slice_table()[95])
 /* "www-authenticate" */
-#define GRPC_MDSTR_WWW_AUTHENTICATE (grpc_static_slice_table()[97])
+#define GRPC_MDSTR_WWW_AUTHENTICATE (grpc_static_slice_table()[96])
 /* "0" */
-#define GRPC_MDSTR_0 (grpc_static_slice_table()[98])
+#define GRPC_MDSTR_0 (grpc_static_slice_table()[97])
 /* "identity" */
-#define GRPC_MDSTR_IDENTITY (grpc_static_slice_table()[99])
+#define GRPC_MDSTR_IDENTITY (grpc_static_slice_table()[98])
 /* "trailers" */
-#define GRPC_MDSTR_TRAILERS (grpc_static_slice_table()[100])
+#define GRPC_MDSTR_TRAILERS (grpc_static_slice_table()[99])
 /* "application/grpc" */
-#define GRPC_MDSTR_APPLICATION_SLASH_GRPC (grpc_static_slice_table()[101])
+#define GRPC_MDSTR_APPLICATION_SLASH_GRPC (grpc_static_slice_table()[100])
 /* "grpc" */
-#define GRPC_MDSTR_GRPC (grpc_static_slice_table()[102])
+#define GRPC_MDSTR_GRPC (grpc_static_slice_table()[101])
 /* "PUT" */
-#define GRPC_MDSTR_PUT (grpc_static_slice_table()[103])
+#define GRPC_MDSTR_PUT (grpc_static_slice_table()[102])
 /* "lb-cost-bin" */
-#define GRPC_MDSTR_LB_COST_BIN (grpc_static_slice_table()[104])
+#define GRPC_MDSTR_LB_COST_BIN (grpc_static_slice_table()[103])
 /* "identity,deflate" */
-#define GRPC_MDSTR_IDENTITY_COMMA_DEFLATE (grpc_static_slice_table()[105])
+#define GRPC_MDSTR_IDENTITY_COMMA_DEFLATE (grpc_static_slice_table()[104])
 /* "identity,gzip" */
-#define GRPC_MDSTR_IDENTITY_COMMA_GZIP (grpc_static_slice_table()[106])
+#define GRPC_MDSTR_IDENTITY_COMMA_GZIP (grpc_static_slice_table()[105])
 /* "deflate,gzip" */
-#define GRPC_MDSTR_DEFLATE_COMMA_GZIP (grpc_static_slice_table()[107])
+#define GRPC_MDSTR_DEFLATE_COMMA_GZIP (grpc_static_slice_table()[106])
 /* "identity,deflate,gzip" */
 #define GRPC_MDSTR_IDENTITY_COMMA_DEFLATE_COMMA_GZIP \
-  (grpc_static_slice_table()[108])
+  (grpc_static_slice_table()[107])
 
 namespace grpc_core {
 struct StaticSliceRefcount;

data/src/core/lib/transport/status_conversion.cc

@@ -97,4 +97,4 @@ grpc_status_code grpc_http2_status_to_grpc_status(int status) {
   }
 }
 
-int grpc_status_to_http2_status(grpc_status_code status) { return 200; }
+int grpc_status_to_http2_status(grpc_status_code /*status*/) { return 200; }

data/src/core/lib/transport/status_metadata.cc

@@ -28,7 +28,7 @@
    */
 #define STATUS_OFFSET 1
 
-static void destroy_status(void* ignored) {}
+static void destroy_status(void* /*ignored*/) {}
 
 grpc_status_code grpc_get_status_code_from_metadata(grpc_mdelem md) {
   if (grpc_mdelem_static_value_eq(md, GRPC_MDELEM_GRPC_STATUS_0)) {

data/src/core/lib/transport/transport.cc

@@ -80,12 +80,12 @@ grpc_slice grpc_slice_from_stream_owned_buffer(grpc_stream_refcount* refcount,
 }
 
 #ifndef NDEBUG
-void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs,
+void grpc_stream_ref_init(grpc_stream_refcount* refcount, int /*initial_refs*/,
                           grpc_iomgr_cb_func cb, void* cb_arg,
                           const char* object_type) {
   refcount->object_type = object_type;
 #else
-void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs,
+void grpc_stream_ref_init(grpc_stream_refcount* refcount, int /*initial_refs*/,
                           grpc_iomgr_cb_func cb, void* cb_arg) {
 #endif
   GRPC_CLOSURE_INIT(&refcount->destroy, cb, cb_arg, grpc_schedule_on_exec_ctx);

data/src/core/lib/transport/transport.h

@@ -25,6 +25,7 @@
 
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/gprpp/arena.h"
+#include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/iomgr/call_combiner.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/polling_entity.h"
@@ -32,6 +33,7 @@
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/transport/byte_stream.h"
+#include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/metadata_batch.h"
 
 /* Minimum and maximum protocol accepted versions. */
@@ -70,7 +72,10 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs,
 void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs,
                           grpc_iomgr_cb_func cb, void* cb_arg);
 #define GRPC_STREAM_REF_INIT(rc, ir, cb, cb_arg, objtype) \
-  grpc_stream_ref_init(rc, ir, cb, cb_arg)
+  do {                                                    \
+    grpc_stream_ref_init(rc, ir, cb, cb_arg);             \
+    (void)(objtype);                                      \
+  } while (0)
 #endif
 
 #ifndef NDEBUG
@@ -291,7 +296,7 @@ struct grpc_transport_stream_op_batch_payload {
   struct {
     grpc_metadata_batch* recv_trailing_metadata = nullptr;
     grpc_transport_stream_stats* collect_stats = nullptr;
-    /** Should be enqueued when initial metadata is ready to be processed. */
+    /** Should be enqueued when trailing metadata is ready to be processed. */
     grpc_closure* recv_trailing_metadata_ready = nullptr;
   } recv_trailing_metadata;
 
@@ -320,8 +325,11 @@ typedef struct grpc_transport_op {
   /** Called when processing of this op is done. */
   grpc_closure* on_consumed = nullptr;
   /** connectivity monitoring - set connectivity_state to NULL to unsubscribe */
-  grpc_closure* on_connectivity_state_change = nullptr;
-  grpc_connectivity_state* connectivity_state = nullptr;
+  grpc_core::OrphanablePtr<grpc_core::ConnectivityStateWatcherInterface>
+      start_connectivity_watch;
+  grpc_connectivity_state start_connectivity_watch_state = GRPC_CHANNEL_IDLE;
+  grpc_core::ConnectivityStateWatcherInterface* stop_connectivity_watch =
+      nullptr;
   /** should the transport be disconnected
    * Error contract: the transport that gets this op must cause
    *                 disconnect_with_error to be unref'ed after processing it */

data/src/core/lib/transport/transport_op_string.cc

@@ -134,19 +134,22 @@ char* grpc_transport_op_string(grpc_transport_op* op) {
   gpr_strvec b;
   gpr_strvec_init(&b);
 
-  if (op->on_connectivity_state_change != nullptr) {
+  if (op->start_connectivity_watch != nullptr) {
     if (!first) gpr_strvec_add(&b, gpr_strdup(" "));
     first = false;
-    if (op->connectivity_state != nullptr) {
-      gpr_asprintf(&tmp, "ON_CONNECTIVITY_STATE_CHANGE:p=%p:from=%s",
-                   op->on_connectivity_state_change,
-                   grpc_connectivity_state_name(*op->connectivity_state));
-      gpr_strvec_add(&b, tmp);
-    } else {
-      gpr_asprintf(&tmp, "ON_CONNECTIVITY_STATE_CHANGE:p=%p:unsubscribe",
-                   op->on_connectivity_state_change);
-      gpr_strvec_add(&b, tmp);
-    }
+    gpr_asprintf(
+        &tmp, "START_CONNECTIVITY_WATCH:watcher=%p:from=%s",
+        op->start_connectivity_watch.get(),
+        grpc_core::ConnectivityStateName(op->start_connectivity_watch_state));
+    gpr_strvec_add(&b, tmp);
+  }
+
+  if (op->stop_connectivity_watch != nullptr) {
+    if (!first) gpr_strvec_add(&b, gpr_strdup(" "));
+    first = false;
+    gpr_asprintf(&tmp, "STOP_CONNECTIVITY_WATCH:watcher=%p",
+                 op->stop_connectivity_watch);
+    gpr_strvec_add(&b, tmp);
   }
 
   if (op->disconnect_with_error != GRPC_ERROR_NONE) {

data/src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc

@@ -33,7 +33,7 @@ static void maybe_copy_error_msg(const char* src, char** dst) {
 
 /* Perform input santity check. */
 static grpc_status_code unseal_check(alts_crypter* c, const unsigned char* data,
-                                     size_t data_allocated_size,
+                                     size_t /*data_allocated_size*/,
                                      size_t data_size, size_t* output_size,
                                      char** error_details) {
   /* Do common input sanity check. */

data/src/core/tsi/alts/handshaker/alts_shared_resource.cc

@@ -30,7 +30,7 @@ alts_shared_resource_dedicated* grpc_alts_get_shared_resource_dedicated(void) {
   return &g_alts_resource_dedicated;
 }
 
-static void thread_worker(void* arg) {
+static void thread_worker(void* /*arg*/) {
   while (true) {
     grpc_event event =
         grpc_completion_queue_next(g_alts_resource_dedicated.cq,

data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc

@@ -264,18 +264,18 @@ static void on_handshaker_service_resp_recv(void* arg, grpc_error* error) {
 /* gRPC provided callback used when dedicatd CQ and thread are used.
  * It serves to safely bring the control back to application. */
 static void on_handshaker_service_resp_recv_dedicated(void* arg,
-                                                      grpc_error* error) {
+                                                      grpc_error* /*error*/) {
   alts_shared_resource_dedicated* resource =
       grpc_alts_get_shared_resource_dedicated();
   grpc_cq_end_op(resource->cq, arg, GRPC_ERROR_NONE,
-                 [](void* done_arg, grpc_cq_completion* storage) {}, nullptr,
-                 &resource->storage);
+                 [](void* /*done_arg*/, grpc_cq_completion* /*storage*/) {},
+                 nullptr, &resource->storage);
 }
 
 static tsi_result handshaker_next(
     tsi_handshaker* self, const unsigned char* received_bytes,
-    size_t received_bytes_size, const unsigned char** bytes_to_send,
-    size_t* bytes_to_send_size, tsi_handshaker_result** result,
+    size_t received_bytes_size, const unsigned char** /*bytes_to_send*/,
+    size_t* /*bytes_to_send_size*/, tsi_handshaker_result** /*result*/,
     tsi_handshaker_on_next_done_cb cb, void* user_data) {
   if (self == nullptr || cb == nullptr) {
     gpr_log(GPR_ERROR, "Invalid arguments to handshaker_next()");

data/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc

@@ -37,7 +37,7 @@
 
 constexpr size_t kMinFrameLength = 1024;
 constexpr size_t kDefaultFrameLength = 16 * 1024;
-constexpr size_t kMaxFrameLength = 1024 * 1024;
+constexpr size_t kMaxFrameLength = 16 * 1024 * 1024;
 
 /**
  * Main struct for alts_zero_copy_grpc_protector.
@@ -233,11 +233,21 @@ static void alts_zero_copy_grpc_protector_destroy(
   gpr_free(protector);
 }
 
+static tsi_result alts_zero_copy_grpc_protector_max_frame_size(
+    tsi_zero_copy_grpc_protector* self, size_t& max_frame_size) {
+  if (self == nullptr) return TSI_INVALID_ARGUMENT;
+  alts_zero_copy_grpc_protector* protector =
+      reinterpret_cast<alts_zero_copy_grpc_protector*>(self);
+  max_frame_size = protector->max_protected_frame_size;
+  return TSI_OK;
+}
+
 static const tsi_zero_copy_grpc_protector_vtable
     alts_zero_copy_grpc_protector_vtable = {
         alts_zero_copy_grpc_protector_protect,
         alts_zero_copy_grpc_protector_unprotect,
-        alts_zero_copy_grpc_protector_destroy};
+        alts_zero_copy_grpc_protector_destroy,
+        alts_zero_copy_grpc_protector_max_frame_size};
 
 tsi_result alts_zero_copy_grpc_protector_create(
     const uint8_t* key, size_t key_size, bool is_rekey, bool is_client,

data/src/core/tsi/fake_transport_security.cc

@@ -483,6 +483,7 @@ static const tsi_zero_copy_grpc_protector_vtable
         fake_zero_copy_grpc_protector_protect,
         fake_zero_copy_grpc_protector_unprotect,
         fake_zero_copy_grpc_protector_destroy,
+        nullptr /* fake_zero_copy_grpc_protector_max_frame_size */
 };
 
 /* --- tsi_handshaker_result methods implementation. ---*/
@@ -494,7 +495,7 @@ typedef struct {
 } fake_handshaker_result;
 
 static tsi_result fake_handshaker_result_extract_peer(
-    const tsi_handshaker_result* self, tsi_peer* peer) {
+    const tsi_handshaker_result* /*self*/, tsi_peer* peer) {
   /* Construct a tsi_peer with 1 property: certificate type. */
   tsi_result result = tsi_construct_peer(1, peer);
   if (result != TSI_OK) return result;
@@ -506,7 +507,8 @@ static tsi_result fake_handshaker_result_extract_peer(
 }
 
 static tsi_result fake_handshaker_result_create_zero_copy_grpc_protector(
-    const tsi_handshaker_result* self, size_t* max_output_protected_frame_size,
+    const tsi_handshaker_result* /*self*/,
+    size_t* max_output_protected_frame_size,
     tsi_zero_copy_grpc_protector** protector) {
   *protector =
       tsi_create_fake_zero_copy_grpc_protector(max_output_protected_frame_size);
@@ -514,8 +516,8 @@ static tsi_result fake_handshaker_result_create_zero_copy_grpc_protector(
 }
 
 static tsi_result fake_handshaker_result_create_frame_protector(
-    const tsi_handshaker_result* self, size_t* max_output_protected_frame_size,
-    tsi_frame_protector** protector) {
+    const tsi_handshaker_result* /*self*/,
+    size_t* max_output_protected_frame_size, tsi_frame_protector** protector) {
   *protector = tsi_create_fake_frame_protector(max_output_protected_frame_size);
   return TSI_OK;
 }
@@ -669,7 +671,7 @@ static tsi_result fake_handshaker_next(
     tsi_handshaker* self, const unsigned char* received_bytes,
     size_t received_bytes_size, const unsigned char** bytes_to_send,
     size_t* bytes_to_send_size, tsi_handshaker_result** handshaker_result,
-    tsi_handshaker_on_next_done_cb cb, void* user_data) {
+    tsi_handshaker_on_next_done_cb /*cb*/, void* /*user_data*/) {
   /* Sanity check the arguments. */
   if ((received_bytes_size > 0 && received_bytes == nullptr) ||
       bytes_to_send == nullptr || bytes_to_send_size == nullptr ||