Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1923)

Unified Diff: runtime/bin/socket_fuchsia.cc

Issue 2791163004: Reverting until bots clear up. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/socket_fuchsia.h ('k') | runtime/bin/socket_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/socket_fuchsia.cc
diff --git a/runtime/bin/socket_fuchsia.cc b/runtime/bin/socket_fuchsia.cc
index 3cda3f3f8507050fa3ce56fd00c3e3c22ba57e76..0ecae8e4fd638a23e4d9e277ddf1024b1b57743a 100644
--- a/runtime/bin/socket_fuchsia.cc
+++ b/runtime/bin/socket_fuchsia.cc
@@ -7,6 +7,9 @@
#include "platform/globals.h"
#if defined(HOST_OS_FUCHSIA)
+#include "bin/socket.h"
+#include "bin/socket_fuchsia.h"
+
#include <errno.h> // NOLINT
#include <fcntl.h> // NOLINT
#include <ifaddrs.h> // NOLINT
@@ -21,8 +24,6 @@
#include "bin/fdutils.h"
#include "bin/file.h"
-#include "bin/socket.h"
-#include "bin/socket_base_fuchsia.h"
#include "platform/signal_blocker.h"
// #define SOCKET_LOG_INFO 1
@@ -52,6 +53,25 @@
namespace dart {
namespace bin {
+SocketAddress::SocketAddress(struct sockaddr* sa) {
+ ASSERT(INET6_ADDRSTRLEN >= INET_ADDRSTRLEN);
+ if (!Socket::FormatNumericAddress(*reinterpret_cast<RawAddr*>(sa), as_string_,
+ INET6_ADDRSTRLEN)) {
+ as_string_[0] = 0;
+ }
+ socklen_t salen = GetAddrLength(*reinterpret_cast<RawAddr*>(sa));
+ memmove(reinterpret_cast<void*>(&addr_), sa, salen);
+}
+
+
+bool Socket::FormatNumericAddress(const RawAddr& addr, char* address, int len) {
+ socklen_t salen = SocketAddress::GetAddrLength(addr);
+ LOG_INFO("Socket::FormatNumericAddress: calling getnameinfo\n");
+ return (NO_RETRY_EXPECTED(getnameinfo(&addr.addr, salen, address, len, NULL,
+ 0, NI_NUMERICHOST) == 0));
+}
+
+
Socket::Socket(intptr_t fd)
: ReferenceCounted(), fd_(fd), port_(ILLEGAL_PORT) {}
@@ -113,19 +133,217 @@ intptr_t Socket::CreateConnect(const RawAddr& addr) {
intptr_t Socket::CreateBindConnect(const RawAddr& addr,
const RawAddr& source_addr) {
- LOG_ERR("SocketBase::CreateBindConnect is unimplemented\n");
+ LOG_ERR("Socket::CreateBindConnect is unimplemented\n");
+ UNIMPLEMENTED();
+ return -1;
+}
+
+
+bool Socket::IsBindError(intptr_t error_number) {
+ return error_number == EADDRINUSE || error_number == EADDRNOTAVAIL ||
+ error_number == EINVAL;
+}
+
+
+intptr_t Socket::Available(intptr_t fd) {
+ intptr_t available = FDUtils::AvailableBytes(fd);
+ LOG_INFO("Socket::Available(%ld) = %ld\n", fd, available);
+ return available;
+}
+
+
+intptr_t Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
+ ASSERT(fd >= 0);
+ LOG_INFO("Socket::Read: calling read(%ld, %p, %ld)\n", fd, buffer, num_bytes);
+ ssize_t read_bytes = NO_RETRY_EXPECTED(read(fd, buffer, num_bytes));
+ ASSERT(EAGAIN == EWOULDBLOCK);
+ if ((read_bytes == -1) && (errno == EWOULDBLOCK)) {
+ // If the read would block we need to retry and therefore return 0
+ // as the number of bytes written.
+ read_bytes = 0;
+ } else if (read_bytes == -1) {
+ LOG_ERR("Socket::Read: read(%ld, %p, %ld) failed\n", fd, buffer, num_bytes);
+ } else {
+ LOG_INFO("Socket::Read: read(%ld, %p, %ld) succeeded\n", fd, buffer,
+ num_bytes);
+ }
+ return read_bytes;
+}
+
+
+intptr_t Socket::RecvFrom(intptr_t fd,
+ void* buffer,
+ intptr_t num_bytes,
+ RawAddr* addr) {
+ LOG_ERR("Socket::RecvFrom is unimplemented\n");
+ UNIMPLEMENTED();
+ return -1;
+}
+
+
+intptr_t Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
+ ASSERT(fd >= 0);
+ LOG_INFO("Socket::Write: calling write(%ld, %p, %ld)\n", fd, buffer,
+ num_bytes);
+ ssize_t written_bytes = NO_RETRY_EXPECTED(write(fd, buffer, num_bytes));
+ ASSERT(EAGAIN == EWOULDBLOCK);
+ if ((written_bytes == -1) && (errno == EWOULDBLOCK)) {
+ // If the would block we need to retry and therefore return 0 as
+ // the number of bytes written.
+ written_bytes = 0;
+ } else if (written_bytes == -1) {
+ LOG_ERR("Socket::Write: write(%ld, %p, %ld) failed\n", fd, buffer,
+ num_bytes);
+ } else {
+ LOG_INFO("Socket::Write: write(%ld, %p, %ld) succeeded\n", fd, buffer,
+ num_bytes);
+ }
+ return written_bytes;
+}
+
+
+intptr_t Socket::SendTo(intptr_t fd,
+ const void* buffer,
+ intptr_t num_bytes,
+ const RawAddr& addr) {
+ LOG_ERR("Socket::SendTo is unimplemented\n");
UNIMPLEMENTED();
return -1;
}
+intptr_t Socket::GetPort(intptr_t fd) {
+ ASSERT(fd >= 0);
+ RawAddr raw;
+ socklen_t size = sizeof(raw);
+ LOG_INFO("Socket::GetPort: calling getsockname(%ld)\n", fd);
+ if (NO_RETRY_EXPECTED(getsockname(fd, &raw.addr, &size))) {
+ return 0;
+ }
+ return SocketAddress::GetAddrPort(raw);
+}
+
+
+SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
+ ASSERT(fd >= 0);
+ RawAddr raw;
+ socklen_t size = sizeof(raw);
+ if (NO_RETRY_EXPECTED(getpeername(fd, &raw.addr, &size))) {
+ return NULL;
+ }
+ *port = SocketAddress::GetAddrPort(raw);
+ return new SocketAddress(&raw.addr);
+}
+
+
+void Socket::GetError(intptr_t fd, OSError* os_error) {
+ LOG_ERR("Socket::GetError is unimplemented\n");
+ UNIMPLEMENTED();
+}
+
+
+int Socket::GetType(intptr_t fd) {
+ LOG_ERR("Socket::GetType is unimplemented\n");
+ UNIMPLEMENTED();
+ return File::kOther;
+}
+
+
+intptr_t Socket::GetStdioHandle(intptr_t num) {
+ LOG_ERR("Socket::GetStdioHandle is unimplemented\n");
+ UNIMPLEMENTED();
+ return num;
+}
+
+
+AddressList<SocketAddress>* Socket::LookupAddress(const char* host,
+ int type,
+ OSError** os_error) {
+ // Perform a name lookup for a host name.
+ struct addrinfo hints;
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = SocketAddress::FromType(type);
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_ADDRCONFIG;
+ hints.ai_protocol = IPPROTO_TCP;
+ struct addrinfo* info = NULL;
+ LOG_INFO("Socket::LookupAddress: calling getaddrinfo\n");
+ int status = NO_RETRY_EXPECTED(getaddrinfo(host, 0, &hints, &info));
+ if (status != 0) {
+ // We failed, try without AI_ADDRCONFIG. This can happen when looking up
+ // e.g. '::1', when there are no global IPv6 addresses.
+ hints.ai_flags = 0;
+ LOG_INFO("Socket::LookupAddress: calling getaddrinfo again\n");
+ status = NO_RETRY_EXPECTED(getaddrinfo(host, 0, &hints, &info));
+ if (status != 0) {
+ ASSERT(*os_error == NULL);
+ *os_error =
+ new OSError(status, gai_strerror(status), OSError::kGetAddressInfo);
+ return NULL;
+ }
+ }
+ intptr_t count = 0;
+ for (struct addrinfo* c = info; c != NULL; c = c->ai_next) {
+ if ((c->ai_family == AF_INET) || (c->ai_family == AF_INET6)) {
+ count++;
+ }
+ }
+ intptr_t i = 0;
+ AddressList<SocketAddress>* addresses = new AddressList<SocketAddress>(count);
+ for (struct addrinfo* c = info; c != NULL; c = c->ai_next) {
+ if ((c->ai_family == AF_INET) || (c->ai_family == AF_INET6)) {
+ addresses->SetAt(i, new SocketAddress(c->ai_addr));
+ i++;
+ }
+ }
+ freeaddrinfo(info);
+ return addresses;
+}
+
+
+bool Socket::ReverseLookup(const RawAddr& addr,
+ char* host,
+ intptr_t host_len,
+ OSError** os_error) {
+ LOG_ERR("Socket::ReverseLookup is unimplemented\n");
+ UNIMPLEMENTED();
+ return false;
+}
+
+
+bool Socket::ParseAddress(int type, const char* address, RawAddr* addr) {
+ int result;
+ if (type == SocketAddress::TYPE_IPV4) {
+ result = NO_RETRY_EXPECTED(inet_pton(AF_INET, address, &addr->in.sin_addr));
+ } else {
+ ASSERT(type == SocketAddress::TYPE_IPV6);
+ result =
+ NO_RETRY_EXPECTED(inet_pton(AF_INET6, address, &addr->in6.sin6_addr));
+ }
+ return (result == 1);
+}
+
+
intptr_t Socket::CreateBindDatagram(const RawAddr& addr, bool reuseAddress) {
- LOG_ERR("SocketBase::CreateBindDatagram is unimplemented\n");
+ LOG_ERR("Socket::CreateBindDatagram is unimplemented\n");
UNIMPLEMENTED();
return -1;
}
+bool Socket::ListInterfacesSupported() {
+ return false;
+}
+
+
+AddressList<InterfaceSocketAddress>* Socket::ListInterfaces(
+ int type,
+ OSError** os_error) {
+ UNIMPLEMENTED();
+ return NULL;
+}
+
+
intptr_t ServerSocket::CreateBindListen(const RawAddr& addr,
intptr_t backlog,
bool v6_only) {
@@ -166,7 +384,7 @@ intptr_t ServerSocket::CreateBindListen(const RawAddr& addr,
// Test for invalid socket port 65535 (some browsers disallow it).
if ((SocketAddress::GetAddrPort(addr) == 0) &&
- (SocketBase::GetPort(fd) == 65535)) {
+ (Socket::GetPort(fd) == 65535)) {
// Don't close the socket until we have created a new socket, ensuring
// that we do not get the bad port number again.
intptr_t new_fd = CreateBindListen(addr, backlog, v6_only);
@@ -239,6 +457,89 @@ intptr_t ServerSocket::Accept(intptr_t fd) {
return socket;
}
+
+void Socket::Close(intptr_t fd) {
+ ASSERT(fd >= 0);
+ NO_RETRY_EXPECTED(close(fd));
+}
+
+
+bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
+ LOG_ERR("Socket::GetNoDelay is unimplemented\n");
+ UNIMPLEMENTED();
+ return false;
+}
+
+
+bool Socket::SetNoDelay(intptr_t fd, bool enabled) {
+ int on = enabled ? 1 : 0;
+ return NO_RETRY_EXPECTED(setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
+ reinterpret_cast<char*>(&on),
+ sizeof(on))) == 0;
+}
+
+
+bool Socket::GetMulticastLoop(intptr_t fd, intptr_t protocol, bool* enabled) {
+ LOG_ERR("Socket::GetMulticastLoop is unimplemented\n");
+ UNIMPLEMENTED();
+ return false;
+}
+
+
+bool Socket::SetMulticastLoop(intptr_t fd, intptr_t protocol, bool enabled) {
+ LOG_ERR("Socket::SetMulticastLoop is unimplemented\n");
+ UNIMPLEMENTED();
+ return false;
+}
+
+
+bool Socket::GetMulticastHops(intptr_t fd, intptr_t protocol, int* value) {
+ LOG_ERR("Socket::GetMulticastHops is unimplemented\n");
+ UNIMPLEMENTED();
+ return false;
+}
+
+
+bool Socket::SetMulticastHops(intptr_t fd, intptr_t protocol, int value) {
+ LOG_ERR("Socket::SetMulticastHops is unimplemented\n");
+ UNIMPLEMENTED();
+ return false;
+}
+
+
+bool Socket::GetBroadcast(intptr_t fd, bool* enabled) {
+ LOG_ERR("Socket::GetBroadcast is unimplemented\n");
+ UNIMPLEMENTED();
+ return false;
+}
+
+
+bool Socket::SetBroadcast(intptr_t fd, bool enabled) {
+ LOG_ERR("Socket::SetBroadcast is unimplemented\n");
+ UNIMPLEMENTED();
+ return false;
+}
+
+
+bool Socket::JoinMulticast(intptr_t fd,
+ const RawAddr& addr,
+ const RawAddr&,
+ int interfaceIndex) {
+ LOG_ERR("Socket::JoinMulticast is unimplemented\n");
+ UNIMPLEMENTED();
+ return false;
+}
+
+
+bool Socket::LeaveMulticast(intptr_t fd,
+ const RawAddr& addr,
+ const RawAddr&,
+ int interfaceIndex) {
+ LOG_ERR("Socket::LeaveMulticast is unimplemented\n");
+ UNIMPLEMENTED();
+ return false;
+}
+
} // namespace bin
} // namespace dart
« no previous file with comments | « runtime/bin/socket_fuchsia.h ('k') | runtime/bin/socket_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698