Merge pull request #14737 from yihuazhang/alts_proto_cleanup

Cleanup ALTS proto
pull/14731/merge
Jiangtao Li 7 years ago committed by GitHub
commit 373866da41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/core/tsi/alts/handshaker/proto/altscontext.proto
  2. 14
      src/core/tsi/alts/handshaker/proto/handshaker.proto
  3. 2
      src/core/tsi/alts/handshaker/proto/transport_security_common.proto

@ -18,7 +18,7 @@ import "transport_security_common.proto";
package grpc.gcp; package grpc.gcp;
option java_package = "io.grpc.alts"; option java_package = "io.grpc.alts.internal";
message AltsContext { message AltsContext {
// The application protocol negotiated for this connection. // The application protocol negotiated for this connection.

@ -18,7 +18,7 @@ import "transport_security_common.proto";
package grpc.gcp; package grpc.gcp;
option java_package = "io.grpc.alts"; option java_package = "io.grpc.alts.internal";
enum HandshakeProtocol { enum HandshakeProtocol {
// Default value. // Default value.
@ -85,7 +85,7 @@ message StartClientHandshakeReq {
Endpoint local_endpoint = 6; Endpoint local_endpoint = 6;
// (Optional) Endpoint information of the remote server, such as IP address, // (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; Endpoint remote_endpoint = 7;
// (Optional) If target name is provided, a secure naming check is performed // (Optional) If target name is provided, a secure naming check is performed
@ -128,7 +128,7 @@ message StartServerHandshakeReq {
Endpoint local_endpoint = 4; Endpoint local_endpoint = 4;
// (Optional) Endpoint information of the remote client, such as IP address, // (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; Endpoint remote_endpoint = 5;
// (Optional) RPC protocol versions supported by the server. // (Optional) RPC protocol versions supported by the server.
@ -212,8 +212,12 @@ message HandshakerResp {
} }
service HandshakerService { service HandshakerService {
// Accepts a stream of handshaker request, returning a stream of handshaker // Handshaker service accepts a stream of handshaker request, returning a
// response. // 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) rpc DoHandshake(stream HandshakerReq)
returns (stream HandshakerResp) { returns (stream HandshakerResp) {
} }

@ -16,7 +16,7 @@ syntax = "proto3";
package grpc.gcp; 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 // The security level of the created channel. The list is sorted in increasing
// level of security. This order must always be maintained. // level of security. This order must always be maintained.

Loading…
Cancel
Save