From 59dfc90f578baedce8bbf8bb07e3e1a24ec1fb68 Mon Sep 17 00:00:00 2001 From: yangg Date: Fri, 19 Dec 2014 14:00:14 -0800 Subject: Client side implementation of creating channel with credentials. The old test_ssl_channel related code is deleted and the new create channel call is used for interop tests. Change on 2014/12/19 by yangg ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=82540921 --- src/cpp/client/channel.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/cpp/client/channel.h') diff --git a/src/cpp/client/channel.h b/src/cpp/client/channel.h index a97d35efe8..621e58539b 100644 --- a/src/cpp/client/channel.h +++ b/src/cpp/client/channel.h @@ -34,17 +34,24 @@ #ifndef __GRPCPP_INTERNAL_CLIENT_CHANNEL_H__ #define __GRPCPP_INTERNAL_CLIENT_CHANNEL_H__ +#include + #include #include struct grpc_channel; namespace grpc { +class ChannelArguments; +class Credentials; class StreamContextInterface; class Channel : public ChannelInterface { public: - explicit Channel(const grpc::string& target); + Channel(const grpc::string& target, const ChannelArguments& args); + Channel(const grpc::string& target, const std::unique_ptr& creds, + const ChannelArguments& args); + ~Channel() override; Status StartBlockingRpc(const RpcMethod& method, ClientContext* context, @@ -56,11 +63,6 @@ class Channel : public ChannelInterface { const google::protobuf::Message* request, google::protobuf::Message* result) override; - protected: - // TODO(yangg) remove this section when we have the general ssl channel API - Channel() {} - void set_c_channel(grpc_channel* channel) { c_channel_ = channel; } - private: const grpc::string target_; grpc_channel* c_channel_; // owned -- cgit v1.2.3