diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-31 07:49:58 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-31 07:49:58 -0700 |
| commit | 64a12c55dfe4bdbdb65b2c508a06f4335f100a98 (patch) | |
| tree | 27210a0df4e73a44487d89dc012502fa5d992ee4 /include | |
| parent | 6169d5f7b002a68daa3eda36798cec34de11d57f (diff) | |
| parent | 6fa2ce56f3600b044d9e27897823de736e948a73 (diff) | |
Merge github.com:grpc/grpc into copyright-fix
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/grpc.h | 3 | ||||
| -rw-r--r-- | include/grpc/impl/codegen/grpc_types.h | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h index 0a03a8fba8..8b460722e2 100644 --- a/include/grpc/grpc.h +++ b/include/grpc/grpc.h @@ -297,7 +297,8 @@ GRPCAPI grpc_call_error grpc_server_request_call( Must be called before grpc_server_start. Returns NULL on failure. */ GRPCAPI void *grpc_server_register_method(grpc_server *server, - const char *method, const char *host); + const char *method, const char *host, + uint32_t flags); /** Request notification of a new pre-registered call. 'cq_for_notification' must have been registered to the server via diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index ab2d235860..b09b1cdf44 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -199,6 +199,12 @@ typedef enum grpc_call_error { /** Mask of all valid flags. */ #define GRPC_WRITE_USED_MASK (GRPC_WRITE_BUFFER_HINT | GRPC_WRITE_NO_COMPRESS) +/* Initial metadata flags */ +/** Signal that the call is idempotent */ +#define GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST (0x00000010u) +/** Mask of all valid flags */ +#define GRPC_INITIAL_METADATA_USED_MASK GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST + /** A single metadata element */ typedef struct grpc_metadata { const char *key; @@ -250,6 +256,7 @@ typedef struct { char *host; size_t host_capacity; gpr_timespec deadline; + uint32_t flags; void *reserved; } grpc_call_details; |