diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-06 07:43:24 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-06 07:43:24 -0700 |
| commit | 30542c0b889447458e0d134f12d6a0877501a30f (patch) | |
| tree | d17804de3f570dff6db95a9fb5efd1286b49ebef /src/core/lib | |
| parent | e40dd29db6ceae42bd6dd68427d76ffa608bd404 (diff) | |
| parent | 3a9f49d409d5fa552ea6053eedfa0a8e27d160e0 (diff) | |
Merge remote-tracking branch 'upstream/master' into service_config
Diffstat (limited to 'src/core/lib')
| -rw-r--r-- | src/core/lib/iomgr/udp_server.c | 3 | ||||
| -rw-r--r-- | src/core/lib/surface/byte_buffer.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/udp_server.c b/src/core/lib/iomgr/udp_server.c index 12e929fa6a..edf7b133e9 100644 --- a/src/core/lib/iomgr/udp_server.c +++ b/src/core/lib/iomgr/udp_server.c @@ -38,7 +38,6 @@ #include <grpc/support/port_platform.h> -#ifdef GRPC_NEED_UDP #ifdef GPR_POSIX_SOCKET #include "src/core/lib/iomgr/udp_server.h" @@ -199,6 +198,7 @@ void grpc_udp_server_destroy(grpc_exec_ctx *exec_ctx, grpc_udp_server *s, /* shutdown all fd's */ if (s->active_ports) { for (i = 0; i < s->nports; i++) { + server_port *sp = &s->ports[i]; /* Call the orphan_cb to signal that the FD is about to be closed and * should no longer be used. */ GPR_ASSERT(sp->orphan_cb); @@ -446,4 +446,3 @@ void grpc_udp_server_start(grpc_exec_ctx *exec_ctx, grpc_udp_server *s, } #endif -#endif diff --git a/src/core/lib/surface/byte_buffer.c b/src/core/lib/surface/byte_buffer.c index a093a37af3..054a6e6c58 100644 --- a/src/core/lib/surface/byte_buffer.c +++ b/src/core/lib/surface/byte_buffer.c @@ -72,8 +72,9 @@ grpc_byte_buffer *grpc_raw_byte_buffer_from_reader( grpc_byte_buffer *grpc_byte_buffer_copy(grpc_byte_buffer *bb) { switch (bb->type) { case GRPC_BB_RAW: - return grpc_raw_byte_buffer_create(bb->data.raw.slice_buffer.slices, - bb->data.raw.slice_buffer.count); + return grpc_raw_compressed_byte_buffer_create( + bb->data.raw.slice_buffer.slices, bb->data.raw.slice_buffer.count, + bb->data.raw.compression); } GPR_UNREACHABLE_CODE(return NULL); } |