diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2016-10-03 09:20:52 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2016-10-03 09:20:52 -0700 |
| commit | 384eea80baeb97fca5e8771607af504dee45acf2 (patch) | |
| tree | a04cfe94ae49e6bdb8d218ce6dd2a8a381a08242 /src/cpp | |
| parent | 3b2bc2deb1a249fd6d260adb50c39064ef5f9c2c (diff) | |
| parent | ecc5a40bd32a5f633d158496a0291b4081c70849 (diff) | |
Merge remote-tracking branch 'upstream/master' into rpc_mgr
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/client/create_channel_posix.cc | 10 | ||||
| -rw-r--r-- | src/cpp/ext/reflection.grpc.pb.cc | 2 | ||||
| -rw-r--r-- | src/cpp/ext/reflection.pb.cc | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/cpp/client/create_channel_posix.cc b/src/cpp/client/create_channel_posix.cc index 60cfed3d62..eb323ac50b 100644 --- a/src/cpp/client/create_channel_posix.cc +++ b/src/cpp/client/create_channel_posix.cc @@ -51,6 +51,16 @@ std::shared_ptr<Channel> CreateInsecureChannelFromFd(const grpc::string& target, "", grpc_insecure_channel_create_from_fd(target.c_str(), fd, nullptr)); } +std::shared_ptr<Channel> CreateCustomInsecureChannelFromFd( + const grpc::string& target, int fd, const ChannelArguments& args) { + internal::GrpcLibrary init_lib; + init_lib.init(); + grpc_channel_args channel_args; + args.SetChannelArgs(&channel_args); + return CreateChannelInternal("", grpc_insecure_channel_create_from_fd( + target.c_str(), fd, &channel_args)); +} + #endif // GPR_SUPPORT_CHANNELS_FROM_FD } // namespace grpc diff --git a/src/cpp/ext/reflection.grpc.pb.cc b/src/cpp/ext/reflection.grpc.pb.cc index b046dfc1b8..8139c8ea16 100644 --- a/src/cpp/ext/reflection.grpc.pb.cc +++ b/src/cpp/ext/reflection.grpc.pb.cc @@ -32,7 +32,7 @@ */ -// Generated by the gRPC protobuf plugin. +// Generated by tools/codegen/extensions/gen_reflection_proto.sh // If you make any local change, they will be lost. // source: reflection.proto diff --git a/src/cpp/ext/reflection.pb.cc b/src/cpp/ext/reflection.pb.cc index a84494f9a9..b50465b9b5 100644 --- a/src/cpp/ext/reflection.pb.cc +++ b/src/cpp/ext/reflection.pb.cc @@ -32,7 +32,7 @@ */ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by tools/codegen/extensions/gen_reflection_proto.sh // source: reflection.proto #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION |