diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-30 11:11:05 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-30 11:11:05 -0700 |
| commit | f29a6c107df0aded7dac1a32bb2cbf10f98b08dd (patch) | |
| tree | ef86fbb4c08e98e0c7690e01447d6b16a96d5988 /src/core/transport | |
| parent | 1ffb864053d7e124411559295a2567a8aad7411a (diff) | |
| parent | a2779c122ec3b2c3b6a475afa2ed18145d1f1b61 (diff) | |
Merge branch 'but-maybe-i-want-to-poll' into we-dont-need-no-backup
Conflicts:
Makefile
build.json
src/core/security/credentials.c
src/core/security/credentials.h
src/core/surface/call.c
test/core/end2end/tests/request_response_with_payload_and_call_creds.c
tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.core
Diffstat (limited to 'src/core/transport')
| -rw-r--r-- | src/core/transport/metadata.h | 2 | ||||
| -rw-r--r-- | src/core/transport/transport.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/core/transport/metadata.h b/src/core/transport/metadata.h index e7508718f5..76e3f3c1f8 100644 --- a/src/core/transport/metadata.h +++ b/src/core/transport/metadata.h @@ -96,6 +96,7 @@ size_t grpc_mdctx_get_mdtab_free_test_only(grpc_mdctx *mdctx); /* Constructors for grpc_mdstr instances; take a variety of data types that clients may have handy */ grpc_mdstr *grpc_mdstr_from_string(grpc_mdctx *ctx, const char *str); +/* Unrefs the slice. */ grpc_mdstr *grpc_mdstr_from_slice(grpc_mdctx *ctx, gpr_slice slice); grpc_mdstr *grpc_mdstr_from_buffer(grpc_mdctx *ctx, const gpr_uint8 *str, size_t length); @@ -110,6 +111,7 @@ grpc_mdelem *grpc_mdelem_from_metadata_strings(grpc_mdctx *ctx, grpc_mdstr *key, grpc_mdstr *value); grpc_mdelem *grpc_mdelem_from_strings(grpc_mdctx *ctx, const char *key, const char *value); +/* Unrefs the slices. */ grpc_mdelem *grpc_mdelem_from_slices(grpc_mdctx *ctx, gpr_slice key, gpr_slice value); grpc_mdelem *grpc_mdelem_from_string_and_buffer(grpc_mdctx *ctx, diff --git a/src/core/transport/transport.h b/src/core/transport/transport.h index 738c3536e4..521d74c4c4 100644 --- a/src/core/transport/transport.h +++ b/src/core/transport/transport.h @@ -39,6 +39,7 @@ #include "src/core/iomgr/pollset.h" #include "src/core/iomgr/pollset_set.h" #include "src/core/transport/stream_op.h" +#include "src/core/channel/context.h" /* forward declarations */ typedef struct grpc_transport grpc_transport; @@ -79,7 +80,7 @@ typedef struct grpc_transport_op { grpc_mdstr *cancel_message; /* Indexes correspond to grpc_context_index enum values */ - void *const *context; + grpc_call_context_element *context; } grpc_transport_op; /* Callbacks made from the transport to the upper layers of grpc. */ |