From e88b62b9748e604a3ec6f808227c4262af69676c Mon Sep 17 00:00:00 2001 From: Yihua Zhang Date: Fri, 16 Mar 2018 16:05:56 -0700 Subject: [PATCH] clean up alts proto --- .../tsi/alts/handshaker/proto/altscontext.proto | 2 +- .../tsi/alts/handshaker/proto/handshaker.proto | 14 +++++++++----- .../proto/transport_security_common.proto | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/core/tsi/alts/handshaker/proto/altscontext.proto b/src/core/tsi/alts/handshaker/proto/altscontext.proto index d195b37e08e..9a1dad5f56a 100644 --- a/src/core/tsi/alts/handshaker/proto/altscontext.proto +++ b/src/core/tsi/alts/handshaker/proto/altscontext.proto @@ -18,7 +18,7 @@ import "transport_security_common.proto"; package grpc.gcp; -option java_package = "io.grpc.alts"; +option java_package = "io.grpc.alts.internal"; message AltsContext { // The application protocol negotiated for this connection. diff --git a/src/core/tsi/alts/handshaker/proto/handshaker.proto b/src/core/tsi/alts/handshaker/proto/handshaker.proto index 46b8b09eb09..84a4153b703 100644 --- a/src/core/tsi/alts/handshaker/proto/handshaker.proto +++ b/src/core/tsi/alts/handshaker/proto/handshaker.proto @@ -18,7 +18,7 @@ import "transport_security_common.proto"; package grpc.gcp; -option java_package = "io.grpc.alts"; +option java_package = "io.grpc.alts.internal"; enum HandshakeProtocol { // Default value. @@ -85,7 +85,7 @@ message StartClientHandshakeReq { Endpoint local_endpoint = 6; // (Optional) Endpoint information of the remote server, such as IP address, - // port number, and network protocool. + // port number, and network protocol. Endpoint remote_endpoint = 7; // (Optional) If target name is provided, a secure naming check is performed @@ -128,7 +128,7 @@ message StartServerHandshakeReq { Endpoint local_endpoint = 4; // (Optional) Endpoint information of the remote client, such as IP address, - // port number, and network protocool. + // port number, and network protocol. Endpoint remote_endpoint = 5; // (Optional) RPC protocol versions supported by the server. @@ -212,8 +212,12 @@ message HandshakerResp { } service HandshakerService { - // Accepts a stream of handshaker request, returning a stream of handshaker - // response. + // Handshaker service accepts a stream of handshaker request, returning a + // stream of handshaker response. Client is expected to send exactly one + // message with either client_start or server_start followed by one or more + // messages with next. Each time client sends a request, the handshaker + // service expects to respond. Client does not have to wait for service's + // response before sending next request. rpc DoHandshake(stream HandshakerReq) returns (stream HandshakerResp) { } diff --git a/src/core/tsi/alts/handshaker/proto/transport_security_common.proto b/src/core/tsi/alts/handshaker/proto/transport_security_common.proto index 41983ab9f9e..d0f861e6446 100644 --- a/src/core/tsi/alts/handshaker/proto/transport_security_common.proto +++ b/src/core/tsi/alts/handshaker/proto/transport_security_common.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package grpc.gcp; -option java_package = "io.grpc.alts"; +option java_package = "io.grpc.alts.internal"; // The security level of the created channel. The list is sorted in increasing // level of security. This order must always be maintained.