diff options
author | Yash Tibrewal <yashkt@google.com> | 2019-01-03 15:51:43 -0800 |
---|---|---|
committer | Yash Tibrewal <yashkt@google.com> | 2019-01-03 15:51:43 -0800 |
commit | bac79bdabe840d105be23bd97a8ca8e1aa0eae73 (patch) | |
tree | 01af879b5aaf8708afd9b57895093754822bb291 /include/grpcpp/impl/codegen/interceptor_common.h | |
parent | 5a6183f1bdf3ff0c9e29fe454fde6e187e33fcc3 (diff) | |
parent | 2dda0bb21bbe6e0914cd12fbf3ffa013111cc8a3 (diff) |
Merge branch 'master' into failhijackedsend
Diffstat (limited to 'include/grpcpp/impl/codegen/interceptor_common.h')
-rw-r--r-- | include/grpcpp/impl/codegen/interceptor_common.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/include/grpcpp/impl/codegen/interceptor_common.h b/include/grpcpp/impl/codegen/interceptor_common.h index b01706af8d..734860615f 100644 --- a/include/grpcpp/impl/codegen/interceptor_common.h +++ b/include/grpcpp/impl/codegen/interceptor_common.h @@ -79,7 +79,9 @@ class InterceptorBatchMethodsImpl hooks_[static_cast<size_t>(type)] = true; } - ByteBuffer* GetSendMessage() override { return send_message_; } + ByteBuffer* GetSerializedSendMessage() override { return send_message_; } + + const void* GetSendMessage() override { return orig_send_message_; } bool GetSendMessageStatus() override { return !*fail_send_message_; } @@ -123,8 +125,10 @@ class InterceptorBatchMethodsImpl return recv_trailing_metadata_->map(); } - void SetSendMessage(ByteBuffer* buf, bool* fail_send_message) { + void SetSendMessage(ByteBuffer* buf, const void* msg, + bool* fail_send_message) { send_message_ = buf; + orig_send_message_ = msg; fail_send_message_ = fail_send_message; } @@ -346,6 +350,7 @@ class InterceptorBatchMethodsImpl ByteBuffer* send_message_ = nullptr; bool* fail_send_message_ = nullptr; + const void* orig_send_message_ = nullptr; std::multimap<grpc::string, grpc::string>* send_initial_metadata_; @@ -391,7 +396,7 @@ class CancelInterceptorBatchMethods "Cancel notification"); } - ByteBuffer* GetSendMessage() override { + ByteBuffer* GetSerializedSendMessage() override { GPR_CODEGEN_ASSERT(false && "It is illegal to call GetSendMessage on a method which " "has a Cancel notification"); @@ -406,6 +411,14 @@ class CancelInterceptorBatchMethods return false; } + const void* GetSendMessage() override { + GPR_CODEGEN_ASSERT( + false && + "It is illegal to call GetOriginalSendMessage on a method which " + "has a Cancel notification"); + return nullptr; + } + std::multimap<grpc::string, grpc::string>* GetSendInitialMetadata() override { GPR_CODEGEN_ASSERT(false && "It is illegal to call GetSendInitialMetadata on a " |