diff options
author | 2016-10-12 09:54:49 -0700 | |
---|---|---|
committer | 2016-10-12 10:59:59 -0700 | |
commit | 22d50e98d8dbff93a7221cd705130b1192c34ffa (patch) | |
tree | 0b04f38c9d8525e49915840b8cfa5233be277752 /src/core/lib | |
parent | 1687cab9ed8b286f78db1f11b1baa0094b236d83 (diff) |
Fix sanity and move a header include
Diffstat (limited to 'src/core/lib')
-rw-r--r-- | src/core/lib/iomgr/resolve_address.h | 1 | ||||
-rw-r--r-- | src/core/lib/iomgr/timer_uv.h | 6 | ||||
-rw-r--r-- | src/core/lib/iomgr/udp_server.c | 6 | ||||
-rw-r--r-- | src/core/lib/iomgr/udp_server.h | 3 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h index ddbe375755..275924448a 100644 --- a/src/core/lib/iomgr/resolve_address.h +++ b/src/core/lib/iomgr/resolve_address.h @@ -36,7 +36,6 @@ #include <stddef.h> #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/iomgr/iomgr.h" #define GRPC_MAX_SOCKADDR_SIZE 128 diff --git a/src/core/lib/iomgr/timer_uv.h b/src/core/lib/iomgr/timer_uv.h index b64291b036..3de383ebd5 100644 --- a/src/core/lib/iomgr/timer_uv.h +++ b/src/core/lib/iomgr/timer_uv.h @@ -31,8 +31,8 @@ * */ -#ifndef GRPC_CORE_LIB_IOMGR_TIMER_GENERIC_H -#define GRPC_CORE_LIB_IOMGR_TIMER_GENERIC_H +#ifndef GRPC_CORE_LIB_IOMGR_TIMER_UV_H +#define GRPC_CORE_LIB_IOMGR_TIMER_UV_H #include "src/core/lib/iomgr/exec_ctx.h" @@ -44,4 +44,4 @@ struct grpc_timer { int triggered; }; -#endif /* GRPC_CORE_LIB_IOMGR_TIMER_GENERIC_H */ +#endif /* GRPC_CORE_LIB_IOMGR_TIMER_UV_H */ diff --git a/src/core/lib/iomgr/udp_server.c b/src/core/lib/iomgr/udp_server.c index 273f607192..0d31b255e9 100644 --- a/src/core/lib/iomgr/udp_server.c +++ b/src/core/lib/iomgr/udp_server.c @@ -357,7 +357,8 @@ int grpc_udp_server_add_port(grpc_udp_server *s, if (grpc_sockaddr_get_port(addr) == 0) { for (i = 0; i < s->nports; i++) { sockname_temp.len = sizeof(struct sockaddr_storage); - if (0 == getsockname(s->ports[i].fd, (struct sockaddr *)sockname_temp.addr, + if (0 == getsockname(s->ports[i].fd, + (struct sockaddr *)sockname_temp.addr, (socklen_t *)&sockname_temp.len)) { port = grpc_sockaddr_get_port(&sockname_temp); if (port > 0) { @@ -383,8 +384,7 @@ int grpc_udp_server_add_port(grpc_udp_server *s, addr = &wild6; // TODO(rjshade): Test and propagate the returned grpc_error*: grpc_create_dualstack_socket(addr, SOCK_DGRAM, IPPROTO_UDP, &dsmode, &fd); - allocated_port1 = - add_socket_to_server(s, fd, addr, read_cb, orphan_cb); + allocated_port1 = add_socket_to_server(s, fd, addr, read_cb, orphan_cb); if (fd >= 0 && dsmode == GRPC_DSMODE_DUALSTACK) { goto done; } diff --git a/src/core/lib/iomgr/udp_server.h b/src/core/lib/iomgr/udp_server.h index e8129be46c..a95086e9ae 100644 --- a/src/core/lib/iomgr/udp_server.h +++ b/src/core/lib/iomgr/udp_server.h @@ -72,7 +72,8 @@ int grpc_udp_server_get_fd(grpc_udp_server *s, unsigned index); /* TODO(ctiller): deprecate this, and make grpc_udp_server_add_ports to handle all of the multiple socket port matching logic in one place */ -int grpc_udp_server_add_port(grpc_udp_server *s, const grpc_resolved_address *addr, +int grpc_udp_server_add_port(grpc_udp_server *s, + const grpc_resolved_address *addr, grpc_udp_server_read_cb read_cb, grpc_udp_server_orphan_cb orphan_cb); |