diff options
author | 2015-04-11 01:27:32 +0200 | |
---|---|---|
committer | 2015-04-11 01:53:09 +0200 | |
commit | b7c2035e83a9b3e346f1fd37f9ad55c2070fb02e (patch) | |
tree | 6d4703d352f4f3204415d6785df52320d3d14a9b /src/cpp/client/secure_credentials.cc | |
parent | 27a0dc0208e90b6463049df16da6c35216eab0aa (diff) | |
parent | 05f2d9f8267d69bfeb60f52446385a1955eddd93 (diff) |
Merge branch 'master' of https://github.com/grpc/grpc into the-purge-2
Conflicts:
test/cpp/end2end/async_end2end_test.cc
test/cpp/end2end/end2end_test.cc
test/cpp/interop/client.cc
Diffstat (limited to 'src/cpp/client/secure_credentials.cc')
-rw-r--r-- | src/cpp/client/secure_credentials.cc | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc index 85785ed275..9e83ac8dcd 100644 --- a/src/cpp/client/secure_credentials.cc +++ b/src/cpp/client/secure_credentials.cc @@ -31,38 +31,23 @@ * */ -#include <grpc/grpc_security.h> #include <grpc/support/log.h> #include <grpc++/channel_arguments.h> -#include <grpc++/config.h> -#include <grpc++/credentials.h> #include "src/cpp/client/channel.h" +#include "src/cpp/client/secure_credentials.h" namespace grpc { -class SecureCredentials GRPC_FINAL : public Credentials { - public: - explicit SecureCredentials(grpc_credentials* c_creds) : c_creds_(c_creds) {} - ~SecureCredentials() GRPC_OVERRIDE { grpc_credentials_release(c_creds_); } - grpc_credentials* GetRawCreds() { return c_creds_; } - - std::shared_ptr<grpc::ChannelInterface> CreateChannel( - const string& target, const grpc::ChannelArguments& args) GRPC_OVERRIDE { - grpc_channel_args channel_args; - args.SetChannelArgs(&channel_args); - return std::shared_ptr<ChannelInterface>(new Channel( - args.GetSslTargetNameOverride().empty() - ? target - : args.GetSslTargetNameOverride(), - grpc_secure_channel_create(c_creds_, target.c_str(), &channel_args))); - } - - SecureCredentials* AsSecureCredentials() GRPC_OVERRIDE { return this; } - - private: - grpc_credentials* const c_creds_; -}; +std::shared_ptr<grpc::ChannelInterface> SecureCredentials::CreateChannel( + const string& target, const grpc::ChannelArguments& args) { + grpc_channel_args channel_args; + args.SetChannelArgs(&channel_args); + return std::shared_ptr<ChannelInterface>(new Channel( + args.GetSslTargetNameOverride().empty() ? target + : args.GetSslTargetNameOverride(), + grpc_secure_channel_create(c_creds_, target.c_str(), &channel_args))); +} namespace { std::unique_ptr<Credentials> WrapCredentials(grpc_credentials* creds) { |