diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-03-14 18:41:33 -0700 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2018-03-14 18:41:33 -0700 |
| commit | 44a1588b5488bd3f57dfc959af3aa7cc02480e41 (patch) | |
| tree | c7ad5ded604de4cbbf98fe9e54b426e2bd402413 /src/core/lib/iomgr/udp_server.cc | |
| parent | 0dee3d93c91bb27df25ad418c8bd0029a27360d1 (diff) | |
| parent | 7e24da469c2a931ee988d35bf99b9e47e8fa5940 (diff) | |
Merge master into yashykt:socklent
Diffstat (limited to 'src/core/lib/iomgr/udp_server.cc')
| -rw-r--r-- | src/core/lib/iomgr/udp_server.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/lib/iomgr/udp_server.cc b/src/core/lib/iomgr/udp_server.cc index 6e5079b014..04716a254d 100644 --- a/src/core/lib/iomgr/udp_server.cc +++ b/src/core/lib/iomgr/udp_server.cc @@ -345,7 +345,7 @@ static int bind_socket(grpc_socket_factory* socket_factory, int sockfd, return (socket_factory != nullptr) ? grpc_socket_factory_bind(socket_factory, sockfd, addr) : bind(sockfd, - reinterpret_cast<struct sockaddr*>( + reinterpret_cast<grpc_sockaddr*>( const_cast<char*>(addr->addr)), addr->len); } @@ -355,8 +355,8 @@ static int prepare_socket(grpc_socket_factory* socket_factory, int fd, const grpc_resolved_address* addr, int rcv_buf_size, int snd_buf_size) { grpc_resolved_address sockname_temp; - struct sockaddr* addr_ptr = - reinterpret_cast<struct sockaddr*>(const_cast<char*>(addr->addr)); + grpc_sockaddr* addr_ptr = + reinterpret_cast<grpc_sockaddr*>(const_cast<char*>(addr->addr)); if (fd < 0) { goto error; @@ -392,7 +392,7 @@ static int prepare_socket(grpc_socket_factory* socket_factory, int fd, sockname_temp.len = static_cast<socklen_t>(sizeof(struct sockaddr_storage)); - if (getsockname(fd, reinterpret_cast<struct sockaddr*>(sockname_temp.addr), + if (getsockname(fd, reinterpret_cast<grpc_sockaddr*>(sockname_temp.addr), &sockname_temp.len) < 0) { goto error; } @@ -577,10 +577,9 @@ int grpc_udp_server_add_port(grpc_udp_server* s, for (size_t i = 0; i < s->listeners.size(); ++i) { sockname_temp.len = static_cast<socklen_t>(sizeof(struct sockaddr_storage)); - if (0 == - getsockname(s->listeners[i].fd(), - reinterpret_cast<struct sockaddr*>(sockname_temp.addr), - &sockname_temp.len)) { + if (0 == getsockname(s->listeners[i].fd(), + reinterpret_cast<grpc_sockaddr*>(sockname_temp.addr), + &sockname_temp.len)) { port = grpc_sockaddr_get_port(&sockname_temp); if (port > 0) { allocated_addr = static_cast<grpc_resolved_address*>( |