diff options
| author |  Mark D. Roth <roth@google.com> | 2017-11-27 10:17:44 -0800 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-11-27 10:17:44 -0800 |
| commit | 5491eb7c5b0c01418b6bb28e2e704b7854962708 (patch) | |
| tree | 2cde234dd2cd96348a6f67a77365befb9c705cdc /include | |
| parent | dc8be882f7489d38c9fe1ea61cf70a349b4a9357 (diff) | |
| parent | de93112a3f70afa39d3e9aa87da165f9f737fdef (diff) | |
Merge remote-tracking branch 'upstream/master' into server_connection_timeout
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc++/impl/codegen/call.h | 1 | ||||
| -rw-r--r-- | include/grpc/impl/codegen/grpc_types.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/grpc++/impl/codegen/call.h b/include/grpc++/impl/codegen/call.h index 1a988297dc..41e95866cf 100644 --- a/include/grpc++/impl/codegen/call.h +++ b/include/grpc++/impl/codegen/call.h @@ -579,6 +579,7 @@ class CallOpClientRecvStatus { op->data.recv_status_on_client.trailing_metadata = metadata_map_->arr(); op->data.recv_status_on_client.status = &status_code_; op->data.recv_status_on_client.status_details = &error_message_; + op->data.recv_status_on_client.error_string = nullptr; op->flags = 0; op->reserved = NULL; } diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index 5cd04b3d03..73669d9e84 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -561,6 +561,10 @@ typedef struct grpc_op { grpc_metadata_array* trailing_metadata; grpc_status_code* status; grpc_slice* status_details; + /** If this is not nullptr, it will be populated with the full fidelity + * error string for debugging purposes. The application is responsible + * for freeing the data. */ + const char** error_string; } recv_status_on_client; struct grpc_op_recv_close_on_server { /** out argument, set to 1 if the call failed in any way (seen as a |